/Guangzuan/QueryMyDelistingApply 接口增加出参

controllers/guangzuan/tradeService.go

@@ -21,7 +21,7 @@ import (
 // @Param    page          query    int false "页码"
 // @Param    pagesize      query    int false "每页条数"
 // @Success  200           {array}  models.GzcjjcorderM
-// @Failure  500           {object} app.Response
+// @Failure  500     {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrder [get]
 // @Tags     广钻
 func QueryGZCJJCOrder(c *gin.Context) {
@@ -83,7 +83,7 @@ func QueryGZCJBSOrderFile(c *gin.Context) {
 // @Param    page     query    int false "页码"
 // @Param    pagesize query    int false "每页条数"
 // @Success  200           {array}  models.GzbsfworderM
-// @Failure  500     {object} app.Response
+// @Failure  500           {object} app.Response
 // @Router   /Guangzuan/QueryGZBSFWOrder [get]
 // @Tags     广钻
 func QueryGZBSFWOrder(c *gin.Context) {

docs/docs.go

@@ -37122,6 +37122,10 @@ const docTemplate = `{
                     "description": "买委托单ID",
                     "type": "string"
                 },
+                "cerno": {
+                    "description": "证书编号 - 类型：2，4，5",
+                    "type": "string"
+                },
                 "goodsno": {
                     "description": "商品编号",
                     "type": "string"
@@ -37142,6 +37146,10 @@ const docTemplate = `{
                     "description": "价格",
                     "type": "number"
                 },
+                "priceper": {
+                    "description": "克拉单价",
+                    "type": "string"
+                },
                 "sellaccountid": {
                     "description": "卖方账户ID",
                     "type": "integer"
@@ -37191,6 +37199,14 @@ const docTemplate = `{
                 "zscategorydisplay": {
                     "type": "string"
                 },
+                "zscerttype": {
+                    "description": "证书类型 - 枚举”ZSCertType“ - 类型：2，4，5",
+                    "type": "integer"
+                },
+                "zscerttypedisplay": {
+                    "description": "证书类型",
+                    "type": "string"
+                },
                 "zsclaritytypedisplay": {
                     "type": "string"
                 },

docs/swagger.json

@@ -37113,6 +37113,10 @@
                     "description": "买委托单ID",
                     "type": "string"
                 },
+                "cerno": {
+                    "description": "证书编号 - 类型：2，4，5",
+                    "type": "string"
+                },
                 "goodsno": {
                     "description": "商品编号",
                     "type": "string"
@@ -37133,6 +37137,10 @@
                     "description": "价格",
                     "type": "number"
                 },
+                "priceper": {
+                    "description": "克拉单价",
+                    "type": "string"
+                },
                 "sellaccountid": {
                     "description": "卖方账户ID",
                     "type": "integer"
@@ -37182,6 +37190,14 @@
                 "zscategorydisplay": {
                     "type": "string"
                 },
+                "zscerttype": {
+                    "description": "证书类型 - 枚举”ZSCertType“ - 类型：2，4，5",
+                    "type": "integer"
+                },
+                "zscerttypedisplay": {
+                    "description": "证书类型",
+                    "type": "string"
+                },
                 "zsclaritytypedisplay": {
                     "type": "string"
                 },

docs/swagger.yaml

@@ -13332,6 +13332,9 @@ definitions:
       buywrtradeorderid:
         description: 买委托单ID
         type: string
+      cerno:
+        description: 证书编号 - 类型：2，4，5
+        type: string
       goodsno:
         description: 商品编号
         type: string
@@ -13347,6 +13350,9 @@ definitions:
       price:
         description: 价格
         type: number
+      priceper:
+        description: 克拉单价
+        type: string
       sellaccountid:
         description: 卖方账户ID
         type: integer
@@ -13383,6 +13389,12 @@ definitions:
         type: string
       zscategorydisplay:
         type: string
+      zscerttype:
+        description: 证书类型 - 枚举”ZSCertType“ - 类型：2，4，5
+        type: integer
+      zscerttypedisplay:
+        description: 证书类型
+        type: string
       zsclaritytypedisplay:
         type: string
       zscolortypedisplay:

models/guangzuan.go

@@ -6,6 +6,7 @@ import (
 	"mtp2_if/db"
 	"mtp2_if/mtpcache"
 	"mtp2_if/utils"
+
 	"strconv"
 	"strings"
 	"time"
@@ -1756,6 +1757,11 @@ type MyDelistingApply struct {
 
 	SELLUSERNAME string `json:"sellusername" xorm:"SELLUSERNAME"` // 卖方
 
+	ZSCERTTYPEDISPLAY string `json:"zscerttypedisplay" xorm:"ZSCERTTYPEDISPLAY"` // 证书类型
+	ZSCERTTYPE        int32  `json:"zscerttype" xorm:"ZSCERTTYPE"`               // 证书类型 - 枚举”ZSCertType“ - 类型：2，4，5
+	CERNO             string `json:"cerno" xorm:"CERNO"`                         // 证书编号 - 类型：2，4，5
+	PRICEPER          string `json:"priceper" xorm:"PRICEPER"`                   // 克拉单价
+
 	TYPE   int              `json:"-" form:"type"` // 查询类型 - 0:我的询价 1:我订单的询价
 	PageEx `xorm:"extends"` // 页码信息
 }
@@ -1814,7 +1820,11 @@ func (r *MyDelistingApply) buildSql() string {
 		t.SUBNUM           ,  
 		t.MARKETID,
 		d.PERFORMANCETEMPLATEID,
-		ua1.ACCOUNTNAME SELLUSERNAME        
+		ua1.ACCOUNTNAME SELLUSERNAME,
+		q.ZSCERTTYPEDISPLAY,
+		q.ZSCERTTYPE,
+		q.CERNO,
+		q.PRICEPER
 	FROM GZ_SellDelistingApply t
 	LEFT JOIN VIEW_GZ_BUYORDERDETAIL_QUERY p ON t.BUYWRTRADEORDERID = p.WRTRADEORDERID
 	LEFT JOIN view_GZ_WRStandard_Ex_Query q ON t.WRSTANDARDID = q.WRSTANDARDID