fix bug: #2221

docs/docs.go

@@ -22479,7 +22479,7 @@ var doc = `{
                     "type": "string"
                 },
                 "todayavgfutuprice": {
-                    "description": "今日期货成交均价 = TodayRelatedMiddleGoodsAmount /TodayRelatedMiddleGoodsQty",
+                    "description": "今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty",
                     "type": "number"
                 },
                 "todayavgprice": {
@@ -22502,12 +22502,16 @@ var doc = `{
                     "description": "今日定价量(现货)",
                     "type": "number"
                 },
+                "todayrelatedfutureqty": {
+                    "description": "今日关联量(期货)",
+                    "type": "number"
+                },
                 "todayrelatedmiddlegoodsamount": {
                     "description": "今日关联额(期货)",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsqty": {
-                    "description": "今日关联量(期货)",
+                    "description": "今日关联量(套保品-期货)",
                     "type": "number"
                 },
                 "updatetime": {

docs/swagger.json

@@ -22463,7 +22463,7 @@
                     "type": "string"
                 },
                 "todayavgfutuprice": {
-                    "description": "今日期货成交均价 = TodayRelatedMiddleGoodsAmount /TodayRelatedMiddleGoodsQty",
+                    "description": "今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty",
                     "type": "number"
                 },
                 "todayavgprice": {
@@ -22486,12 +22486,16 @@
                     "description": "今日定价量(现货)",
                     "type": "number"
                 },
+                "todayrelatedfutureqty": {
+                    "description": "今日关联量(期货)",
+                    "type": "number"
+                },
                 "todayrelatedmiddlegoodsamount": {
                     "description": "今日关联额(期货)",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsqty": {
-                    "description": "今日关联量(期货)",
+                    "description": "今日关联量(套保品-期货)",
                     "type": "number"
                 },
                 "updatetime": {

docs/swagger.yaml

@@ -6271,7 +6271,7 @@ definitions:
         description: 现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)
         type: string
       todayavgfutuprice:
-        description: 今日期货成交均价 = TodayRelatedMiddleGoodsAmount /TodayRelatedMiddleGoodsQty
+        description: 今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty
         type: number
       todayavgprice:
         description: 今日定价均价 = TodayPricedAmount / TodayPricedQty
@@ -6288,11 +6288,14 @@ definitions:
       todaypricedqty:
         description: 今日定价量(现货)
         type: number
+      todayrelatedfutureqty:
+        description: 今日关联量(期货)
+        type: number
       todayrelatedmiddlegoodsamount:
         description: 今日关联额(期货)
         type: number
       todayrelatedmiddlegoodsqty:
-        description: 今日关联量(期货)
+        description: 今日关联量(套保品-期货)
         type: number
       updatetime:
         description: 更新时间

models/ermcp3Report.go

@@ -2879,7 +2879,7 @@ type Ermcp3SCMiddleGoodsReport struct {
 	MIDDLEGOODSPRICEDQTY3         SFLOAT64 `json:"middlegoodspricedqty3"  xorm:"MIDDLEGOODSPRICEDQTY3"`                 // 已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率
 	RELATEDMIDDLEGOODSQTY         SFLOAT64 `json:"relatedmiddlegoodsqty"  xorm:"RELATEDMIDDLEGOODSQTY"`                 // 已关联量(套保品种)(期货)
 	UPDATETIME                    string   `json:"updatetime"  xorm:"UPDATETIME"`                                       // 更新时间
-	TODAYRELATEDMIDDLEGOODSQTY    SFLOAT64 `json:"todayrelatedmiddlegoodsqty"  xorm:"TODAYRELATEDMIDDLEGOODSQTY"`       // 今日关联量(期货)
+	TODAYRELATEDMIDDLEGOODSQTY    SFLOAT64 `json:"todayrelatedmiddlegoodsqty"  xorm:"TODAYRELATEDMIDDLEGOODSQTY"`       // 今日关联量(套保品-期货)
 	TODAYRELATEDMIDDLEGOODSAMOUNT SFLOAT64 `json:"todayrelatedmiddlegoodsamount"  xorm:"TODAYRELATEDMIDDLEGOODSAMOUNT"` // 今日关联额(期货)
 	RELATEDMIDDLEGOODSAMOUNT      SFLOAT64 `json:"relatedmiddlegoodsamount"  xorm:"RELATEDMIDDLEGOODSAMOUNT"`           // 已关联额(期货)
 	TODAYPRICEDQTY                SFLOAT64 `json:"todaypricedqty"  xorm:"TODAYPRICEDQTY"`                               // 今日定价量(现货)
@@ -2887,6 +2887,7 @@ type Ermcp3SCMiddleGoodsReport struct {
 	PRICEDAMOUNT                  SFLOAT64 `json:"pricedamount"  xorm:"PRICEDAMOUNT"`                                   // 已定价额(现货)
 	TODAYPRICEDAMOUNT2            SFLOAT64 `json:"todaypricedamount2"  xorm:"TODAYPRICEDAMOUNT2"`                       // 今日定价额(现货-基价额)
 	PRICEDAMOUNT2                 SFLOAT64 `json:"pricedamount2"  xorm:"PRICEDAMOUNT2"`                                 // 已定价额(现货-基价额)
+	TODAYRELATEDFUTUREQTY         SFLOAT64 `json:"todayrelatedfutureqty"  xorm:"'TODAYRELATEDFUTUREQTY'"`               // 今日关联量(期货)
 
 	USERID            int64    `json:"userid"  xorm:"'USERID'" form:"userid"`             // 合同所属用户id
 	CONTRACTNO        string   `json:"contractno"  xorm:"'CONTRACTNO'" form:"contractno"` // 合同编号
@@ -2905,7 +2906,7 @@ type Ermcp3SCMiddleGoodsReport struct {
 	TODAYAVGPRICE     SFLOAT64 `json:"todayavgprice"  xorm:"'TODAYAVGPRICE'"`         // 今日定价均价 = TodayPricedAmount / TodayPricedQty
 	TODAYAVGPRICE2    SFLOAT64 `json:"todayavgprice2"  xorm:"'TODAYAVGPRICE2'"`       // 今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty
 	HEDGEPLANQTY      SFLOAT64 `json:"hedgeplanqty"  xorm:"'HEDGEPLANQTY'"`           // 套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例
-	TODAYAVGFUTUPRICE SFLOAT64 `json:"todayavgfutuprice"  xorm:"'TODAYAVGFUTUPRICE'"` // 今日期货成交均价 = TodayRelatedMiddleGoodsAmount /TodayRelatedMiddleGoodsQty
+	TODAYAVGFUTUPRICE SFLOAT64 `json:"todayavgfutuprice"  xorm:"'TODAYAVGFUTUPRICE'"` // 今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty
 	DIFFPRICE         SFLOAT64 `json:"diffprice"  xorm:"'DIFFPRICE'"`                 // 现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价
 	DIFFQTY           SFLOAT64 `json:"diffqty"  xorm:"'DIFFQTY'"`                     // 期现数量差 = 套保计划量 - 今日期货关联成交量
 
@@ -2925,16 +2926,15 @@ func (r *Ermcp3SCMiddleGoodsReport) calc() {
 	}
 
 	r.HEDGEPLANQTY = r.TODAYPRICEDQTY * r.CONVERTRATIO * (1 / (1 + r.VATRATE)) * r.NEEDHEDGERATIO
-	if r.TODAYRELATEDMIDDLEGOODSQTY > 0 {
-		r.TODAYAVGFUTUPRICE = r.TODAYRELATEDMIDDLEGOODSAMOUNT / r.TODAYRELATEDMIDDLEGOODSQTY
+	if r.TODAYRELATEDFUTUREQTY > 0 {
+		r.TODAYAVGFUTUPRICE = r.TODAYRELATEDMIDDLEGOODSAMOUNT / r.TODAYRELATEDFUTUREQTY
 		r.TODAYAVGFUTUPRICE.Round(2)
 
 		r.DIFFPRICE = r.TODAYAVGPRICE2 - r.TODAYAVGFUTUPRICE
 		r.DIFFPRICE.Round(2)
-
-		r.DIFFQTY = r.HEDGEPLANQTY - r.TODAYRELATEDMIDDLEGOODSQTY
-		r.DIFFQTY.Round(8)
 	}
+	r.DIFFQTY = r.HEDGEPLANQTY - r.TODAYRELATEDMIDDLEGOODSQTY
+	r.DIFFQTY.Round(8)
 }
 
 func (r *Ermcp3SCMiddleGoodsReport) buildSql() string {
@@ -2958,6 +2958,7 @@ select t.reckondate,
        t.middlegoodspricedqty3,
        t.relatedmiddlegoodsqty,
        t.todayrelatedmiddlegoodsqty,
+       t.todayrelatedfutureqty,
        t.todayrelatedmiddlegoodsamount,
        t.relatedmiddlegoodsamount,
        t.todaypricedqty,
@@ -3019,6 +3020,7 @@ select t.cycletype,
        t.middlegoodspricedqty2,
        t.middlegoodspricedqty3,
        t.relatedmiddlegoodsqty,
+       t.todayrelatedfutureqty,
        t.todayrelatedmiddlegoodsqty,
        t.todayrelatedmiddlegoodsamount,
        t.relatedmiddlegoodsamount,