查询询价-求购接口增加买方出参

docs/docs.go

@@ -31734,6 +31734,10 @@ const docTemplate = `{
                     "description": "买卖 - 0:买 1:卖",
                     "type": "integer"
                 },
+                "buyusername": {
+                    "description": "买方",
+                    "type": "string"
+                },
                 "confirmprice": {
                     "description": "可接受价格(拒绝时填写)-作废",
                     "type": "number"

docs/swagger.json

@@ -31725,6 +31725,10 @@
                     "description": "买卖 - 0:买 1:卖",
                     "type": "integer"
                 },
+                "buyusername": {
+                    "description": "买方",
+                    "type": "string"
+                },
                 "confirmprice": {
                     "description": "可接受价格(拒绝时填写)-作废",
                     "type": "number"

docs/swagger.yaml

@@ -11309,6 +11309,9 @@ definitions:
       buyorsell:
         description: 买卖 - 0:买 1:卖
         type: integer
+      buyusername:
+        description: 买方
+        type: string
       confirmprice:
         description: 可接受价格(拒绝时填写)-作废
         type: number

models/guangzuan.go

@@ -1540,6 +1540,7 @@ type MyBargainApply struct {
 	PERFORMANCETEMPLATEID int64 `json:"performancetemplateid" xorm:"PERFORMANCETEMPLATEID"` // 履约计划模板ID
 
 	SELLUSERNAME string `json:"sellusername" xorm:"SELLUSERNAME"` // 卖方
+	BUYUSERNAME  string `json:"buyusername" xorm:"BUYUSERNAME"`   // 买方
 
 	QTY float64 `json:"qty" xorm:"QTY"` // 申请数量
 
@@ -1578,6 +1579,7 @@ func (r *MyBargainApply) buildSql() string {
 		q.ZSCZCOLOR3TYPEDISPLAY,
 		q.GOODSNO,
 		ua.accountname SELLUSERNAME,
+		ua1.accountname BUYUSERNAME,
 		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
@@ -1614,6 +1616,7 @@ func (r *MyBargainApply) buildSql() string {
 		d.PERFORMANCETEMPLATEID
 	FROM WRTrade_BargainApply t
 	LEFT JOIN UserAccount ua ON t.MATCHUSERID = ua.userid
+	LEFT JOIN UserAccount ua1 ON t.USERID = ua1.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