处理海商成交单类型的BUG

controllers/hsby/hsby.go

@@ -1046,6 +1046,7 @@ type QueryHsbyMarketGoodsesReq struct {
 	MarketIDs  string `form:"marketIDs" binding:"required"`
 	AccountID  int    `form:"accountID"`
 	CategoryID int    `form:"categoryID"`
+	GoodsID    int    `form:"goodsID"`
 }
 
 // QueryHsbyMarketGoodses 查询特卖商品列表（三级商城）
@@ -1057,6 +1058,7 @@ type QueryHsbyMarketGoodsesReq struct {
 // @Param marketIDs query string true "市场ID列表，格式：1,2,3"
 // @Param accountID query int false "资金账户，主要用于判断商品是否有可用的优惠卷；如未登录可不传。"
 // @Param categoryID query int false "类别ID"
+// @Param goodsID query int false "商品ID"
 // @Success 200 {object} models.HsbyMarketGoods
 // @Failure 500 {object} app.Response
 // @Router /HSBY/QueryHsbyMarketGoodses [get]
@@ -1073,7 +1075,7 @@ func QueryHsbyMarketGoodses(c *gin.Context) {
 	}
 
 	// 获取数据
-	goodses, err := models.GetHsbyMarketGoodses(req.MarketIDs, req.AccountID, req.CategoryID)
+	goodses, err := models.GetHsbyMarketGoodses(req.MarketIDs, req.AccountID, req.CategoryID, req.GoodsID)
 	if err != nil {
 		// 查询失败
 		logger.GetLogger().Errorf("QueryHsbyMarketGoodses failed: %s", err.Error())

docs/docs.go

@@ -1636,6 +1636,12 @@ var doc = `{
                         "description": "类别ID",
                         "name": "categoryID",
                         "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "商品ID",
+                        "name": "goodsID",
+                        "in": "query"
                     }
                 ],
                 "responses": {

docs/swagger.json

@@ -1620,6 +1620,12 @@
                         "description": "类别ID",
                         "name": "categoryID",
                         "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "商品ID",
+                        "name": "goodsID",
+                        "in": "query"
                     }
                 ],
                 "responses": {

docs/swagger.yaml

@@ -6315,6 +6315,10 @@ paths:
         in: query
         name: categoryID
         type: integer
+      - description: 商品ID
+        in: query
+        name: goodsID
+        type: integer
       produces:
       - application/json
       responses:

models/hsby.go

@@ -896,7 +896,7 @@ func GetHsbySellMyTradeDetails(accountIDs string) ([]HsbySellMyDetail, error) {
 		Join("LEFT", "ENUMDICITEM", "GOODS.CURRENCYID = ENUMDICITEM.ENUMITEMNAME and ENUMDICITEM.ENUMDICCODE = 'currency'").
 		Join("LEFT", "MARKET", "MARKET.MARKETID = TRADE_TRADEDETAIL.MARKETID").
 		Join("LEFT", "HSBY_SUPPLIERINFO", "HSBY_SUPPLIERINFO.VENDORID = HSBY_GOODSEX.VENDORID").
-		Where(fmt.Sprintf(`TRADE_TRADEDETAIL.BUYORSELL = 1 and TRADE_TRADEDETAIL.TRADETYPE = 1
+		Where(fmt.Sprintf(`TRADE_TRADEDETAIL.BUYORSELL = 1 and TRADE_TRADEDETAIL.TRADETYPE in (1,24) 
 						   and TRADE_TRADEDETAIL.ACCOUNTID in (%s)`, accountIDs)).
 		And(fmt.Sprintf("TRADE_TRADEDETAIL.MARKETID in (%s)", marketIDs)).Find(&curOrders); err != nil {
 		return nil, err
@@ -922,7 +922,7 @@ func GetHsbySellMyTradeDetails(accountIDs string) ([]HsbySellMyDetail, error) {
 		Join("LEFT", "ENUMDICITEM", "GOODS.CURRENCYID = ENUMDICITEM.ENUMITEMNAME and ENUMDICITEM.ENUMDICCODE = 'currency'").
 		Join("LEFT", "MARKET", "MARKET.MARKETID = HIS_TRADE_TRADEDETAIL.MARKETID").
 		Join("LEFT", "HSBY_SUPPLIERINFO", "HSBY_SUPPLIERINFO.VENDORID = HSBY_GOODSEX.VENDORID").
-		Where(fmt.Sprintf(`HIS_TRADE_TRADEDETAIL.BUYORSELL = 1 and HIS_TRADE_TRADEDETAIL.TRADETYPE = 1 and HIS_TRADE_TRADEDETAIL.ISVALIDDATA = 1 
+		Where(fmt.Sprintf(`HIS_TRADE_TRADEDETAIL.BUYORSELL = 1 and HIS_TRADE_TRADEDETAIL.TRADETYPE in (1,24) and HIS_TRADE_TRADEDETAIL.ISVALIDDATA = 1 
 						   and HIS_TRADE_TRADEDETAIL.ACCOUNTID in (%s)`, accountIDs)).
 		And(fmt.Sprintf("HIS_TRADE_TRADEDETAIL.MARKETID in (%s)", marketIDs)).Find(&hisOrders); err != nil {
 		return nil, err
@@ -1123,7 +1123,7 @@ func GetHsbyBuyMyTradeDetails(accountIDs string) ([]HsbyBuyMyTradeDetail, error)
 		Join("LEFT", "MARKET", "MARKET.MARKETID = TRADE_TRADEDETAIL.MARKETID").
 		Join("LEFT", "HSBY_SUPPLIERINFO HS1", "HS1.VENDORID = HG1.VENDORID").
 		Join("LEFT", "HSBY_SUPPLIERINFO HS2", "HS2.VENDORID = HG2.VENDORID").
-		Where(fmt.Sprintf(`TRADE_TRADEDETAIL.BUYORSELL = 0 and TRADE_TRADEDETAIL.TRADETYPE = 1
+		Where(fmt.Sprintf(`TRADE_TRADEDETAIL.BUYORSELL = 0 and TRADE_TRADEDETAIL.TRADETYPE in (1,24) 
 						   and TRADE_TRADEDETAIL.ACCOUNTID in (%s)`, accountIDs)).
 		And(fmt.Sprintf("TRADE_TRADEDETAIL.MARKETID in (%s)", marketIDs)).Find(&curOrders); err != nil {
 		return nil, err
@@ -1151,7 +1151,7 @@ func GetHsbyBuyMyTradeDetails(accountIDs string) ([]HsbyBuyMyTradeDetail, error)
 		Join("LEFT", "MARKET", "MARKET.MARKETID = HIS_TRADE_TRADEDETAIL.MARKETID").
 		Join("LEFT", "HSBY_SUPPLIERINFO HS1", "HS1.VENDORID = HG1.VENDORID").
 		Join("LEFT", "HSBY_SUPPLIERINFO HS2", "HS2.VENDORID = HG2.VENDORID").
-		Where(fmt.Sprintf(`HIS_TRADE_TRADEDETAIL.BUYORSELL = 0 and HIS_TRADE_TRADEDETAIL.TRADETYPE = 1 and HIS_TRADE_TRADEDETAIL.ISVALIDDATA = 1 
+		Where(fmt.Sprintf(`HIS_TRADE_TRADEDETAIL.BUYORSELL = 0 and HIS_TRADE_TRADEDETAIL.TRADETYPE in (1,24) and HIS_TRADE_TRADEDETAIL.ISVALIDDATA = 1 
 						   and HIS_TRADE_TRADEDETAIL.ACCOUNTID in (%s)`, accountIDs)).
 		And(fmt.Sprintf("HIS_TRADE_TRADEDETAIL.MARKETID in (%s)", marketIDs)).Find(&hisOrders); err != nil {
 		return nil, err
@@ -1381,7 +1381,7 @@ type HsbyMarketGoods struct {
 }
 
 // GetHsbyMarketGoodses 获取商城商品列表（三级商城）
-func GetHsbyMarketGoodses(marketIDs string, accountID, categoryID int) ([]HsbyMarketGoods, error) {
+func GetHsbyMarketGoodses(marketIDs string, accountID, categoryID, goodsID int) ([]HsbyMarketGoods, error) {
 	engine := db.GetEngine()
 
 	orders := make([]HsbyMarketGoods, 0)
@@ -1401,6 +1401,9 @@ func GetHsbyMarketGoodses(marketIDs string, accountID, categoryID int) ([]HsbyMa
 	if categoryID != 0 {
 		session = session.And("GX.CATEGORYID = ?", categoryID)
 	}
+	if goodsID != 0 {
+		session = session.And("G.GOODSID = ?", goodsID)
+	}
 	if err := session.Find(&orders); err != nil {
 		return nil, err
 	}