修改BUG

controllers/ferroalloy/trade.go

@@ -11,10 +11,10 @@ import (
 // @Summary  查询我的订单-采购订单
 // @Produce  json
 // @Security ApiKeyAuth
-// @Param    userid   query    int true  "用户ID"
+// @Param    userid      query    int     true  "用户ID"
 // @Param    type     query    int false "类型 - 0:未完成 1:已完成"
-// @Param    page     query    int false "页码"
-// @Param    pagesize query    int false "每页条数"
+// @Param    page        query    int     false "页码"
+// @Param    pagesize    query    int     false "每页条数"
 // @Success  200      {array}  models.Thjpurchasetradedetail
 // @Failure  500          {object} app.Response
 // @Router   /Ferroalloy/QueryTHJPurchaseTradeDetail [get]
@@ -89,7 +89,7 @@ func QueryTHJPurchaseTransferOrderDetail(c *gin.Context) {
 // @Param    page     query    int false "页码"
 // @Param    pagesize query    int false "每页条数"
 // @Success  200          {array}  models.PromotionIncome
-// @Failure  500      {object} app.Response
+// @Failure  500         {object} app.Response
 // @Router   /Ferroalloy/QueryTHJPromotionIncome [get]
 // @Tags     铁合金
 func QueryTHJPromotionIncome(c *gin.Context) {
@@ -142,9 +142,10 @@ func QueryTHJinvesotrdeposit(c *gin.Context) {
 // @Produce  json
 // @Security ApiKeyAuth
 // @Param    userid       query    int true  "用户ID"
+// @Param    depositrate query    float64 true  "定金比例（选中比例）"
 // @Param    page         query    int false "页码"
 // @Param    pagesize     query    int false "每页条数"
-// @Success  200      {array}  models.GThjinvesotrdepositlog
+// @Success  200         {array}  models.GThjinvesotrdepositlog
 // @Failure  500      {object} app.Response
 // @Router   /Ferroalloy/QueryTHJInvesotrDepositLog [get]
 // @Tags     铁合金

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

@@ -7947,6 +7947,13 @@ const docTemplate = `{
                         "required": true
                     },
                     {
+                        "type": "number",
+                        "description": "定金比例（选中比例）",
+                        "name": "depositrate",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
                         "type": "integer",
                         "description": "页码",
                         "name": "page",

docs/swagger.json

@@ -7938,6 +7938,13 @@
                         "required": true
                     },
                     {
+                        "type": "number",
+                        "description": "定金比例（选中比例）",
+                        "name": "depositrate",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
                         "type": "integer",
                         "description": "页码",
                         "name": "page",

docs/swagger.yaml

@@ -31142,6 +31142,11 @@ paths:
         name: userid
         required: true
         type: integer
+      - description: 定金比例（选中比例）
+        in: query
+        name: depositrate
+        required: true
+        type: number
       - description: 页码
         in: query
         name: page

models/guangzuan.go

@@ -686,6 +686,10 @@ func (r *SellOrder) buildQueryDiamond() string {
 		q.STONEDESC                 ,
 		q.SETTINGMATERIAL           ,
 		q.PRICE,
+		CASE WHEN
+			q.SIZE1 IS NOT NULL AND q.SIZE2 IS NOT NULL AND q.SIZE2 IS NOT NULL THEN q.SIZE1 || '*' || q.SIZE2 || '*' || q.SIZE3
+			ELSE q.SIZE1
+		END AS SIZEDISPLAY,
 		to_char(t.ORDERTIME, 'yyyy-mm-dd hh24:mi:ss') ORDERTIME1,
 		to_char(t.WRTRADEORDERID) WRTRADEORDERID1,
 		t.TRADEDATE            ,