优惠券修改及查询优化

imcs-bt-be/imcs-business-biz/src/main/java/com/github/zuihou/business/coupon/service/impl/CouponServiceImpl.java

@@ -17,6 +17,7 @@ import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -50,8 +51,10 @@ public class CouponServiceImpl extends SuperServiceImpl<CouponMapper, Coupon> im
     @Override
     public IPage<Coupon> selcetPage(PageParams<CouponPageDTO> pageParams) {
         Page<Coupon> page = new Page<>(pageParams.getCurrent(), pageParams.getSize());
-        // 设置优惠券状态查询默认值, -1 -> 查询所有状态
-        pageParams.getModel().setStatus("-1");
+        if (StringUtils.isBlank(pageParams.getModel().getStatus())) {
+            // 设置优惠券状态查询默认值, -1 -> 查询所有状态
+            pageParams.getModel().setStatus("-1");
+        }
         return baseMapper.selcetPage(page, pageParams.getModel(), new DataScope());
     }
 

imcs-bt-be/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/coupon/CouponController.java

@@ -77,11 +77,11 @@ public class CouponController extends SuperController<CouponService, Long, Coupo
         Coupon bdCoupon = getDbCouponById(updateDTO.getId());
         // 优惠券不存在或者优惠券已删除删除
         if (bdCoupon == null || "1".equals(bdCoupon.getDeleteFlag())) {
-            return R.success("优惠券不存在");
+            return R.fail("优惠券不存在");
         }
         // 优惠券已冻结
         if ("1".equals(bdCoupon.getStatus())) {
-            return R.success("优惠券已冻结");
+            return R.fail("优惠券已冻结");
         }
         Coupon model = BeanUtil.toBean(updateDTO, this.getEntityClass());
         // 判重