按需求增加询价接口出参

docs/docs.go

@@ -27825,6 +27825,9 @@ const docTemplate = `{
                     "description": "摘牌人用户ID",
                     "type": "integer"
                 },
+                "warehousenamedisplay": {
+                    "type": "string"
+                },
                 "wrbargainid": {
                     "description": "[询价单号]议价申请单ID(327+Unix秒时间戳(10位)+xxxxxx)",
                     "type": "string"
@@ -27832,6 +27835,69 @@ const docTemplate = `{
                 "wrtradeorderid": {
                     "description": "关联委托单ID",
                     "type": "integer"
+                },
+                "zscerttypedisplay": {
+                    "type": "string"
+                },
+                "zsclaritytype1display": {
+                    "type": "string"
+                },
+                "zsclaritytype2display": {
+                    "type": "string"
+                },
+                "zscolortype1display": {
+                    "type": "string"
+                },
+                "zscolortype2display": {
+                    "type": "string"
+                },
+                "zscrystaltypedisplay": {
+                    "type": "string"
+                },
+                "zscurrencytypedisplay": {
+                    "type": "string"
+                },
+                "zscurrencytypedisplayunit": {
+                    "type": "string"
+                },
+                "zscuttype1display": {
+                    "type": "string"
+                },
+                "zscuttype2display": {
+                    "type": "string"
+                },
+                "zsczcolor1typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor2typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor3typedisplay": {
+                    "type": "string"
+                },
+                "zsfluorescencetype1display": {
+                    "type": "string"
+                },
+                "zsfluorescencetype2display": {
+                    "type": "string"
+                },
+                "zspolishtype1display": {
+                    "type": "string"
+                },
+                "zspolishtype2display": {
+                    "type": "string"
+                },
+                "zsshapetypedisplay": {
+                    "type": "string"
+                },
+                "zsstyletypedisplay": {
+                    "type": "string"
+                },
+                "zssymmetrytype1display": {
+                    "type": "string"
+                },
+                "zssymmetrytype2display": {
+                    "type": "string"
                 }
             }
         },
@@ -28215,6 +28281,10 @@ const docTemplate = `{
                     "description": "买委托单ID",
                     "type": "integer"
                 },
+                "goodsno": {
+                    "description": "商品编号",
+                    "type": "string"
+                },
                 "ladingbillid": {
                     "description": "卖方提单ID",
                     "type": "integer"
@@ -28243,6 +28313,9 @@ const docTemplate = `{
                     "description": "卖方提单子单号",
                     "type": "integer"
                 },
+                "warehousenamedisplay": {
+                    "type": "string"
+                },
                 "wrfactortypeid": {
                     "description": "仓单要素类型ID",
                     "type": "integer"
@@ -28250,6 +28323,69 @@ const docTemplate = `{
                 "wrstandardid": {
                     "description": "现货商品ID",
                     "type": "integer"
+                },
+                "zscerttypedisplay": {
+                    "type": "string"
+                },
+                "zsclaritytype1display": {
+                    "type": "string"
+                },
+                "zsclaritytype2display": {
+                    "type": "string"
+                },
+                "zscolortype1display": {
+                    "type": "string"
+                },
+                "zscolortype2display": {
+                    "type": "string"
+                },
+                "zscrystaltypedisplay": {
+                    "type": "string"
+                },
+                "zscurrencytypedisplay": {
+                    "type": "string"
+                },
+                "zscurrencytypedisplayunit": {
+                    "type": "string"
+                },
+                "zscuttype1display": {
+                    "type": "string"
+                },
+                "zscuttype2display": {
+                    "type": "string"
+                },
+                "zsczcolor1typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor2typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor3typedisplay": {
+                    "type": "string"
+                },
+                "zsfluorescencetype1display": {
+                    "type": "string"
+                },
+                "zsfluorescencetype2display": {
+                    "type": "string"
+                },
+                "zspolishtype1display": {
+                    "type": "string"
+                },
+                "zspolishtype2display": {
+                    "type": "string"
+                },
+                "zsshapetypedisplay": {
+                    "type": "string"
+                },
+                "zsstyletypedisplay": {
+                    "type": "string"
+                },
+                "zssymmetrytype1display": {
+                    "type": "string"
+                },
+                "zssymmetrytype2display": {
+                    "type": "string"
                 }
             }
         },

docs/swagger.json

@@ -27816,6 +27816,9 @@
                     "description": "摘牌人用户ID",
                     "type": "integer"
                 },
+                "warehousenamedisplay": {
+                    "type": "string"
+                },
                 "wrbargainid": {
                     "description": "[询价单号]议价申请单ID(327+Unix秒时间戳(10位)+xxxxxx)",
                     "type": "string"
@@ -27823,6 +27826,69 @@
                 "wrtradeorderid": {
                     "description": "关联委托单ID",
                     "type": "integer"
+                },
+                "zscerttypedisplay": {
+                    "type": "string"
+                },
+                "zsclaritytype1display": {
+                    "type": "string"
+                },
+                "zsclaritytype2display": {
+                    "type": "string"
+                },
+                "zscolortype1display": {
+                    "type": "string"
+                },
+                "zscolortype2display": {
+                    "type": "string"
+                },
+                "zscrystaltypedisplay": {
+                    "type": "string"
+                },
+                "zscurrencytypedisplay": {
+                    "type": "string"
+                },
+                "zscurrencytypedisplayunit": {
+                    "type": "string"
+                },
+                "zscuttype1display": {
+                    "type": "string"
+                },
+                "zscuttype2display": {
+                    "type": "string"
+                },
+                "zsczcolor1typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor2typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor3typedisplay": {
+                    "type": "string"
+                },
+                "zsfluorescencetype1display": {
+                    "type": "string"
+                },
+                "zsfluorescencetype2display": {
+                    "type": "string"
+                },
+                "zspolishtype1display": {
+                    "type": "string"
+                },
+                "zspolishtype2display": {
+                    "type": "string"
+                },
+                "zsshapetypedisplay": {
+                    "type": "string"
+                },
+                "zsstyletypedisplay": {
+                    "type": "string"
+                },
+                "zssymmetrytype1display": {
+                    "type": "string"
+                },
+                "zssymmetrytype2display": {
+                    "type": "string"
                 }
             }
         },
@@ -28206,6 +28272,10 @@
                     "description": "买委托单ID",
                     "type": "integer"
                 },
+                "goodsno": {
+                    "description": "商品编号",
+                    "type": "string"
+                },
                 "ladingbillid": {
                     "description": "卖方提单ID",
                     "type": "integer"
@@ -28234,6 +28304,9 @@
                     "description": "卖方提单子单号",
                     "type": "integer"
                 },
+                "warehousenamedisplay": {
+                    "type": "string"
+                },
                 "wrfactortypeid": {
                     "description": "仓单要素类型ID",
                     "type": "integer"
@@ -28241,6 +28314,69 @@
                 "wrstandardid": {
                     "description": "现货商品ID",
                     "type": "integer"
+                },
+                "zscerttypedisplay": {
+                    "type": "string"
+                },
+                "zsclaritytype1display": {
+                    "type": "string"
+                },
+                "zsclaritytype2display": {
+                    "type": "string"
+                },
+                "zscolortype1display": {
+                    "type": "string"
+                },
+                "zscolortype2display": {
+                    "type": "string"
+                },
+                "zscrystaltypedisplay": {
+                    "type": "string"
+                },
+                "zscurrencytypedisplay": {
+                    "type": "string"
+                },
+                "zscurrencytypedisplayunit": {
+                    "type": "string"
+                },
+                "zscuttype1display": {
+                    "type": "string"
+                },
+                "zscuttype2display": {
+                    "type": "string"
+                },
+                "zsczcolor1typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor2typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor3typedisplay": {
+                    "type": "string"
+                },
+                "zsfluorescencetype1display": {
+                    "type": "string"
+                },
+                "zsfluorescencetype2display": {
+                    "type": "string"
+                },
+                "zspolishtype1display": {
+                    "type": "string"
+                },
+                "zspolishtype2display": {
+                    "type": "string"
+                },
+                "zsshapetypedisplay": {
+                    "type": "string"
+                },
+                "zsstyletypedisplay": {
+                    "type": "string"
+                },
+                "zssymmetrytype1display": {
+                    "type": "string"
+                },
+                "zssymmetrytype2display": {
+                    "type": "string"
                 }
             }
         },

docs/swagger.yaml

@@ -10841,12 +10841,56 @@ definitions:
       userid:
         description: 摘牌人用户ID
         type: integer
+      warehousenamedisplay:
+        type: string
       wrbargainid:
         description: '[询价单号]议价申请单ID(327+Unix秒时间戳(10位)+xxxxxx)'
         type: string
       wrtradeorderid:
         description: 关联委托单ID
         type: integer
+      zscerttypedisplay:
+        type: string
+      zsclaritytype1display:
+        type: string
+      zsclaritytype2display:
+        type: string
+      zscolortype1display:
+        type: string
+      zscolortype2display:
+        type: string
+      zscrystaltypedisplay:
+        type: string
+      zscurrencytypedisplay:
+        type: string
+      zscurrencytypedisplayunit:
+        type: string
+      zscuttype1display:
+        type: string
+      zscuttype2display:
+        type: string
+      zsczcolor1typedisplay:
+        type: string
+      zsczcolor2typedisplay:
+        type: string
+      zsczcolor3typedisplay:
+        type: string
+      zsfluorescencetype1display:
+        type: string
+      zsfluorescencetype2display:
+        type: string
+      zspolishtype1display:
+        type: string
+      zspolishtype2display:
+        type: string
+      zsshapetypedisplay:
+        type: string
+      zsstyletypedisplay:
+        type: string
+      zssymmetrytype1display:
+        type: string
+      zssymmetrytype2display:
+        type: string
     required:
     - userid
     type: object
@@ -11121,6 +11165,9 @@ definitions:
       buywrtradeorderid:
         description: 买委托单ID
         type: integer
+      goodsno:
+        description: 商品编号
+        type: string
       ladingbillid:
         description: 卖方提单ID
         type: integer
@@ -11142,12 +11189,56 @@ definitions:
       subnum:
         description: 卖方提单子单号
         type: integer
+      warehousenamedisplay:
+        type: string
       wrfactortypeid:
         description: 仓单要素类型ID
         type: integer
       wrstandardid:
         description: 现货商品ID
         type: integer
+      zscerttypedisplay:
+        type: string
+      zsclaritytype1display:
+        type: string
+      zsclaritytype2display:
+        type: string
+      zscolortype1display:
+        type: string
+      zscolortype2display:
+        type: string
+      zscrystaltypedisplay:
+        type: string
+      zscurrencytypedisplay:
+        type: string
+      zscurrencytypedisplayunit:
+        type: string
+      zscuttype1display:
+        type: string
+      zscuttype2display:
+        type: string
+      zsczcolor1typedisplay:
+        type: string
+      zsczcolor2typedisplay:
+        type: string
+      zsczcolor3typedisplay:
+        type: string
+      zsfluorescencetype1display:
+        type: string
+      zsfluorescencetype2display:
+        type: string
+      zspolishtype1display:
+        type: string
+      zspolishtype2display:
+        type: string
+      zsshapetypedisplay:
+        type: string
+      zsstyletypedisplay:
+        type: string
+      zssymmetrytype1display:
+        type: string
+      zssymmetrytype2display:
+        type: string
     required:
     - selluserid
     type: object

models/guangzuan.go

@@ -985,6 +985,29 @@ func (r *MyDeListing) GetDataByPage() (interface{}, error, int, int, int) {
 
 // MyBargainApply 我的询价-求购
 type MyBargainApply struct {
+	ZSCURRENCYTYPEDISPLAY      string `json:"zscurrencytypedisplay" xorm:"ZSCURRENCYTYPEDISPLAY"`           //
+	ZSCURRENCYTYPEDISPLAYUNIT  string `json:"zscurrencytypedisplayunit" xorm:"ZSCURRENCYTYPEDISPLAYUNIT"`   //
+	WAREHOUSENAMEDISPLAY       string `json:"warehousenamedisplay" xorm:"WAREHOUSENAMEDISPLAY"`             //
+	ZSSHAPETYPEDISPLAY         string `json:"zsshapetypedisplay" xorm:"ZSSHAPETYPEDISPLAY"`                 //
+	ZSCOLORTYPE1DISPLAY        string `json:"zscolortype1display" xorm:"ZSCOLORTYPE1DISPLAY"`               //
+	ZSCOLORTYPE2DISPLAY        string `json:"zscolortype2display" xorm:"ZSCOLORTYPE2DISPLAY"`               //
+	ZSCLARITYTYPE1DISPLAY      string `json:"zsclaritytype1display" xorm:"ZSCLARITYTYPE1DISPLAY"`           //
+	ZSCLARITYTYPE2DISPLAY      string `json:"zsclaritytype2display" xorm:"ZSCLARITYTYPE2DISPLAY"`           //
+	ZSCUTTYPE1DISPLAY          string `json:"zscuttype1display" xorm:"ZSCUTTYPE1DISPLAY"`                   //
+	ZSCUTTYPE2DISPLAY          string `json:"zscuttype2display" xorm:"ZSCUTTYPE2DISPLAY"`                   //
+	ZSSYMMETRYTYPE1DISPLAY     string `json:"zssymmetrytype1display" xorm:"ZSSYMMETRYTYPE1DISPLAY"`         //
+	ZSSYMMETRYTYPE2DISPLAY     string `json:"zssymmetrytype2display" xorm:"ZSSYMMETRYTYPE2DISPLAY"`         //
+	ZSPOLISHTYPE1DISPLAY       string `json:"zspolishtype1display" xorm:"ZSPOLISHTYPE1DISPLAY"`             //
+	ZSPOLISHTYPE2DISPLAY       string `json:"zspolishtype2display" xorm:"ZSPOLISHTYPE2DISPLAY"`             //
+	ZSFLUORESCENCETYPE1DISPLAY string `json:"zsfluorescencetype1display" xorm:"ZSFLUORESCENCETYPE1DISPLAY"` //
+	ZSFLUORESCENCETYPE2DISPLAY string `json:"zsfluorescencetype2display" xorm:"ZSFLUORESCENCETYPE2DISPLAY"` //
+	ZSCERTTYPEDISPLAY          string `json:"zscerttypedisplay" xorm:"ZSCERTTYPEDISPLAY"`                   //
+	ZSCRYSTALTYPEDISPLAY       string `json:"zscrystaltypedisplay" xorm:"ZSCRYSTALTYPEDISPLAY"`             //
+	ZSSTYLETYPEDISPLAY         string `json:"zsstyletypedisplay" xorm:"ZSSTYLETYPEDISPLAY"`                 //
+	ZSCZCOLOR1TYPEDISPLAY      string `json:"zsczcolor1typedisplay" xorm:"ZSCZCOLOR1TYPEDISPLAY"`           //
+	ZSCZCOLOR2TYPEDISPLAY      string `json:"zsczcolor2typedisplay" xorm:"ZSCZCOLOR2TYPEDISPLAY"`           //
+	ZSCZCOLOR3TYPEDISPLAY      string `json:"zsczcolor3typedisplay" xorm:"ZSCZCOLOR3TYPEDISPLAY"`           //
+
 	WRBARGAINID    string    `json:"wrbargainid" xorm:"WRBARGAINID1"`                       // [询价单号]议价申请单ID(327+Unix秒时间戳(10位)+xxxxxx)
 	WRTRADEORDERID int64     `json:"wrtradeorderid" xorm:"WRTRADEORDERID"`                  // 关联委托单ID
 	TRADEDATE      string    `json:"tradedate" xorm:"TRADEDATE"`                            // 交易日(yyyyMMdd)
@@ -1023,7 +1046,29 @@ func (r *MyBargainApply) calc() {
 
 func (r *MyBargainApply) buildSql() string {
 	var sqlId utils.SQLVal = `
-	SELECT 
+	SELECT
+		q.ZSCURRENCYTYPEDISPLAY,
+		q.ZSCURRENCYTYPEDISPLAYUNIT,
+		q.WAREHOUSENAMEDISPLAY,
+		q.ZSSHAPETYPEDISPLAY,
+		q.ZSCOLORTYPE1DISPLAY,
+		q.ZSCOLORTYPE2DISPLAY,
+		q.ZSCLARITYTYPE1DISPLAY,
+		q.ZSCLARITYTYPE2DISPLAY,
+		q.ZSCUTTYPE1DISPLAY,
+		q.ZSCUTTYPE2DISPLAY,
+		q.ZSSYMMETRYTYPE1DISPLAY,
+		q.ZSSYMMETRYTYPE2DISPLAY,
+		q.ZSPOLISHTYPE1DISPLAY,
+		q.ZSPOLISHTYPE2DISPLAY,
+		q.ZSFLUORESCENCETYPE1DISPLAY,
+		q.ZSFLUORESCENCETYPE2DISPLAY,
+		q.ZSCERTTYPEDISPLAY,
+		q.ZSCRYSTALTYPEDISPLAY,
+		q.ZSSTYLETYPEDISPLAY,
+		q.ZSCZCOLOR1TYPEDISPLAY,
+		q.ZSCZCOLOR2TYPEDISPLAY,
+		q.ZSCZCOLOR3TYPEDISPLAY,
 		ua.accountname SELLUSERNAME,
 		(t.APPLYQTY / 100) QTY,
 		to_char(t.APPLYTIME, 'yyyy-mm-dd hh24:mi:ss') APPLYTIME1,
@@ -1031,6 +1076,8 @@ func (r *MyBargainApply) buildSql() string {
 		t.*
 	FROM WRTrade_BargainApply t
 	LEFT JOIN UserAccount ua ON t.MATCHUSERID = ua.userid
+	LEFT JOIN Wrtrade_Orderdetail d ON d.wrtradeorderid = t.wrtradeorderid
+	LEFT JOIN view_GZ_WRStandard_Ex_Query q ON d.wrstandardid = q.wrstandardid
 	WHERE t.marketid=67201
 	`
 
@@ -1055,6 +1102,30 @@ func (r *MyBargainApply) GetDataByPage() (interface{}, error, int, int, int) {
 
 // MyDelistingApply 我的询价-出售
 type MyDelistingApply struct {
+	GOODSNO                    string `json:"goodsno" xorm:"GOODSNO"`                                       // 商品编号
+	ZSCURRENCYTYPEDISPLAY      string `json:"zscurrencytypedisplay" xorm:"ZSCURRENCYTYPEDISPLAY"`           //
+	ZSCURRENCYTYPEDISPLAYUNIT  string `json:"zscurrencytypedisplayunit" xorm:"ZSCURRENCYTYPEDISPLAYUNIT"`   //
+	WAREHOUSENAMEDISPLAY       string `json:"warehousenamedisplay" xorm:"WAREHOUSENAMEDISPLAY"`             //
+	ZSSHAPETYPEDISPLAY         string `json:"zsshapetypedisplay" xorm:"ZSSHAPETYPEDISPLAY"`                 //
+	ZSCOLORTYPE1DISPLAY        string `json:"zscolortype1display" xorm:"ZSCOLORTYPE1DISPLAY"`               //
+	ZSCOLORTYPE2DISPLAY        string `json:"zscolortype2display" xorm:"ZSCOLORTYPE2DISPLAY"`               //
+	ZSCLARITYTYPE1DISPLAY      string `json:"zsclaritytype1display" xorm:"ZSCLARITYTYPE1DISPLAY"`           //
+	ZSCLARITYTYPE2DISPLAY      string `json:"zsclaritytype2display" xorm:"ZSCLARITYTYPE2DISPLAY"`           //
+	ZSCUTTYPE1DISPLAY          string `json:"zscuttype1display" xorm:"ZSCUTTYPE1DISPLAY"`                   //
+	ZSCUTTYPE2DISPLAY          string `json:"zscuttype2display" xorm:"ZSCUTTYPE2DISPLAY"`                   //
+	ZSSYMMETRYTYPE1DISPLAY     string `json:"zssymmetrytype1display" xorm:"ZSSYMMETRYTYPE1DISPLAY"`         //
+	ZSSYMMETRYTYPE2DISPLAY     string `json:"zssymmetrytype2display" xorm:"ZSSYMMETRYTYPE2DISPLAY"`         //
+	ZSPOLISHTYPE1DISPLAY       string `json:"zspolishtype1display" xorm:"ZSPOLISHTYPE1DISPLAY"`             //
+	ZSPOLISHTYPE2DISPLAY       string `json:"zspolishtype2display" xorm:"ZSPOLISHTYPE2DISPLAY"`             //
+	ZSFLUORESCENCETYPE1DISPLAY string `json:"zsfluorescencetype1display" xorm:"ZSFLUORESCENCETYPE1DISPLAY"` //
+	ZSFLUORESCENCETYPE2DISPLAY string `json:"zsfluorescencetype2display" xorm:"ZSFLUORESCENCETYPE2DISPLAY"` //
+	ZSCERTTYPEDISPLAY          string `json:"zscerttypedisplay" xorm:"ZSCERTTYPEDISPLAY"`                   //
+	ZSCRYSTALTYPEDISPLAY       string `json:"zscrystaltypedisplay" xorm:"ZSCRYSTALTYPEDISPLAY"`             //
+	ZSSTYLETYPEDISPLAY         string `json:"zsstyletypedisplay" xorm:"ZSSTYLETYPEDISPLAY"`                 //
+	ZSCZCOLOR1TYPEDISPLAY      string `json:"zsczcolor1typedisplay" xorm:"ZSCZCOLOR1TYPEDISPLAY"`           //
+	ZSCZCOLOR2TYPEDISPLAY      string `json:"zsczcolor2typedisplay" xorm:"ZSCZCOLOR2TYPEDISPLAY"`           //
+	ZSCZCOLOR3TYPEDISPLAY      string `json:"zsczcolor3typedisplay" xorm:"ZSCZCOLOR3TYPEDISPLAY"`           //
+
 	SELLDELISTINGAPPLYID int64     `json:"selldelistingapplyid" xorm:"SELLDELISTINGAPPLYID"`              // [询价单号]卖摘牌申请ID(916+Unix秒时间戳(10位)+xxxxxx)
 	BUYWRTRADEORDERID    int64     `json:"buywrtradeorderid" xorm:"BUYWRTRADEORDERID"`                    // 买委托单ID
 	BUYUSERID            int64     `json:"buyuserid" xorm:"BUYUSERID"`                                    // 买方用户ID
@@ -1086,11 +1157,35 @@ func (r *MyDelistingApply) calc() {
 func (r *MyDelistingApply) buildSql() string {
 	var sqlId utils.SQLVal = `
 	SELECT 
+		q.GOODSNO,
+		q.ZSCURRENCYTYPEDISPLAY,
+		q.ZSCURRENCYTYPEDISPLAYUNIT,
+		q.WAREHOUSENAMEDISPLAY,
+		q.ZSSHAPETYPEDISPLAY,
+		q.ZSCOLORTYPE1DISPLAY,
+		q.ZSCOLORTYPE2DISPLAY,
+		q.ZSCLARITYTYPE1DISPLAY,
+		q.ZSCLARITYTYPE2DISPLAY,
+		q.ZSCUTTYPE1DISPLAY,
+		q.ZSCUTTYPE2DISPLAY,
+		q.ZSSYMMETRYTYPE1DISPLAY,
+		q.ZSSYMMETRYTYPE2DISPLAY,
+		q.ZSPOLISHTYPE1DISPLAY,
+		q.ZSPOLISHTYPE2DISPLAY,
+		q.ZSFLUORESCENCETYPE1DISPLAY,
+		q.ZSFLUORESCENCETYPE2DISPLAY,
+		q.ZSCERTTYPEDISPLAY,
+		q.ZSCRYSTALTYPEDISPLAY,
+		q.ZSSTYLETYPEDISPLAY,
+		q.ZSCZCOLOR1TYPEDISPLAY,
+		q.ZSCZCOLOR2TYPEDISPLAY,
+		q.ZSCZCOLOR3TYPEDISPLAY,
 		ua.accountname BUYUSERNAME,
 		to_char(t.APPLYTIME, 'yyyy-mm-dd hh24:mi:ss') APPLYTIME1,
 		t.*
 	FROM GZ_SellDelistingApply t
 	LEFT JOIN UserAccount ua ON t.BUYUSERID = ua.userid
+	LEFT JOIN view_GZ_WRStandard_Ex_Query q ON t.WRSTANDARDID = q.WRSTANDARDID
 	WHERE t.marketid=67201
 	`