现货商品明细、套保品种明细接口增加字段

models/ermcpGGConvertconfig.go

@@ -44,11 +44,24 @@ func (r *ErmcpGGConvertCfg) GetData() ([]interface{}, error) {
 	}
 	iData := make([]interface{}, 0)
 	for i := range sData {
+		sData[i].Calc()
 		iData = append(iData, &sData[i])
 	}
 	return iData, nil
 }
 
+// GetData2 获取数据
+func (r *ErmcpGGConvertCfg) GetData2() ([]ErmcpGGConvertCfg, error) {
+	sData := make([]ErmcpGGConvertCfg, 0)
+	if err := db.GetEngine().SQL(r.buildSql()).Find(&sData); err != nil {
+		return nil, err
+	}
+	for i := range sData {
+		sData[i].Calc()
+	}
+	return sData, nil
+}
+
 func (r *ErmcpGGConvertCfg) buildSql() string {
 	sqlId := "select t.srcgoodsgroupid," +
 		"       t.destgoodsgroupid," +

models/ermcpMiddleGoods.go

@@ -95,44 +95,11 @@ func (r *ErmcpMiddleGoodsModel) buildSql() string {
 	return sqlId
 }
 
-///////////////////////////////
-
-// GoodsGroupConvert 期货品种折算配置表
-type GoodsGroupConvert struct {
-	Convertratio    float64 `json:"convertratio"  xorm:"'Convertratio'"`        // 折算系数
-	SrcGoodsgroupid int32   `json:"srcgoodsgroupid"  xorm:"'SrcGoodsgroupid'"`  // 源期货品种ID
-	DstGoodsgroupid int32   `json:"dstgoodsgroupid"  xorm:"'destgoodsgroupid'"` // 目标期货品种ID
-	Goodsgroupname  string  `json:"goodsgroupname"  xorm:"'Goodsgroupname'"`    // 期货品种名称
-	Outergroupcode  string  `json:"outergroupcode"  xorm:"'Outergroupcode'"`    // 期货品种代码
-}
-
-func (r *GoodsGroupConvert) buildSql() string {
-	sqlId := "select t.srcgoodsgroupid," +
-		"       t.destgoodsgroupid," +
-		"       t.convertratio," +
-		"       g.goodsgroupname," +
-		"       g.outergroupcode" +
-		"  from ERMCP_GGConvertconfig t" +
-		"  left join goodsgroup g" +
-		"    on t.srcgoodsgroupid = g.goodsgroupid" +
-		" where 1 = 1"
-	if r.DstGoodsgroupid > 0 {
-		sqlId = sqlId + fmt.Sprintf(" and destgoodsgroupid=%v", r.DstGoodsgroupid)
-	}
-	return sqlId
-}
-
-// GetData 获取期货品种折算列表
-func (r *GoodsGroupConvert) GetData() ([]GoodsGroupConvert, error) {
-	sData := make([]GoodsGroupConvert, 0)
-	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
-	return sData, err
-}
-
 // ErmcpMiddleGoodsDetail 套保品种详情
 type ErmcpMiddleGoodsDetail struct {
-	Mg     ErmcpMiddleGoodsModel // 套保品种基本信息
-	CvList []GoodsGroupConvert   // 期货品种折算列表
+	Mg      ErmcpMiddleGoodsModel // 套保品种基本信息
+	CvList  []ErmcpGGConvertCfg   // 期货品种折算列表
+	WrcList []WRSConverTDetail    // 现货品种列表(现货商品折算配置)
 }
 
 // GetData 获取套保品种详情
@@ -145,21 +112,36 @@ func (r *ErmcpMiddleGoodsDetail) GetData() ([]ErmcpMiddleGoodsDetail, error) {
 		return rsp, fmt.Errorf("no record")
 	}
 	for i := range d {
-		val := ErmcpMiddleGoodsDetail{Mg: d[i], CvList: make([]GoodsGroupConvert, 0)}
+		val := ErmcpMiddleGoodsDetail{Mg: d[i],
+			CvList:  make([]ErmcpGGConvertCfg, 0),
+			WrcList: make([]WRSConverTDetail, 0),
+		}
 		rsp = append(rsp, val)
 	}
 	// 查折算表
-	md := GoodsGroupConvert{}
-	if ggc, err := md.GetData(); err == nil {
+	md := ErmcpGGConvertCfg{}
+	if ggc, err := md.GetData2(); err == nil {
 		for i := range rsp {
 			for k := range ggc {
-				if rsp[i].Mg.GOODSGROUPID == ggc[k].DstGoodsgroupid {
+				if rsp[i].Mg.GOODSGROUPID == ggc[k].Destgoodsgroupid {
 					rsp[i].CvList = append(rsp[i].CvList, ggc[k])
 				}
 			}
 		}
 	}
 
+	// 查现货商品折算配置明细表
+	mWc := WRSConverTDetail{}
+	if wc, err := mWc.GetData(); err == nil {
+		for i := range rsp {
+			for k := range wc {
+				if int64(rsp[i].Mg.MIDDLEGOODSID) == wc[k].MIDDLEGOODSID {
+					rsp[i].WrcList = append(rsp[i].WrcList, wc[k])
+				}
+			}
+		}
+	}
+
 	return rsp, nil
 }
 

models/ermcpWrstandard.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"mtp2_if/db"
 	"mtp2_if/logger"
+	"mtp2_if/mtpcache"
 	"mtp2_if/utils"
 )
 
@@ -171,6 +172,13 @@ type WRSConverTDetail struct {
 	MODIFYTIME      string  `json:"modifytime"  xorm:"'MODIFYTIME'"`           // 修改时间
 	MIDDLEGOODSNAME string  `json:"middlegoodsname"  xorm:"'middlegoodsname'"` // 套保品种名称
 	MIDDLEGOODSCODE string  `json:"middlegoodscode"  xorm:"'middlegoodscode'"` // 套保品种代码
+	GOODSUNITID     int32   `json:"goodsunitid"  xorm:"'GOODSUNITID'"`         // 套保品种单位id
+
+	ENUMDICNAME string `json:"enumdicname"` // 单位名称
+}
+
+func (r *WRSConverTDetail) calc() {
+	r.ENUMDICNAME = mtpcache.GetEnumDicitemName(r.GOODSUNITID)
 }
 
 func (r *WRSConverTDetail) buildSql() string {
@@ -180,7 +188,8 @@ func (r *WRSConverTDetail) buildSql() string {
 		"       t.CONVERTRATIO," +
 		"       to_char(t.MODIFYTIME, 'yyyy-mm-dd hh24:mi:ss') MODIFYTIME," +
 		"       m.middlegoodsname," +
-		"       m.middlegoodscode" +
+		"       m.middlegoodscode," +
+		"       m.goodsunitid" +
 		"  from Erms2_Wrsconvertdetail t" +
 		"  left join erms_middlegoods m" +
 		"    on t.middlegoodsid = m.middlegoodsid" +
@@ -198,6 +207,9 @@ func (r *WRSConverTDetail) GetData() ([]WRSConverTDetail, error) {
 		logger.GetLogger().Errorf("query WRSConverTDetail fail, %v", err)
 		return nil, err
 	}
+	for i := range sData {
+		sData[i].calc()
+	}
 	return sData, nil
 }