我的商品接口增加字段

controllers/hsby/hsby.go

@@ -136,18 +136,20 @@ func QueryHsbyListingGoodsDetail(c *gin.Context) {
 		appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
 		return
 	}
-	tradeRuleInfoStruct := &pb.TradeRuleInfoStruct{}
-	if err := proto.Unmarshal([]byte(rule.Infocontent), tradeRuleInfoStruct); err != nil {
-		// 查询失败
-		logger.GetLogger().Errorf("QueryHsbyListingGoodsDetail failed: %s", err.Error())
-		appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
-		return
-	}
-	// INSERT INTO TRADERULEDESCRIPTION (RULEID, RULENAME, REGEXPRESS, DEFAULTVALUE, REMARK) VALUES (103, '单笔最小交易量', '^[1-9]\d*$', 1, '请输入正整数!');
-	for _, v := range tradeRuleInfoStruct.TradeRules {
-		if int(*v.RuleID) == 103 {
-			goodsInfo.LotSize = int(*v.ParamValue)
-			break
+	if rule != nil {
+		tradeRuleInfoStruct := &pb.TradeRuleInfoStruct{}
+		if err := proto.Unmarshal([]byte(rule.Infocontent), tradeRuleInfoStruct); err != nil {
+			// 查询失败
+			logger.GetLogger().Errorf("QueryHsbyListingGoodsDetail failed: %s", err.Error())
+			appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
+			return
+		}
+		// INSERT INTO TRADERULEDESCRIPTION (RULEID, RULENAME, REGEXPRESS, DEFAULTVALUE, REMARK) VALUES (103, '单笔最小交易量', '^[1-9]\d*$', 1, '请输入正整数!');
+		for _, v := range tradeRuleInfoStruct.TradeRules {
+			if int(*v.RuleID) == 103 {
+				goodsInfo.LotSize = int(*v.ParamValue)
+				break
+			}
 		}
 	}
 

docs/docs.go

@@ -7185,7 +7185,8 @@ var doc = `{
                 "accountid",
                 "goodscode",
                 "goodsid",
-                "goodsname"
+                "goodsname",
+                "trademode"
             ],
             "properties": {
                 "accountid": {
@@ -7239,6 +7240,10 @@ var doc = `{
                 "picurls": {
                     "description": "介绍图片[多张用逗号分隔]",
                     "type": "string"
+                },
+                "trademode": {
+                    "description": "交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式 21:竞拍-大宗式 22:受托竞价",
+                    "type": "integer"
                 }
             }
         },

docs/swagger.json

@@ -7169,7 +7169,8 @@
                 "accountid",
                 "goodscode",
                 "goodsid",
-                "goodsname"
+                "goodsname",
+                "trademode"
             ],
             "properties": {
                 "accountid": {
@@ -7223,6 +7224,10 @@
                 "picurls": {
                     "description": "介绍图片[多张用逗号分隔]",
                     "type": "string"
+                },
+                "trademode": {
+                    "description": "交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式 21:竞拍-大宗式 22:受托竞价",
+                    "type": "integer"
                 }
             }
         },

docs/swagger.yaml

@@ -2629,11 +2629,16 @@ definitions:
       picurls:
         description: 介绍图片[多张用逗号分隔]
         type: string
+      trademode:
+        description: 交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式
+          21:竞拍-大宗式 22:受托竞价
+        type: integer
     required:
     - accountid
     - goodscode
     - goodsid
     - goodsname
+    - trademode
     type: object
   models.HsbyMyPackage:
     properties:

models/hsby.go

@@ -566,6 +566,8 @@ type HsbyMyGoods struct {
 
 	Currencysign string `json:"currencysign" xorm:"'CURRENCYSIGN'"` // 货币符号
 
+	Trademode int32 `json:"trademode"  xorm:"'TRADEMODE'" binding:"required"` // 交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式 21:竞拍-大宗式 22:受托竞价
+
 	Buyaverageprice float64 `json:"buyaverageprice" xorm:"-"` // 持仓均价
 }
 
@@ -578,15 +580,17 @@ func GetHsbyMyGoods(accountIDs string) ([]HsbyMyGoods, error) {
 
 	hsbyMyGoodses := make([]HsbyMyGoods, 0)
 	// 此定制版本，只查询出当前手数（期末）大于0的数据 （TRADEPOSITION.BUYCURPOSITIONQTY > 0）
-	if err := engine.Table("TRADEPOSITION").
-		Select(`TRADEPOSITION.*, (TRADEPOSITION.BUYCURPOSITIONQTY - TRADEPOSITION.BUYFROZENQTY - TRADEPOSITION.BUYOTHERFROZENQTY) ENABLEQTY, 
-				GOODS.GOODSCODE, GOODS.GOODSNAME, GOODS.DECIMALPLACE, GOODS.AGREEUNIT, GOODS.GOODSSTATUS, 
-				HSBY_GOODSEX.PICURLS, 
-				ENUMDICITEM.PARAM2 CURRENCYSIGN`).
-		Join("LEFT", "GOODS", "GOODS.GOODSID = TRADEPOSITION.GOODSID").
-		Join("INNER", "HSBY_GOODSEX", "HSBY_GOODSEX.GOODSID = GOODS.GOODSID").
-		Join("LEFT", "ENUMDICITEM", "GOODS.CURRENCYID = ENUMDICITEM.ENUMITEMNAME and ENUMDICITEM.ENUMDICCODE = 'currency'").
-		Where(fmt.Sprintf("TRADEPOSITION.BUYCURPOSITIONQTY > 0 and TRADEPOSITION.ACCOUNTID in (%s)", accountIDs)).Find(&hsbyMyGoodses); err != nil {
+	if err := engine.Table("TRADEPOSITION TP").
+		Select(`TP.*, (TP.BUYCURPOSITIONQTY - TP.BUYFROZENQTY - TP.BUYOTHERFROZENQTY) ENABLEQTY, 
+				G.GOODSCODE, G.GOODSNAME, G.DECIMALPLACE, G.AGREEUNIT, G.GOODSSTATUS, 
+				GX.PICURLS, 
+				E.PARAM2 CURRENCYSIGN, 
+				M.TRADEMODE`).
+		Join("LEFT", "GOODS G", "G.GOODSID = TP.GOODSID").
+		Join("INNER", "HSBY_GOODSEX GX", "GX.GOODSID = G.GOODSID").
+		Join("LEFT", "ENUMDICITEM E", "G.CURRENCYID = E.ENUMITEMNAME and E.ENUMDICCODE = 'currency'").
+		Join("LEFT", "MARKET M", "M.MARKETID = G.MARKETID").
+		Where(fmt.Sprintf("TP.BUYCURPOSITIONQTY > 0 and TP.ACCOUNTID in (%s)", accountIDs)).Find(&hsbyMyGoodses); err != nil {
 		return nil, err
 	}