/sbyj/QueryMyTradegoodsdeliveryoffline 增加出参

controllers/guangzuan/tradeService.go

@@ -18,8 +18,8 @@ import (
 // @Security Group
 // @Param    userid   query    int    true  "用户ID"
 // @Param    executestatus query    int false "执行状态 - 1:未生效 2:进行中 3:已结束"
-// @Param    page          query    int false "页码"
-// @Param    pagesize      query    int false "每页条数"
+// @Param    page     query    int    false "页码"
+// @Param    pagesize query    int    false "每页条数"
 // @Success  200           {array}  models.GzcjjcorderM
 // @Failure  500     {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrder [get]
@@ -39,8 +39,8 @@ func QueryGZCJJCOrder(c *gin.Context) {
 // @Security Group
 // @Param    userid        query    int true  "用户ID"
 // @Param    orderid  query    string false "单据ID"
-// @Param    page     query    int    false "页码"
-// @Param    pagesize query    int    false "每页条数"
+// @Param    page          query    int false "页码"
+// @Param    pagesize      query    int false "每页条数"
 // @Success  200      {array}  models.GzcjjcorderdetailM
 // @Failure  500           {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrderDetail [get]

docs/docs.go

@@ -44361,6 +44361,10 @@ const docTemplate = `{
                     "description": "交收方向 - 0:买 1:卖",
                     "type": "integer"
                 },
+                "clientticket": {
+                    "description": "客户端流水号",
+                    "type": "string"
+                },
                 "closetime": {
                     "description": "完成时间",
                     "type": "string"
@@ -44469,6 +44473,14 @@ const docTemplate = `{
                     "description": "已付货款",
                     "type": "number"
                 },
+                "realdeliveryamount": {
+                    "description": "实际交收货款",
+                    "type": "number"
+                },
+                "realdeliveryqty": {
+                    "description": "实际交收数量",
+                    "type": "number"
+                },
                 "reqtime": {
                     "description": "申请时间",
                     "type": "string"

docs/swagger.json

@@ -44352,6 +44352,10 @@
                     "description": "交收方向 - 0:买 1:卖",
                     "type": "integer"
                 },
+                "clientticket": {
+                    "description": "客户端流水号",
+                    "type": "string"
+                },
                 "closetime": {
                     "description": "完成时间",
                     "type": "string"
@@ -44460,6 +44464,14 @@
                     "description": "已付货款",
                     "type": "number"
                 },
+                "realdeliveryamount": {
+                    "description": "实际交收货款",
+                    "type": "number"
+                },
+                "realdeliveryqty": {
+                    "description": "实际交收数量",
+                    "type": "number"
+                },
                 "reqtime": {
                     "description": "申请时间",
                     "type": "string"

docs/swagger.yaml

@@ -16193,6 +16193,9 @@ definitions:
       buyorsell:
         description: 交收方向 - 0:买 1:卖
         type: integer
+      clientticket:
+        description: 客户端流水号
+        type: string
       closetime:
         description: 完成时间
         type: string
@@ -16275,6 +16278,12 @@ definitions:
       payedamount:
         description: 已付货款
         type: number
+      realdeliveryamount:
+        description: 实际交收货款
+        type: number
+      realdeliveryqty:
+        description: 实际交收数量
+        type: number
       reqtime:
         description: 申请时间
         type: string

models/sbyj.go

@@ -253,6 +253,9 @@ type MyTradegoodsdeliveryoffline struct {
 	TOPAYTIME           time.Time `json:"topaytime" xorm:"TOPAYTIME"`                                 // 付款截止时间(买交收)
 	PAYEDAMOUNT         float64   `json:"payedamount" xorm:"PAYEDAMOUNT"`                             // 已付货款
 	FREEZEAMOUNT        float64   `json:"freezeamount" xorm:"FREEZEAMOUNT"`                           // 冻结货款
+	REALDELIVERYQTY     float64   `json:"realdeliveryqty" xorm:"REALDELIVERYQTY"`                     // 实际交收数量
+	REALDELIVERYAMOUNT  float64   `json:"realdeliveryamount" xorm:"REALDELIVERYAMOUNT"`               // 实际交收货款
+	CLIENTTICKET        string    `json:"clientticket" xorm:"CLIENTTICKET"`                           // 客户端流水号
 
 	GOODSCODE    string  `json:"goodscode" xorm:"GOODSCODE"`       // 期货合约代码(内部)
 	GOODSNAME    string  `json:"goodsname" xorm:"GOODSNAME"`       // 期货合约名称
@@ -302,6 +305,8 @@ func (r *MyTradegoodsdeliveryoffline) buildSql() string {
 		t.topaytime,
 		t.payedamount,
 		t.freezeamount,
+		t.REALDELIVERYQTY,
+		t.REALDELIVERYAMOUNT,
 		g.goodscode,
 		g.goodsname,
 		g.agreeunit,