/Guangzuan/QueryDiamond： 添加：zscategorys

controllers/guangzuan/trade.go

@@ -73,6 +73,7 @@ func QueryDiamond(c *gin.Context) {
 		IsQueryDiamond: true,
 
 		ZSCATEGORY:         req.ZSCATEGORY,
+		ZSCATEGORYS:        req.ZSCATEGORYS,
 		ZSCURRENCYTYPE_S:   req.ZSCURRENCYTYPE,
 		WAREHOUSEID:        req.WAREHOUSEID,
 		WEIGHT:             req.WEIGHT1,

docs/docs.go

@@ -48482,9 +48482,6 @@ const docTemplate = `{
         },
         "models.SellOrderQueryReq": {
             "type": "object",
-            "required": [
-                "zscategory"
-            ],
             "properties": {
                 "origin": {
                     "description": "原产地",
@@ -48526,6 +48523,10 @@ const docTemplate = `{
                     "description": "钻石分类 - 枚举”ZSCategory“",
                     "type": "integer"
                 },
+                "zscategorys": {
+                    "description": "钻石分类 - 枚举”ZSCategorys“ 逗号分隔",
+                    "type": "string"
+                },
                 "zscerttype": {
                     "description": "证书类型",
                     "type": "array",

docs/swagger.json

@@ -48473,9 +48473,6 @@
         },
         "models.SellOrderQueryReq": {
             "type": "object",
-            "required": [
-                "zscategory"
-            ],
             "properties": {
                 "origin": {
                     "description": "原产地",
@@ -48517,6 +48514,10 @@
                     "description": "钻石分类 - 枚举”ZSCategory“",
                     "type": "integer"
                 },
+                "zscategorys": {
+                    "description": "钻石分类 - 枚举”ZSCategorys“ 逗号分隔",
+                    "type": "string"
+                },
                 "zscerttype": {
                     "description": "证书类型",
                     "type": "array",

docs/swagger.yaml

@@ -20346,6 +20346,9 @@ definitions:
       zscategory:
         description: 钻石分类 - 枚举”ZSCategory“
         type: integer
+      zscategorys:
+        description: 钻石分类 - 枚举”ZSCategorys“ 逗号分隔
+        type: string
       zscerttype:
         description: 证书类型
         items:
@@ -20401,8 +20404,6 @@ definitions:
         items:
           type: integer
         type: array
-    required:
-    - zscategory
     type: object
   models.Sitecolumnconfig:
     properties:

models/guangzuan.go

@@ -352,8 +352,8 @@ func (r *BuyOrder) GetDataByPage() (interface{}, error, int, int, int) {
 
 // SellOrderQueryReq 钻石搜索入参
 type SellOrderQueryReq struct {
-	ZSCATEGORY     int32    `json:"zscategory" binding:"required"` // 钻石分类 - 枚举”ZSCategory“
-	ZSCURRENCYTYPE []string `json:"zscurrencytype"`                // 货币类型 - 枚举“ZSCurrencyType”
+	ZSCATEGORY     int32    `json:"zscategory"`     // 钻石分类 - 枚举”ZSCategory“
+	ZSCURRENCYTYPE []string `json:"zscurrencytype"` // 货币类型 - 枚举“ZSCurrencyType”
 
 	WAREHOUSEID        int64    `json:"warehouseid"`        // 仓库ID
 	WEIGHT1            float64  `json:"weight1"`            // 总重量(克拉重量)-从
@@ -372,6 +372,8 @@ type SellOrderQueryReq struct {
 	ZSSTYLETYPE        []string `json:"zsstyletype"`        // 款式
 	ZSCZCOLOR1TYPE     []string `json:"zsczcolor1type"`     // 彩钻颜色1
 
+	ZSCATEGORYS string `json:"zscategorys" ` // 钻石分类 - 枚举”ZSCategorys“ 逗号分隔
+
 	PageJosn // 分页
 }