Explorar o código

查询询价-出售接口增加卖方名称出参

zhou.xiaoning %!s(int64=3) %!d(string=hai) anos
pai
achega
b1efcd2d62
Modificáronse 4 ficheiros con 20 adicións e 2 borrados
  1. 5 0
      docs/docs.go
  2. 5 0
      docs/swagger.json
  3. 4 0
      docs/swagger.yaml
  4. 6 2
      models/guangzuan.go

+ 5 - 0
docs/docs.go

@@ -32263,6 +32263,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "buyusername": {
+                    "description": "买方",
                     "type": "string"
                 },
                 "buywrtradeorderid": {
@@ -32305,6 +32306,10 @@ const docTemplate = `{
                     "description": "卖方用户ID",
                     "type": "integer"
                 },
+                "sellusername": {
+                    "description": "卖方",
+                    "type": "string"
+                },
                 "sizedisplay": {
                     "description": "尺寸",
                     "type": "string"

+ 5 - 0
docs/swagger.json

@@ -32254,6 +32254,7 @@
                     "type": "integer"
                 },
                 "buyusername": {
+                    "description": "买方",
                     "type": "string"
                 },
                 "buywrtradeorderid": {
@@ -32296,6 +32297,10 @@
                     "description": "卖方用户ID",
                     "type": "integer"
                 },
+                "sellusername": {
+                    "description": "卖方",
+                    "type": "string"
+                },
                 "sizedisplay": {
                     "description": "尺寸",
                     "type": "string"

+ 4 - 0
docs/swagger.yaml

@@ -11688,6 +11688,7 @@ definitions:
         description: 买方用户ID
         type: integer
       buyusername:
+        description: 买方
         type: string
       buywrtradeorderid:
         description: 买委托单ID
@@ -11719,6 +11720,9 @@ definitions:
       selluserid:
         description: 卖方用户ID
         type: integer
+      sellusername:
+        description: 卖方
+        type: string
       sizedisplay:
         description: 尺寸
         type: string

+ 6 - 2
models/guangzuan.go

@@ -1635,7 +1635,7 @@ func (r *MyBargainApply) GetDataByPage() (interface{}, error, int, int, int) {
 type MyDelistingApply struct {
 	ZSALLPROPERTIES           string `json:"zsallproperties" xorm:"ZSALLPROPERTIES"`                     //
 	ZSTABLEDISPLAY            string `json:"zstabledisplay" xorm:"ZSTABLEDISPLAY"`                       //
-	BUYUSERNAME               string `json:"buyusername" xorm:"BUYUSERNAME"`                             //
+	BUYUSERNAME               string `json:"buyusername" xorm:"BUYUSERNAME"`                             // 买方
 	ZSCATEGORYDISPLAY         string `json:"zscategorydisplay" xorm:"ZSCATEGORYDISPLAY"`                 //
 	ZSCURRENCYTYPEDISPLAY     string `json:"zscurrencytypedisplay" xorm:"ZSCURRENCYTYPEDISPLAY"`         //
 	ZSSHAPETYPEDISPLAY        string `json:"zsshapetypedisplay" xorm:"ZSSHAPETYPEDISPLAY"`               //
@@ -1679,6 +1679,8 @@ type MyDelistingApply struct {
 
 	PERFORMANCETEMPLATEID int64 `json:"performancetemplateid" xorm:"PERFORMANCETEMPLATEID"` // 履约计划模板ID
 
+	SELLUSERNAME string `json:"sellusername" xorm:"SELLUSERNAME"` // 卖方
+
 	TYPE   int              `json:"-" form:"type"` // 查询类型 - 0:我的询价 1:我订单的询价
 	PageEx `xorm:"extends"` // 页码信息
 }
@@ -1735,11 +1737,13 @@ func (r *MyDelistingApply) buildSql() string {
 		to_char(t.LADINGBILLID) LADINGBILLID1   ,  
 		t.SUBNUM           ,  
 		t.MARKETID,
-		d.PERFORMANCETEMPLATEID        
+		d.PERFORMANCETEMPLATEID,
+		ua1.ACCOUNTNAME SELLUSERNAME        
 	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
 	LEFT JOIN Wrtrade_Orderdetail d ON d.wrtradeorderid = t.BUYWRTRADEORDERID
+	LEFT JOIN UserAccount ua1 ON t.SELLUSERID = ua1.userid
 	WHERE t.marketid=67201
 	`