敞口/期货明细 增加合约单位和品种系数字段

models/ermcpExposure.go

@@ -575,6 +575,8 @@ type ErmcpExposurePostion struct {
 	CurQty        int64   `json:"curqty"  xorm:"'CurQty'"`               // 当前持仓
 	DiffQty       int64   `json:"diffqty"  xorm:"'DiffQty'"`             // 持仓变动量=当前持仓-昨日持仓
 	DiffHedgeQty  float64 `json:"diffhedgeqty"  xorm:"'DiffHedgeQty'"`   // 套保品种变动量=持仓变动量*期货合约单位*期货品种系数
+	AGREEUNIT     string  `json:"agreeunit"`                             // 合约单位
+	CONVERTRATIO  float64 `json:"convertratio"`                          // 期货品种系数(折算系数)
 }
 
 // 子账户相关计算(不一定用得到，现在说都是查母账号的)
@@ -589,6 +591,10 @@ func (r *ErmcpExposurePostion) ParseFromPos(val *ErmcpTradeGoods, data *ErmcpTra
 	r.CurQty = data.BUYCURPOSITIONQTY - data.SELLCURPOSITIONQTY
 	r.DiffQty = r.CurQty - r.YdQty
 	r.DiffHedgeQty = float64(r.DiffQty) * float64(val.AGREEUNIT) * val.CONVERTRATIO
+	r.CONVERTRATIO = val.CONVERTRATIO
+	if strName := mtpcache.GetEnumDicitemName(val.GOODSUNITID); len(strName) > 0{
+		r.AGREEUNIT = fmt.Sprintf("%v%v/手", val.AGREEUNIT, strName)
+	}
 }
 
 // 母账户相关计算
@@ -603,6 +609,10 @@ func (r *ErmcpExposurePostion) ParseFromHedgePos(val *ErmcpTradeGoods, data *Erm
 	r.CurQty = int64(data.CURBUYPOSITION - data.CURSELLPOSITION)
 	r.DiffQty = r.CurQty - r.YdQty
 	r.DiffHedgeQty = float64(r.DiffQty) * float64(val.AGREEUNIT) * val.CONVERTRATIO
+	r.CONVERTRATIO = val.CONVERTRATIO
+	if strName := mtpcache.GetEnumDicitemName(val.GOODSUNITID); len(strName) > 0{
+		r.AGREEUNIT = fmt.Sprintf("%v%v/手", val.AGREEUNIT, strName)
+	}
 }
 
 // 获取敞口明细期货头寸