1、增加“千海金交易商品扩展表”接口；

2、“查询企业风管期货商品信息”增加TradeMode字段。

controllers/qhj/qryQhj.go

@@ -7,9 +7,10 @@
 package qhj
 
 import (
-	"github.com/gin-gonic/gin"
 	"mtp2_if/global/app"
 	"mtp2_if/models"
+
+	"github.com/gin-gonic/gin"
 )
 
 // QueryContract
@@ -364,3 +365,22 @@ func QueryPayOrder(c *gin.Context) {
 	m := models.QhjPayOrder{BUYACCOUNTID: req.ACCOUNTID}
 	a.DoGetDataI(&m)
 }
+
+// QueryGoodsEx
+// @Summary 交易商品扩展表
+// @Produce json
+// @Security ApiKeyAuth
+// @Param goodsid query int false "商品id"
+// @Success 200 {array} models.Qhjgoodsex
+// @Failure 500 {object} app.Response
+// @Router /Qhj/QueryGoodsEx [get]
+// @Tags 大连千海金
+func QueryGoodsEx(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	req := struct {
+		GOODSID int `form:"goodsid"` // 商品id
+	}{}
+	a.DoBindReq(&req)
+	m := models.Qhjgoodsex{Goodsid: int32(req.GOODSID)}
+	a.DoGetDataI(&m)
+}

models/ermcpGoods.go

@@ -71,6 +71,8 @@ type ErmcpGoods struct {
 	Outgoodscode          string    `json:"outgoodscode"  xorm:"'OUTGOODSCODE'"`                   // 商品代码(外部)
 
 	Relatedgoodsid int32 `json:"relatedgoodsid"  xorm:"RELATEDGOODSID"` // 关联参考商品ID
+
+	Trademode int32 `json:"trademode"  xorm:"'TRADEMODE'"` // 交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式 21:竞拍-大宗式 22:受托竞价
 }
 
 // GetErmcpGoodses 企业风管专用获取商品信息的方法
@@ -78,7 +80,11 @@ func GetErmcpGoodses(lastUpdateTime string) ([]ErmcpGoods, error) {
 	engine := db.GetEngine()
 
 	goodses := make([]ErmcpGoods, 0)
-	session := engine.Table("GOODS G").Select("G.*, P.RELATEDGOODSID").Join("LEFT", "GOODSQUOTEPROPERTY P", "P.GOODSID = G.GOODSID").Where("G.GOODSSTATUS in (3, 7)")
+	session := engine.Table("GOODS G").
+		Select("G.*, P.RELATEDGOODSID, M.TRADEMODE").
+		Join("LEFT", "GOODSQUOTEPROPERTY P", "P.GOODSID = G.GOODSID").
+		Join("LEFT", "MARKET M", "M.MARKETID = G.MARKETID").
+		Where("G.GOODSSTATUS in (3, 7)")
 	// if lastID != 0 {
 	// 	session = session.And("GOODSID > ?", lastID)
 	// }

models/qhj.go

@@ -1437,3 +1437,48 @@ func (r *QhjPayOrder) GetDataEx() (interface{}, error) {
 	}
 	return sData, err
 }
+
+// Qhjgoodsex 交易商品扩展表(千海金)
+type Qhjgoodsex struct {
+	Goodsid               int32   `json:"goodsid"  xorm:"GOODSID"`                             // 商品ID(自增ID SEQ_GOODS)
+	Minamount             float64 `json:"minamount"  xorm:"MINAMOUNT"`                         // 最小购买金额
+	Canfinance            int32   `json:"canfinance"  xorm:"CANFINANCE"`                       // 是否支持融资 - 0:不支持 1:支持【69:铂金宝】
+	Canregularlybuy       int32   `json:"canregularlybuy"  xorm:"CANREGULARLYBUY"`             // 是否支持定投 - 0:不支持 1:支持【69:铂金宝】
+	Regularlybuyminqty    float64 `json:"regularlybuyminqty"  xorm:"REGULARLYBUYMINQTY"`       // 定投最小数量
+	Regularlybuyminamount float64 `json:"regularlybuyminamount"  xorm:"REGULARLYBUYMINAMOUNT"` // 定投最小金额
+	Deliverygoodsid       int32   `json:"deliverygoodsid"  xorm:"DELIVERYGOODSID"`             // 现货品种ID
+	Wrstandardid          int32   `json:"wrstandardid"  xorm:"WRSTANDARDID"`                   // 现货商品ID
+	Spotgoodsbrandid      int32   `json:"spotgoodsbrandid"  xorm:"SPOTGOODSBRANDID"`           // 现货品牌ID -  存“DGFactoryItem”表"DGFactoryItemID"
+	Defaulttradeuserid    int64   `json:"defaulttradeuserid"  xorm:"DEFAULTTRADEUSERID"`       // 默认交易用户ID
+}
+
+func (r *Qhjgoodsex) calc() {
+
+}
+
+func (r *Qhjgoodsex) buildSql() string {
+	var sqlId utils.SQLVal = "SELECT t.GOODSID," +
+		"       t.MINAMOUNT," +
+		"       t.CANFINANCE," +
+		"       t.CANREGULARLYBUY," +
+		"       t.REGULARLYBUYMINQTY," +
+		"       t.REGULARLYBUYMINAMOUNT," +
+		"       t.DELIVERYGOODSID," +
+		"       t.WRSTANDARDID," +
+		"       t.SPOTGOODSBRANDID," +
+		"       t.DEFAULTTRADEUSERID" +
+		"  FROM QHJ_GOODSEX t" +
+		" WHERE 1 = 1"
+	sqlId.AndEx("t.GOODSID", r.Goodsid, r.Goodsid > 0)
+	return sqlId.String()
+}
+
+// GetDataEx 获取交易商品扩展表(千海金)
+func (r *Qhjgoodsex) GetDataEx() (interface{}, error) {
+	sData := make([]Qhjgoodsex, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	for i := range sData {
+		sData[i].calc()
+	}
+	return sData, err
+}

routers/router.go

@@ -466,6 +466,7 @@ func InitRouter() *gin.Engine {
 		qhjR.GET("QuerySiteColumnDetail", qhj.QuerySiteColumnDetail)
 		qhjR.GET("QueryAccountInOutApply", qhj.QueryAccountInOutApply)
 		qhjR.GET("QueryPayOrder", qhj.QueryPayOrder)
+		qhjR.GET("QueryGoodsEx", qhj.QueryGoodsEx)
 	}
 
 	return r