|
@@ -45,7 +45,11 @@ 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);
|
|
|
- wrapper.eq(StringUtils.isNotEmpty(status), "coupon.status", status);
|
|
|
+ if (StringUtils.isNotEmpty(status) && !"0".equals(status)) {
|
|
|
+ wrapper.eq("coupon.status", status);
|
|
|
+ } else {
|
|
|
+ wrapper.notIn("coupon.status","-1","-2");
|
|
|
+ }
|
|
|
wrapper.eq(StringUtils.isNotEmpty(type), "coupon.type", type);
|
|
|
wrapper.eq("coupon.delete_flag", 0);
|
|
|
wrapper.eq("store.delete_flag", 0);
|
|
@@ -59,7 +63,7 @@ public class PlatformStoreCouponServiceImpl implements PlatformStoreCouponServic
|
|
|
if (item.getStatus() == -1) {
|
|
|
item.setStatusName("待审核");
|
|
|
} else if (item.getStatus() == -2) {
|
|
|
- item.setStatusName("已驳回");
|
|
|
+ item.setStatusName("已拒绝");
|
|
|
} else {
|
|
|
item.setStatusName("已通过");
|
|
|
}
|