优化

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

@@ -13,11 +13,30 @@ import com.qs.mp.common.json.EnumValueDeserializer;
 @JSONType(deserializer = EnumValueDeserializer.class)
 public enum CouponUseAreaEnum implements IEnum<Integer> {
 
+  /**
+   * 通用
+   */
   COMMON(0, "通用"),
-  ONLINE_SOME(1, "指定线上盲票"), // 盲票购买类优惠券，指定线上盲票
-  POST_SCOPE(2, "指定范围"), // 门店消费类优惠券，发放的时候动态设定使用范围
+
+  /**
+   * 指定范围,盲票购买和门店消费的时候指定范围
+   */
+  PRE_SCOPE(1, "指定范围"),
+  /**
+   * 门店消费类优惠券，发放的时候动态设定使用范围
+   */
+  POST_SCOPE(2, "门店消费"), // 门店消费类优惠券，发放的时候动态设定使用范围
+  /**
+   * 所有线上盲票
+   */
   ONLINE_SCOPE(3, "所有线上盲票"), // 盲票购买类优惠券，仅限线上盲票
+  /**
+   * 所有线下盲票
+   */
   OFFLINE_SCOPE(4, "所有线下盲票"), // 盲票购买类优惠券，仅限线下盲票
+  /**
+   * 指定线下盲票
+   */
   OFFLINE_SOME(5, "指定线下盲票"); // 盲票购买类优惠券，指定线下盲票
 
 

mp-service/src/main/java/com/qs/mp/user/service/impl/UserCouponServiceImpl.java

@@ -63,7 +63,7 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
     List<UserCouponVO> userCouponVOList = getBaseMapper().listUserCouponVO(queryWrapper);
     for (UserCouponVO couponVO : userCouponVOList) {
       // 指定盲票购买的优惠券
-      if (couponVO.getType() == CouponTypeEnum.TICKET_ORDER && couponVO.getUseArea() == CouponUseAreaEnum.ONLINE_SOME) {
+      if (couponVO.getType() == CouponTypeEnum.TICKET_ORDER && couponVO.getUseArea() == CouponUseAreaEnum.PRE_SCOPE) {
         List<CouponTicket> couponTicketList = couponTicketService.list(new LambdaQueryWrapper<CouponTicket>()
             .eq(CouponTicket::getCouponId, couponVO.getCouponId()));
         List<String> boxIds = couponTicketList.stream().map(couponTicket -> {
@@ -90,7 +90,7 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
     while (iterator.hasNext()) {
       UserCouponVO userCouponVO = iterator.next();
       // 校验使用范围
-      if (userCouponVO.getUseArea() == CouponUseAreaEnum.ONLINE_SOME) {
+      if (userCouponVO.getUseArea() == CouponUseAreaEnum.PRE_SCOPE) {
         // 指定盲票
         List<CouponTicket> couponTicketList = couponTicketService.list(
             new LambdaQueryWrapper<CouponTicket>()