修改web端代金券查询规则

alien-store/src/main/java/shop/alien/store/controller/PlatformStoreCouponController.java

@@ -33,7 +33,7 @@ public class PlatformStoreCouponController {
             @ApiImplicitParam(name = "type", value = "类型   1-代金券  2-团购（套餐）", dataType = "String", paramType = "query")
     })
     @GetMapping("/getCouponList")
-    public R<IPage<LifeCouponVo>> getCouponList(Integer page, Integer size, String storeName, String status, @RequestParam(value = "createdTime", required = false) String createdTime, String phone, @RequestParam(defaultValue = "2") String type) {
+    public R<IPage<LifeCouponVo>> getCouponList(Integer page, Integer size, String storeName, String status, @RequestParam(value = "createdTime", required = false) String createdTime, String phone, String type) {
         log.info("PlatformStoreCouponController.getCouponList?page={},size={},name={},status={},createdTime={},type={}", page, size, storeName, status, createdTime, type);
         return R.data(platformStoreCouponService.getCouponList(page, size, storeName, status, createdTime, phone, type));
     }

alien-store/src/main/java/shop/alien/store/service/impl/PlatformStoreCouponServiceImpl.java

@@ -45,11 +45,7 @@ public class PlatformStoreCouponServiceImpl implements PlatformStoreCouponServic
     public IPage<LifeCouponVo> getCouponList(Integer page, Integer size, String storeName, String status, String createdTime, String phone, String type) {
         QueryWrapper<LifeCouponVo> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotEmpty(storeName), "store.store_name", storeName);
-        if (StringUtils.isNotEmpty(status) && !"0".equals(status)) {
-            wrapper.eq("coupon.status", status);
-        } else if ("2".equals(type)) {
-            wrapper.notIn("coupon.status", "-1", "-2");
-        }
+        wrapper.eq(StringUtils.isNotEmpty(status), "coupon.status", status);
         wrapper.eq(StringUtils.isNotEmpty(type), "coupon.type", type);
         wrapper.eq("coupon.delete_flag", 0);
         wrapper.eq("store.delete_flag", 0);