盲票列表--新增销售范围筛选条件

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -114,6 +114,10 @@ public class TicketBoxMgrController extends BaseApiController {
             "title", ticketBoxQueryParam.getTitle());
         queryWrapper.eq(null != ticketBoxQueryParam && null != ticketBoxQueryParam.getType(), "type",
             ticketBoxQueryParam.getType());
+        if (ticketBoxQueryParam.getSaleArea() != null) {
+            queryWrapper.eq("sale_channel_type", TicketBoxSaleAreaEnum.valueToSaleAreaType(ticketBoxQueryParam.getSaleArea()).getValue());
+            queryWrapper.eq("type", TicketBoxSaleAreaEnum.valueToSaleAreaType(ticketBoxQueryParam.getSaleArea()).getDesc());
+        }
         queryWrapper.eq(null != ticketBoxQueryParam && null != ticketBoxQueryParam.getStatus(), "status",
             ticketBoxQueryParam.getStatus());
         // 排除指定票组

mp-common/src/main/java/com/qs/mp/common/enums/TicketBoxSaleAreaEnum.java

@@ -0,0 +1,56 @@
+package com.qs.mp.common.enums;
+
+import com.alibaba.fastjson.annotation.JSONType;
+import com.baomidou.mybatisplus.annotation.IEnum;
+import com.qs.mp.common.json.EnumValueDeserializer;
+
+/**
+ * @author zhangkaikai
+ * @create 2023-05-24 1:58 PM
+ **/
+@JSONType(deserializer = EnumValueDeserializer.class)
+public enum TicketBoxSaleAreaEnum implements IEnum<Integer> {
+
+    // 线下所有渠道
+    OFFLINE_ALL(1, "offline"),
+    // 线下部分渠道
+    OFFLINE_PART(2, "offline"),
+
+    // 线上首页售卖
+    ONLINE_HOMEPAGE(1,"online"),
+    // 线上指定门店
+    ONLINE_POINT(2,"online")
+    ;
+
+    private int value;
+    private final String desc;
+
+    TicketBoxSaleAreaEnum(int value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public static TicketBoxSaleAreaEnum valueToSaleAreaType(Integer value) {
+        switch (value) {
+            case 1:
+                return TicketBoxSaleAreaEnum.OFFLINE_ALL;
+            case 2:
+                return TicketBoxSaleAreaEnum.OFFLINE_PART;
+            case 3:
+                return TicketBoxSaleAreaEnum.ONLINE_HOMEPAGE;
+            case 4:
+                return TicketBoxSaleAreaEnum.ONLINE_POINT;
+            default:
+                return null;
+        }
+    }
+}

mp-service/src/main/java/com/qs/mp/admin/domain/param/TicketBoxQueryParam.java

@@ -26,6 +26,9 @@ public class TicketBoxQueryParam {
     @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
     private TicketTypeEnum type;
 
+    @ApiModelProperty("盲票销售范围 1 线下所有渠道 2 线下部分渠道 3 线上首页售卖 4 线上指定门店")
+    private Integer saleArea;
+
     @ApiModelProperty("状态,上架/下架")
     @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
     private TicketBoxStatusEnum status;