交收月份(提货日期)： TAKESTARTDATE

到期日期: ENDDATE

docs/docs.go

@@ -38266,24 +38266,12 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "profitstatus": {
-                    "description": "状态 - 0:全部 1:已支付 2:未支付",
+                    "description": "状态 - 1:已支付 2:未支付 3:支取中",
                     "type": "integer"
                 },
                 "sumamount": {
                     "description": "金额",
                     "type": "number"
-                },
-                "wrstandardcode": {
-                    "description": "现货商品代码",
-                    "type": "string"
-                },
-                "wrstandardid": {
-                    "description": "现货商品ID",
-                    "type": "integer"
-                },
-                "wrstandardname": {
-                    "description": "现货商品名称",
-                    "type": "string"
                 }
             }
         },
@@ -44599,11 +44587,11 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "enddate": {
-                    "description": "到期日期(交收日期)",
+                    "description": "到期日期",
                     "type": "string"
                 },
                 "enddatemonth": {
-                    "description": "到期月份",
+                    "description": "交收月份(提货日期)",
                     "type": "string"
                 },
                 "handlestatus": {
@@ -44775,11 +44763,11 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "enddate": {
-                    "description": "交收日期",
+                    "description": "到期日期",
                     "type": "string"
                 },
                 "enddatemonth": {
-                    "description": "交收月份",
+                    "description": "交收月份(提货日期)",
                     "type": "string"
                 },
                 "handlestatus": {
@@ -44932,11 +44920,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "enddate": {
-                    "description": "到期日期(交收日期)",
+                    "description": "到期日期",
                     "type": "string"
                 },
                 "enddatemonth": {
-                    "description": "到期月份",
+                    "description": "交收月份(提货日期)",
                     "type": "string"
                 },
                 "lastprice": {

docs/swagger.json

@@ -38257,24 +38257,12 @@
                     "type": "string"
                 },
                 "profitstatus": {
-                    "description": "状态 - 0:全部 1:已支付 2:未支付",
+                    "description": "状态 - 1:已支付 2:未支付 3:支取中",
                     "type": "integer"
                 },
                 "sumamount": {
                     "description": "金额",
                     "type": "number"
-                },
-                "wrstandardcode": {
-                    "description": "现货商品代码",
-                    "type": "string"
-                },
-                "wrstandardid": {
-                    "description": "现货商品ID",
-                    "type": "integer"
-                },
-                "wrstandardname": {
-                    "description": "现货商品名称",
-                    "type": "string"
                 }
             }
         },
@@ -44590,11 +44578,11 @@
                     "type": "number"
                 },
                 "enddate": {
-                    "description": "到期日期(交收日期)",
+                    "description": "到期日期",
                     "type": "string"
                 },
                 "enddatemonth": {
-                    "description": "到期月份",
+                    "description": "交收月份(提货日期)",
                     "type": "string"
                 },
                 "handlestatus": {
@@ -44766,11 +44754,11 @@
                     "type": "integer"
                 },
                 "enddate": {
-                    "description": "交收日期",
+                    "description": "到期日期",
                     "type": "string"
                 },
                 "enddatemonth": {
-                    "description": "交收月份",
+                    "description": "交收月份(提货日期)",
                     "type": "string"
                 },
                 "handlestatus": {
@@ -44923,11 +44911,11 @@
                     "type": "string"
                 },
                 "enddate": {
-                    "description": "到期日期(交收日期)",
+                    "description": "到期日期",
                     "type": "string"
                 },
                 "enddatemonth": {
-                    "description": "到期月份",
+                    "description": "交收月份(提货日期)",
                     "type": "string"
                 },
                 "lastprice": {

docs/swagger.yaml

@@ -14228,20 +14228,11 @@ definitions:
         description: 时间
         type: string
       profitstatus:
-        description: 状态 - 0:全部 1:已支付 2:未支付
+        description: 状态 - 1:已支付 2:未支付 3:支取中
         type: integer
       sumamount:
         description: 金额
         type: number
-      wrstandardcode:
-        description: 现货商品代码
-        type: string
-      wrstandardid:
-        description: 现货商品ID
-        type: integer
-      wrstandardname:
-        description: 现货商品名称
-        type: string
     type: object
   models.PromotionIncomeDetail:
     properties:
@@ -18911,10 +18902,10 @@ definitions:
         description: 优惠总金额(优惠金额*TradeQty)
         type: number
       enddate:
-        description: 到期日期(交收日期)
+        description: 到期日期
         type: string
       enddatemonth:
-        description: 到期月份
+        description: 交收月份(提货日期)
         type: string
       handlestatus:
         description: 处理状态
@@ -19043,10 +19034,10 @@ definitions:
         description: 现货品种ID
         type: integer
       enddate:
-        description: 交收日期
+        description: 到期日期
         type: string
       enddatemonth:
-        description: 交收月份
+        description: 交收月份(提货日期)
         type: string
       handlestatus:
         description: 处理状态
@@ -19162,10 +19153,10 @@ definitions:
         description: 目的地地址
         type: string
       enddate:
-        description: 到期日期(交收日期)
+        description: 到期日期
         type: string
       enddatemonth:
-        description: 到期月份
+        description: 交收月份(提货日期)
         type: string
       lastprice:
         description: '[实际价]到期价格'

models/ferroalloy.go

@@ -590,7 +590,7 @@ func (r *THJWrstandardDetailReq) GetTHJWrstandardDetail() (rsp *THJWrstandardDet
 	sql = fmt.Sprintf(`
 		select
 			to_char(t.PRESALEAPPLYID) PRESALEAPPLYID,  
-			to_char(t.ENDDATE, 'yyyy-mm') ENDMONTH, 
+			to_char(t.TAKESTARTDATE, 'yyyy-mm') ENDMONTH, 
 			to_char(t.ENDDATE, 'yyyy-mm-dd') ENDDATE, 
 			t.UNITPRICE,
 			od.ORDERQTY,
@@ -700,8 +700,8 @@ type Thjpurchasetradedetail struct {
 	THJDELIVERYMODEDISPLAY string `json:"thjdeliverymodedisplay" xorm:"THJDELIVERYMODEDISPLAY"` // 提货方式
 	THJORDERSTATUSDISPLAY  string `json:"thjorderstatusdisplay" xorm:"THJORDERSTATUSDISPLAY"`   // 状态
 
-	ENDDATEMONTH  string  `json:"enddatemonth" xorm:"ENDDATEMONTH"`   // 到期月份
-	ENDDATE       string  `json:"enddate" xorm:"ENDDATE"`             // 到期日期(交收日期)
+	ENDDATEMONTH  string  `json:"enddatemonth" xorm:"ENDDATEMONTH"`   // 交收月份(提货日期)
+	ENDDATE       string  `json:"enddate" xorm:"ENDDATE"`             // 到期日期
 	UNITID        int32   `json:"unitid" xorm:"UNITID"`               // 商品单位
 	TRANSFERPRICE float64 `json:"transferprice" xorm:"TRANSFERPRICE"` // 转让价格 - 购买价
 	CREATETIME    string  `json:"createtime" xorm:"CREATETIME"`       // 预售挂牌时间
@@ -766,8 +766,8 @@ func (r *Thjpurchasetradedetail) buildSql() string {
 		t.PAYEDTRADEDATE,
 		t.BUYFREEZECHARGE,
 		t.LASTPRICEDATE,
-		to_char(pi.enddate, 'yyyy-MM') ENDDATEMONTH,
-        to_char(pi.enddate, 'yyyy-MM-dd') ENDDATE,
+		to_char(pi.TAKESTARTDATE, 'yyyy-MM') ENDDATEMONTH,
+        to_char(pi.ENDDATE, 'yyyy-MM-dd') ENDDATE,
 		wr.UNITID,
 		t.TRANSFERPRICE,
 		pi.PRESALESTATUS,
@@ -851,8 +851,8 @@ func (r *Thjpurchasetradedetail) buildSql2() string {
 		t.PAYEDTRADEDATE,
 		t.BUYFREEZECHARGE,
 		t.LASTPRICEDATE,
-		to_char(pi.enddate, 'yyyy-MM') ENDDATEMONTH,
-        to_char(pi.enddate, 'yyyy-MM-dd') ENDDATE,
+		to_char(pi.TAKESTARTDATE, 'yyyy-MM') ENDDATEMONTH,
+        to_char(pi.ENDDATE, 'yyyy-MM-dd') ENDDATE,
 		wr.UNITID,
 		t.TRANSFERPRICE,
 		pi.PRESALESTATUS,
@@ -1294,8 +1294,8 @@ type Thjpurchasetransfer struct {
 
 	UNITID int32 `json:"unitid" xorm:"UNITID"` // 现货商品单位ID
 
-	ENDDATEMONTH      string `json:"enddatemonth" xorm:"ENDDATEMONTH"`           // 交收月份
-	ENDDATE           string `json:"enddate" xorm:"ENDDATE"`                     // 交收日期
+	ENDDATEMONTH      string `json:"enddatemonth" xorm:"ENDDATEMONTH"`           // 交收月份(提货日期)
+	ENDDATE           string `json:"enddate" xorm:"ENDDATE"`                     // 到期日期
 	CREATETIME        string `json:"createtime" xorm:"CREATETIME"`               // 转让挂牌时间
 	TRANSFERTRADETIME string `json:"transfertradetime" xorm:"TRANSFERTRADETIME"` // 转让成交时间
 
@@ -1339,7 +1339,7 @@ func (r *Thjpurchasetransfer) buildSql() string {
 		t.TRANSFERSTATUS,
 		t.HANDLESTATUS,
 		wr.UNITID,
-		to_char(pi.ENDDATE, 'yyyy-MM') ENDDATEMONTH,
+		to_char(pi.TAKESTARTDATE, 'yyyy-MM') ENDDATEMONTH,
         to_char(pi.ENDDATE, 'yyyy-MM-dd') ENDDATE,
 		pi.PRESALESTATUS,
 		to_char(t.CREATETIME, 'yyyy-MM-dd hh24:mi:ss') CREATETIME,
@@ -1403,8 +1403,8 @@ type ThjpurchasetransferDetail struct {
 	CONTACTINFO       string  `json:"contactinfo" xorm:"CONTACTINFO"`             // 联系方式
 	DESADDRESS        string  `json:"desaddress" xorm:"DESADDRESS"`               // 目的地地址
 	RECEIPTINFO       string  `json:"receiptinfo" xorm:"RECEIPTINFO"`             // 发票信息
-	ENDDATEMONTH      string  `json:"enddatemonth" xorm:"ENDDATEMONTH"`           // 到期月份
-	ENDDATE           string  `json:"enddate" xorm:"ENDDATE"`                     // 到期日期(交收日期)
+	ENDDATEMONTH      string  `json:"enddatemonth" xorm:"ENDDATEMONTH"`           // 交收月份(提货日期)
+	ENDDATE           string  `json:"enddate" xorm:"ENDDATE"`                     // 到期日期
 	CREATETIME        string  `json:"createtime" xorm:"CREATETIME"`               // 转让委托时间
 	TRANSFERTRADETIME string  `json:"transfertradetime" xorm:"TRANSFERTRADETIME"` // 转让成交时间
 	CONTRACTADDR      string  `json:"contractaddr" xorm:"CONTRACTADDR"`           // 协议转让合同地址
@@ -1441,8 +1441,8 @@ func (r *ThjpurchasetransferDetail) buildSql() string {
 		d.CONTACTINFO,
 		d.DESADDRESS,
 		d.RECEIPTINFO,
-		to_char(pi.enddate, 'yyyy-MM') ENDDATEMONTH,
-        to_char(pi.enddate, 'yyyy-MM-dd') ENDDATE,
+		to_char(pi.TAKESTARTDATE, 'yyyy-MM') ENDDATEMONTH,
+        to_char(pi.ENDDATE, 'yyyy-MM-dd') ENDDATE,
 		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,