소스 검색

接口增加出参

zhou.xiaoning 3 년 전
부모
커밋
258b474469
4개의 변경된 파일52개의 추가작업 그리고 6개의 파일을 삭제
  1. 16 0
      docs/docs.go
  2. 16 0
      docs/swagger.json
  3. 12 0
      docs/swagger.yaml
  4. 8 6
      models/guangzuan.go

+ 16 - 0
docs/docs.go

@@ -21079,6 +21079,10 @@ const docTemplate = `{
                     "description": "原产地",
                     "type": "string"
                 },
+                "performancetemplateid": {
+                    "description": "履约计划模板ID",
+                    "type": "integer"
+                },
                 "remark": {
                     "description": "备注",
                     "type": "string"
@@ -30515,6 +30519,10 @@ const docTemplate = `{
                     "description": "挂牌方用户ID",
                     "type": "integer"
                 },
+                "performancetemplateid": {
+                    "description": "履约计划模板ID",
+                    "type": "integer"
+                },
                 "price": {
                     "description": "价格",
                     "type": "number"
@@ -30653,6 +30661,10 @@ const docTemplate = `{
                     "description": "原产地",
                     "type": "string"
                 },
+                "performancetemplateid": {
+                    "description": "履约计划模板ID",
+                    "type": "integer"
+                },
                 "remark": {
                     "description": "备注",
                     "type": "string"
@@ -31026,6 +31038,10 @@ const docTemplate = `{
                     "description": "市场ID",
                     "type": "integer"
                 },
+                "performancetemplateid": {
+                    "description": "履约计划模板ID",
+                    "type": "integer"
+                },
                 "price": {
                     "description": "价格",
                     "type": "number"

+ 16 - 0
docs/swagger.json

@@ -21070,6 +21070,10 @@
                     "description": "原产地",
                     "type": "string"
                 },
+                "performancetemplateid": {
+                    "description": "履约计划模板ID",
+                    "type": "integer"
+                },
                 "remark": {
                     "description": "备注",
                     "type": "string"
@@ -30506,6 +30510,10 @@
                     "description": "挂牌方用户ID",
                     "type": "integer"
                 },
+                "performancetemplateid": {
+                    "description": "履约计划模板ID",
+                    "type": "integer"
+                },
                 "price": {
                     "description": "价格",
                     "type": "number"
@@ -30644,6 +30652,10 @@
                     "description": "原产地",
                     "type": "string"
                 },
+                "performancetemplateid": {
+                    "description": "履约计划模板ID",
+                    "type": "integer"
+                },
                 "remark": {
                     "description": "备注",
                     "type": "string"
@@ -31017,6 +31029,10 @@
                     "description": "市场ID",
                     "type": "integer"
                 },
+                "performancetemplateid": {
+                    "description": "履约计划模板ID",
+                    "type": "integer"
+                },
                 "price": {
                     "description": "价格",
                     "type": "number"

+ 12 - 0
docs/swagger.yaml

@@ -3818,6 +3818,9 @@ definitions:
       origin:
         description: 原产地
         type: string
+      performancetemplateid:
+        description: 履约计划模板ID
+        type: integer
       remark:
         description: 备注
         type: string
@@ -10826,6 +10829,9 @@ definitions:
       matchuserid:
         description: 挂牌方用户ID
         type: integer
+      performancetemplateid:
+        description: 履约计划模板ID
+        type: integer
       price:
         description: 价格
         type: number
@@ -10923,6 +10929,9 @@ definitions:
       origin:
         description: 原产地
         type: string
+      performancetemplateid:
+        description: 履约计划模板ID
+        type: integer
       remark:
         description: 备注
         type: string
@@ -11191,6 +11200,9 @@ definitions:
       marketid:
         description: 市场ID
         type: integer
+      performancetemplateid:
+        description: 履约计划模板ID
+        type: integer
       price:
         description: 价格
         type: number

+ 8 - 6
models/guangzuan.go

@@ -254,12 +254,13 @@ type BuyOrder struct {
 	ZSCZCOLOR3TYPEDISPLAY     string `json:"zsczcolor3typedisplay" xorm:"ZSCZCOLOR3TYPEDISPLAY"`         //
 	WAREHOUSEINFOSDISPLAY     string `json:"warehouseinfosdisplay" xorm:"WAREHOUSEINFOSDISPLAY"`         //
 
-	WRTRADEORDERID     string `json:"wrtradeorderid" xorm:"WRTRADEORDERID1" form:"wrtradeorderid"` // [委托单号]买委托单ID(320+Unix秒时间戳(10位)+xxxxxx)
-	USERID             int64  `json:"userid" xorm:"USERID"`                                        // 用户ID
-	ACCOUNTID          int64  `json:"accountid" xorm:"ACCOUNTID"`                                  // 资金账户ID
-	WRTRADEORDERSTATUS int32  `json:"wrtradeorderstatus" xorm:"WRTRADEORDERSTATUS"`                // 委托状态 - 参考枚举'WRTradeOrderStatus' - 1:委托请求  2:待冻结  3:委托成功  4:委托失败  5:配对成功  6:已撤  7:部成  8:已成  9:部成部撤  10:成交失败  11:委托拒绝  12:经过摘牌(先摘后挂专用)  13:冻结成功(通道交易专用)  14:通道已撤  15:通道部成部撤  16:成交失败违约(荷兰式竞拍专用)  17:冻结PD成功  18:冻结PD失败  19:冻结能量成功  20:冻结能量失败  21:预约已报价  22:过期未付  23:优惠券处理中  24:仓单生成失败  25:首付扣款失败  26:履约失败  27:撤单解冻贷款失败WRTrade_OrderDetail、
-	VALIDTIME          string `json:"validtime" xorm:"VALIDTIME"`                                  // 有效期限
-	ORDERTIME          string `json:"ordertime" xorm:"ORDERTIME"`                                  // 委托时间
+	WRTRADEORDERID        string `json:"wrtradeorderid" xorm:"WRTRADEORDERID1" form:"wrtradeorderid"` // [委托单号]买委托单ID(320+Unix秒时间戳(10位)+xxxxxx)
+	USERID                int64  `json:"userid" xorm:"USERID"`                                        // 用户ID
+	ACCOUNTID             int64  `json:"accountid" xorm:"ACCOUNTID"`                                  // 资金账户ID
+	WRTRADEORDERSTATUS    int32  `json:"wrtradeorderstatus" xorm:"WRTRADEORDERSTATUS"`                // 委托状态 - 参考枚举'WRTradeOrderStatus' - 1:委托请求  2:待冻结  3:委托成功  4:委托失败  5:配对成功  6:已撤  7:部成  8:已成  9:部成部撤  10:成交失败  11:委托拒绝  12:经过摘牌(先摘后挂专用)  13:冻结成功(通道交易专用)  14:通道已撤  15:通道部成部撤  16:成交失败违约(荷兰式竞拍专用)  17:冻结PD成功  18:冻结PD失败  19:冻结能量成功  20:冻结能量失败  21:预约已报价  22:过期未付  23:优惠券处理中  24:仓单生成失败  25:首付扣款失败  26:履约失败  27:撤单解冻贷款失败WRTrade_OrderDetail、
+	VALIDTIME             string `json:"validtime" xorm:"VALIDTIME"`                                  // 有效期限
+	ORDERTIME             string `json:"ordertime" xorm:"ORDERTIME"`                                  // 委托时间
+	PERFORMANCETEMPLATEID int64  `json:"performancetemplateid" xorm:"PERFORMANCETEMPLATEID"`          // 履约计划模板ID
 
 	ZSCATEGORY         int32  `json:"zscategory" xorm:"ZSCATEGORY"`                 // 钻石分类 - 枚举”ZSCategory“
 	ZSCATEGORYS        string `json:"-" form:"zscategorys"`                         // 钻石分类
@@ -296,6 +297,7 @@ func (r *BuyOrder) buildSql() string {
 		t.WRTRADEORDERSTATUS,
 		to_char(t.VALIDTIME, 'yyyy-mm-dd') VALIDTIME,
 		to_char(t.ORDERTIME, 'yyyy-mm-dd hh24:mi:ss') ORDERTIME,
+		t.PERFORMANCETEMPLATEID,
 		q.*
 	FROM WRTrade_OrderDetail t
 	INNER JOIN View_GZ_BuyOrderDetail_Query q ON t.wrtradeorderid = q.wrtradeorderid