fixed bug.

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

@@ -52724,6 +52724,10 @@ const docTemplate = `{
                     "description": "点价价格方式 - 1:商品价  2:固定值",
                     "type": "integer"
                 },
+                "remaintotalamount": {
+                    "description": "实际剩余总货款 = (X、P剩余总货款 + 升贴水总额) * (实际成交数量/交割数量)",
+                    "type": "number"
+                },
                 "tradedate": {
                     "description": "交易日(yyyymmdd)",
                     "type": "string"
@@ -52752,6 +52756,10 @@ const docTemplate = `{
                     "description": "合约数量",
                     "type": "number"
                 },
+                "xdeliveryprice": {
+                    "description": "交易合约交割价",
+                    "type": "number"
+                },
                 "xgoodsamount": {
                     "description": "期初均价",
                     "type": "number"
@@ -52767,6 +52775,10 @@ const docTemplate = `{
                 "xgoodsname": {
                     "description": "商品名称",
                     "type": "string"
+                },
+                "xgoodsremainamount": {
+                    "description": "X剩余总货款",
+                    "type": "number"
                 }
             }
         },

docs/swagger.json

@@ -52715,6 +52715,10 @@
                     "description": "点价价格方式 - 1:商品价  2:固定值",
                     "type": "integer"
                 },
+                "remaintotalamount": {
+                    "description": "实际剩余总货款 = (X、P剩余总货款 + 升贴水总额) * (实际成交数量/交割数量)",
+                    "type": "number"
+                },
                 "tradedate": {
                     "description": "交易日(yyyymmdd)",
                     "type": "string"
@@ -52743,6 +52747,10 @@
                     "description": "合约数量",
                     "type": "number"
                 },
+                "xdeliveryprice": {
+                    "description": "交易合约交割价",
+                    "type": "number"
+                },
                 "xgoodsamount": {
                     "description": "期初均价",
                     "type": "number"
@@ -52758,6 +52766,10 @@
                 "xgoodsname": {
                     "description": "商品名称",
                     "type": "string"
+                },
+                "xgoodsremainamount": {
+                    "description": "X剩余总货款",
+                    "type": "number"
                 }
             }
         },

docs/swagger.yaml

@@ -23472,6 +23472,9 @@ definitions:
       ppricemode:
         description: 点价价格方式 - 1:商品价  2:固定值
         type: integer
+      remaintotalamount:
+        description: 实际剩余总货款 = (X、P剩余总货款 + 升贴水总额) * (实际成交数量/交割数量)
+        type: number
       tradedate:
         description: 交易日(yyyymmdd)
         type: string
@@ -23493,6 +23496,9 @@ definitions:
       xdeliverycloseqty:
         description: 合约数量
         type: number
+      xdeliveryprice:
+        description: 交易合约交割价
+        type: number
       xgoodsamount:
         description: 期初均价
         type: number
@@ -23505,6 +23511,9 @@ definitions:
       xgoodsname:
         description: 商品名称
         type: string
+      xgoodsremainamount:
+        description: X剩余总货款
+        type: number
     type: object
   models.WrDeliveryGoodsSection:
     properties:

models/wrTrade2.go

@@ -3157,7 +3157,7 @@ select t.xgoodsid,
        u2.accountname matchusername,
        wd.wrstandardname || w.wrfactortypename2 as WRTYPENAME,
        h.warehousename,
-       e.enumdicnamee,
+       e.enumdicname,
        t.xdeliveryprice,
        t.xgoodsremainamount,
        t.remaintotalamount
@@ -3218,7 +3218,10 @@ select t.xgoodsid,
        u2.accountname matchusername,
        wd.wrstandardname || w.wrfactortypename2 as WRTYPENAME,
        h.warehousename,
-       e.enumdicname
+       e.enumdicname,
+	   t.xdeliveryprice,
+       t.xgoodsremainamount,
+       t.remaintotalamount
   from his_deliverydetail t
   left join goods g
     on t.xgoodsid = g.goodsid