福袋补充需求-添加字段、健壮性校验

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinLuckyBagCodeDetailVo.java

@@ -76,6 +76,8 @@ public class KylinLuckyBagCodeDetailVo {
         private String ticketTitle;
         @ApiModelProperty(value = "数量")
         private Integer number;
+        @ApiModelProperty(value = "退款张数")
+        private Integer refundNumber;
         @ApiModelProperty(value = "订单生成时间")
         private String createdAt;
         @ApiModelProperty(value = "适用时间")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinLuckyBagServiceImpl.java

@@ -64,30 +64,37 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
     @Override
     public ResponseDto<KylinLuckyBagVo> getLuckyBagByOrderId(String orderId) {
         //1. 首先校验用户权限
-        OrderDetailsVo vo = orderTicketsService.orderDetails(orderId);
-        String uid = CurrentUtil.getCurrentUid();
-        if (null == vo) {
+//        OrderDetailsVo vo = orderTicketsService.orderDetails(orderId);
+
+        final KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
+        final String uid = CurrentUtil.getCurrentUid();
+        if (orderTicketVo == null) {
+            log.error("[getLuckyBagByOrderId] 未查询到订单, orderId: {}, uid: {}.", orderId, uid);
+            return ResponseDto.failure(ErrorMapping.get("20024"));
+        }
+
+        if (!orderTicketVo.getUserId().equals(uid)) {
             log.error("[getLuckyBagByOrderId] 无权查看该订单, orderId: {}, uid: {}.", orderId, uid);
             return ResponseDto.failure(ErrorMapping.get("20003"));
         }
         log.info("[getLuckyBagByOrderId] 获取福袋详情, orderId: {}， uid: {}.", orderId, uid);
         // 判断订单状态
-        if (!vo.getOrderTicketVo().getStatus().equals(1) || !vo.getOrderTicketVo().getPayStatus().equals(1)) {
-            log.info("[getLuckyBagByOrderId] 该订单状态不满足权益要求, orderId: {}, uid: {}, status: {}, payStatus: {}.", orderId,
-                    uid, vo.getOrderTicketVo().getStatus(), vo.getOrderTicketVo().getPayStatus());
-            return ResponseDto.success(KylinLuckyBagVo.ofEmpty());
-        }
-
-        // 2. 订单关联的演出ID
-        List<KylinLuckyBagVo.LuckyBagActivityVo> activityVos = getLuckyBagActivityVos(vo.getOrderTicketVo().getPerformanceId());
+        if (isEligibleForWelfare(orderTicketVo)) {
+            // 2. 订单关联的演出ID
+            List<KylinLuckyBagVo.LuckyBagActivityVo> activityVos = getLuckyBagActivityVos(orderTicketVo.getPerformanceId());
 
-        //3. 再查询满足的权益
-        List<KylinLuckyBagVo.LuckyBagVo> luckyBagVos = getLuckyBagVos(vo);
+            //3. 再查询满足的权益
+            List<KylinLuckyBagVo.LuckyBagVo> luckyBagVos = getLuckyBagVos(orderTicketVo);
 
-        if (activityVos.isEmpty()) {
-            return ResponseDto.success(KylinLuckyBagVo.of(luckyBagVos, null));
-        } else {
-            return ResponseDto.success(KylinLuckyBagVo.of(luckyBagVos, activityVos.get(0)));
+            if (activityVos.isEmpty()) {
+                return ResponseDto.success(KylinLuckyBagVo.of(luckyBagVos, null));
+            } else {
+                return ResponseDto.success(KylinLuckyBagVo.of(luckyBagVos, activityVos.get(0)));
+            }
+        }else {
+            log.info("[getLuckyBagByOrderId] 该订单状态不满足权益要求, orderId: {}, uid: {}, status: {}, payStatus: {}.", orderId,
+                    uid, orderTicketVo.getStatus(), orderTicketVo.getPayStatus());
+            return ResponseDto.success(KylinLuckyBagVo.ofEmpty());
         }
     }
 
@@ -250,6 +257,7 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
         orderInfo.setPerformanceTitle(orderTicketVo.getPerformanceTitle());
         orderInfo.setTicketTitle(orderTicketVo.getTicketTitle());
         orderInfo.setNumber(orderTicketVo.getNumber());
+        orderInfo.setRefundNumber(orderTicketVo.getRefundNumber());
         orderInfo.setCreatedAt(orderTicketVo.getCreatedAt());
         orderInfo.setUseStart(orderTicketVo.getUseStart());
         return orderInfo;
@@ -277,13 +285,13 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
     /**
      * 获取福袋列表
      *
-     * @param vo
+     * @param orderTicketVo
      * @return
      */
-    private List<KylinLuckyBagVo.LuckyBagVo> getLuckyBagVos(OrderDetailsVo vo) {
-        final String performanceId = vo.getOrderTicketVo().getPerformanceId();
-        final String orderId = vo.getOrderTicketVo().getOrderTicketsId();
-        final String uid = vo.getOrderTicketVo().getUserId();
+    private List<KylinLuckyBagVo.LuckyBagVo> getLuckyBagVos(KylinOrderTicketVo orderTicketVo) {
+        final String performanceId = orderTicketVo.getPerformanceId();
+        final String orderId = orderTicketVo.getOrderTicketsId();
+        final String uid = orderTicketVo.getUserId();
 
         List<KylinLuckyBag> luckyBagList = dataUtils.getKylinLuckyBagList();
 
@@ -316,7 +324,7 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
                     if (kylinRewardUserList.isEmpty()) {
                         // 根据购买数量来分配兑换码
                         log.info("[getLuckyBagVos] 福袋[{}]已到发放时间，但未给用户分配兑换码, uid: {}, orderId: {}.", l.getName(), uid, orderId);
-                        kylinRewardUserList = getRandomRewardCode(vo, l.getLuckyBagId());
+                        kylinRewardUserList = getRandomRewardCode(orderTicketVo, l.getLuckyBagId());
                     }
                     List<KylinLuckyBagVo.RewardCodeVo> codeVoList = kylinRewardUserList.stream().map(k -> {
                         KylinLuckyBagVo.RewardCodeVo rewardCodeVo = new KylinLuckyBagVo.RewardCodeVo();
@@ -340,22 +348,17 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
         return activityVos;
     }
 
+
     /**
      * 分配兑换码
      *
-     * @param vo
-     * @return
-     */
-    /**
-     * 分配兑换码
-     *
-     * @param vo
+     * @param orderTicketVo
      * @return
      */
-    private List<KylinRewardUser> getRandomRewardCode(OrderDetailsVo vo, String luckyBagId) {
-        final int limitTotal = vo.getOrderTicketVo().getNumber();
+    private List<KylinRewardUser> getRandomRewardCode(KylinOrderTicketVo orderTicketVo, String luckyBagId) {
+        final int limitTotal = orderTicketVo.getNumber() - orderTicketVo.getRefundNumber();
         if (limitTotal <= 0) {
-            log.error("[getRandomRewardCode] 用户订单购买数量错误, orderId: {}.", vo.getOrderTicketVo().getOrderTicketsId());
+            log.error("[getRandomRewardCode] 用户订单购买数量错误, orderId: {}.", orderTicketVo.getOrderTicketsId());
             return Collections.emptyList();
         }
 
@@ -382,7 +385,6 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
         }
 
         //3. 写入
-        final KylinOrderTicketVo orderTicketVo = vo.getOrderTicketVo();
         List<KylinRewardUser> rewardUsers = new ArrayList<>(limitTotal);
 
         try {
@@ -477,4 +479,28 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
         KylinLuckyBagScope kylinLuckyBagScope = kylinLuckyBagScopeMapper.selectOne(queryWrapper);
         return kylinLuckyBagScope != null;
     }
+
+    /**
+     * 判断是否满足发放福利条件
+     *
+     * @param orderTicketVo 订单票务信息对象
+     * @return 是否满足条件
+     */
+    private boolean isEligibleForWelfare(KylinOrderTicketVo orderTicketVo) {
+        if (orderTicketVo == null) {
+            log.info("[isEligibleForWelfare] 订单信息为空.");
+            return false;
+        }
+
+        Integer status = orderTicketVo.getStatus();
+        Integer payStatus = orderTicketVo.getPayStatus();
+        Integer number = orderTicketVo.getNumber();
+        Integer refundNumber = orderTicketVo.getRefundNumber();
+        log.info("[isEligibleForWelfare] 订单信息, status: {}, payStatus: {}, number: {}, refundNumber: {}.",
+                status, payStatus, number, refundNumber);
+
+        return (status != null && (status.equals(1) || status.equals(6))) &&
+                (payStatus != null && payStatus.equals(1)) &&
+                (number != null && refundNumber != null && (number - refundNumber) > 0);
+    }
 }