Explorar o código

QueryTHJPurchaseTransferOrderDetail:添加返回字段
pointflag, pointprice,pointincome

deng.yinping %!s(int64=2) %!d(string=hai) anos
pai
achega
fdddc31568
Modificáronse 4 ficheiros con 41 adicións e 1 borrados
  1. 12 0
      docs/docs.go
  2. 12 0
      docs/swagger.json
  3. 9 0
      docs/swagger.yaml
  4. 8 1
      models/ferroalloy.go

+ 12 - 0
docs/docs.go

@@ -47696,6 +47696,18 @@ const docTemplate = `{
                     "description": "买方已付定金(预付款(含定金))",
                     "type": "number"
                 },
+                "pointflag": {
+                    "description": "是否已点价",
+                    "type": "boolean"
+                },
+                "pointincome": {
+                    "description": "点价总收益",
+                    "type": "number"
+                },
+                "pointprice": {
+                    "description": "已点价格",
+                    "type": "number"
+                },
                 "receiptinfo": {
                     "description": "发票信息",
                     "type": "string"

+ 12 - 0
docs/swagger.json

@@ -47687,6 +47687,18 @@
                     "description": "买方已付定金(预付款(含定金))",
                     "type": "number"
                 },
+                "pointflag": {
+                    "description": "是否已点价",
+                    "type": "boolean"
+                },
+                "pointincome": {
+                    "description": "点价总收益",
+                    "type": "number"
+                },
+                "pointprice": {
+                    "description": "已点价格",
+                    "type": "number"
+                },
                 "receiptinfo": {
                     "description": "发票信息",
                     "type": "string"

+ 9 - 0
docs/swagger.yaml

@@ -20365,6 +20365,15 @@ definitions:
       payeddeposit:
         description: 买方已付定金(预付款(含定金))
         type: number
+      pointflag:
+        description: 是否已点价
+        type: boolean
+      pointincome:
+        description: 点价总收益
+        type: number
+      pointprice:
+        description: 已点价格
+        type: number
       receiptinfo:
         description: 发票信息
         type: string

+ 8 - 1
models/ferroalloy.go

@@ -1462,6 +1462,10 @@ type ThjpurchasetransferDetail struct {
 	TRANSFERTRADETIME string  `json:"transfertradetime" xorm:"TRANSFERTRADETIME"` // 转让成交时间
 	CONTRACTADDR      string  `json:"contractaddr" xorm:"CONTRACTADDR"`           // 协议转让合同地址
 
+	POINTFLAG   bool    `json:"pointflag" xorm:"POINTFLAG"`     // 是否已点价
+	POINTPRICE  float64 `json:"pointprice" xorm:"POINTPRICE"`   // 已点价格
+	POINTINCOME float64 `json:"pointincome" xorm:"POINTINCOME"` // 点价总收益
+
 }
 
 func (r *ThjpurchasetransferDetail) calc() {
@@ -1499,7 +1503,10 @@ func (r *ThjpurchasetransferDetail) buildSql() string {
 		to_char(t.CREATETIME, 'yyyy-MM-dd hh24:mi:ss') CREATETIME,
 		to_char(t.TRANSFERTRADETIME, 'yyyy-MM-dd hh24:mi:ss') TRANSFERTRADETIME,
 		to_char(t.WRTRADEDETAILID) WRTRADEDETAILID,
-		t.CONTRACTADDR
+		t.CONTRACTADDR,
+		d.POINTFLAG, 
+        d.POINTPRICE,
+        d.POINTINCOME
 	from THJ_PurchaseTransfer t 
 	inner join THJ_PurchaseTradeDetail d on d.WRTRADEDETAILID = t.WRTRADEDETAILID
 	left join wr_presaleinfo pi on pi.presaleapplyid = t.presaleapplyid