Explorar o código

合同转让添加类型
ordertype 类型 - 1:转让委托 - 挂牌中(卖方) 2:转让成交(卖方) 3:转让委托 - 已完成(卖方)

gitmuchinfo %!s(int64=3) %!d(string=hai) anos
pai
achega
3dbfff3e6b
Modificáronse 4 ficheiros con 11 adicións e 6 borrados
  1. 1 1
      docs/docs.go
  2. 1 1
      docs/swagger.json
  3. 1 1
      docs/swagger.yaml
  4. 8 3
      models/ferroalloy.go

+ 1 - 1
docs/docs.go

@@ -44459,7 +44459,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "ordertype": {
-                    "description": "类型 - 1:转让 2:受让",
+                    "description": "类型 - 1:转让委托 - 挂牌中(卖方) 2:转让成交(卖方) 3:转让委托 - 已完成(卖方)",
                     "type": "integer"
                 },
                 "payeddeposit": {

+ 1 - 1
docs/swagger.json

@@ -44450,7 +44450,7 @@
                     "type": "integer"
                 },
                 "ordertype": {
-                    "description": "类型 - 1:转让 2:受让",
+                    "description": "类型 - 1:转让委托 - 挂牌中(卖方) 2:转让成交(卖方) 3:转让委托 - 已完成(卖方)",
                     "type": "integer"
                 },
                 "payeddeposit": {

+ 1 - 1
docs/swagger.yaml

@@ -18941,7 +18941,7 @@ definitions:
         description: 市场ID(固定为(64202)
         type: integer
       ordertype:
-        description: 类型 - 1:转让 2:受让
+        description: 类型 - 1:转让委托 - 挂牌中(卖方) 2:转让成交(卖方) 3:转让委托 - 已完成(卖方)
         type: integer
       payeddeposit:
         description: 买方已付定金

+ 8 - 3
models/ferroalloy.go

@@ -1250,7 +1250,7 @@ type Thjpurchasetransfer struct {
 	WRSTANDARDNAME string `json:"wrstandardname" xorm:"WRSTANDARDNAME"` // 现货商品名称
 
 	USERID    int64 `json:"-" xorm:"-" form:"userid" binding:"required"`                    // 用户ID
-	ORDERTYPE int   `json:"ordertype" xorm:"ORDERTYPE" form:"ordertype" binding:"required"` // 类型 - 1:转让 2:受让
+	ORDERTYPE int   `json:"ordertype" xorm:"ORDERTYPE" form:"ordertype" binding:"required"` // 类型 - 1:转让委托 - 挂牌中(卖方) 2:转让成交(卖方) 3:转让委托 - 已完成(卖方)
 
 	PageEx `xorm:"extends"` // 页码信息
 }
@@ -1293,11 +1293,16 @@ func (r *Thjpurchasetransfer) buildSql() string {
 	from THJ_PurchaseTransfer t
 	inner join THJ_PurchaseTradeDetail p on t.wrtradedetailid = p.wrtradedetailid
 	inner join wrstandard wr on t.wrstandardid = wr.wrstandardid
-	where %v and t.transferstatus = 1
+	where %v and 1=1
 `
-	param := fmt.Sprintf("t.selluserid = %v", r.USERID)
+	//转让委托 - 挂牌中  -卖方
+	param := fmt.Sprintf("t.selluserid = %v and t.transferstatus = 1", r.USERID)
 	if r.ORDERTYPE == 2 {
+		//转让成交 - 买方
 		param = fmt.Sprintf("t.buyuserid = %v", r.USERID)
+	} else if r.ORDERTYPE == 3 {
+		//转让委托 - 已完成 - 卖方
+		param = fmt.Sprintf("t.selluserid = %v and t.transferstatus in (2,3,4)", r.USERID)
 	}
 	sqlId.FormatParam(r.ORDERTYPE, param)