/Guangzuan/QueryDiamond： 添加：zscategorys

models/guangzuan.go

@@ -352,9 +352,10 @@ func (r *BuyOrder) GetDataByPage() (interface{}, error, int, int, int) {
 
 // SellOrderQueryReq 钻石搜索入参
 type SellOrderQueryReq struct {
-	ZSCATEGORY     int32    `json:"zscategory"`     // 钻石分类 - 枚举”ZSCategory“
-	ZSCURRENCYTYPE []string `json:"zscurrencytype"` // 货币类型 - 枚举“ZSCurrencyType”
+	ZSCATEGORY  int32  `json:"zscategory"`   // 钻石分类 - 枚举”ZSCategory“
+	ZSCATEGORYS string `json:"zscategorys" ` // 钻石分类 - 枚举”ZSCategorys“ 逗号分隔
 
+	ZSCURRENCYTYPE     []string `json:"zscurrencytype"`     // 货币类型 - 枚举“ZSCurrencyType”
 	WAREHOUSEID        int64    `json:"warehouseid"`        // 仓库ID
 	WEIGHT1            float64  `json:"weight1"`            // 总重量(克拉重量)-从
 	WEIGHT2            float64  `json:"weight2"`            // 总重量(克拉重量)-至
@@ -372,8 +373,6 @@ type SellOrderQueryReq struct {
 	ZSSTYLETYPE        []string `json:"zsstyletype"`        // 款式
 	ZSCZCOLOR1TYPE     []string `json:"zsczcolor1type"`     // 彩钻颜色1
 
-	ZSCATEGORYS string `json:"zscategorys" ` // 钻石分类 - 枚举”ZSCategorys“ 逗号分隔
-
 	PageJosn // 分页
 }
 
@@ -636,6 +635,8 @@ func (r *SellOrder) buildSql() string {
 	WHERE t.marketid=67201 AND t.BuyOrSell = 1 AND t.WRTradeOrderStatus IN (3,7) 
 	`
 
+	sqlId.AndEx("q.ZSCATEGORY", r.ZSCATEGORY, r.ZSCATEGORY > 0)
+
 	if r.ZSCATEGORYS != "" {
 		sqlId.JoinFormat(" AND q.ZSCATEGORY in (%v)", r.ZSCATEGORYS)
 	}
@@ -758,7 +759,12 @@ func (r *SellOrder) buildQueryDiamond() string {
 	WHERE t.marketid=67201 AND t.BuyOrSell = 1 AND t.WRTradeOrderStatus IN (3,7) 
 	`
 
-	sqlId.And("q.ZSCATEGORY", r.ZSCATEGORY)
+	sqlId.AndEx("q.ZSCATEGORY", r.ZSCATEGORY, r.ZSCATEGORY > 0)
+
+	if r.ZSCATEGORYS != "" {
+		sqlId.JoinFormat(" AND q.ZSCATEGORY in (%v)", r.ZSCATEGORYS)
+	}
+
 	if len(r.ZSCURRENCYTYPE_S) > 0 {
 		sqlId.JoinFormat(" AND q.ZSCURRENCYTYPE IN (%v)", strings.Join(r.ZSCURRENCYTYPE_S, ","))
 	}