福袋补充需求-验码权限、核销接口

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

@@ -25,7 +25,7 @@ public class KylinLuckyBagCodeDetailVo {
     private String code;
 
     @ApiModelProperty(value = "状态 0：不可用 1：可用 2：已领取")
-    private int state;
+    private int useStatus;
 
     @ApiModelProperty(value = "发放时间")
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

@@ -154,6 +154,9 @@ global-auth:
     # 场地摄像头列表
     - ${liquidnet.info.context}/camera/list
     - ${liquidnet.info.context}/inner/**
+    # 福袋
+    - ${liquidnet.info.context}/luckyBag/scope
+    - ${liquidnet.info.context}/luckyBag/code/**
   oncheck-url-pattern:
     - ${liquidnet.info.context}/order/details
     - ${liquidnet.info.context}/order/transfer*

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

@@ -108,8 +108,9 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
                 .eq(KylinLuckyBagScope::getState, LuckyBagStatusEnum.AVAILABLE_STATUS_AVAILABLE.getValue());
         List<KylinLuckyBagScope> kylinLuckyBagScopes = kylinLuckyBagScopeMapper.selectList(queryWrapper);
         if (kylinLuckyBagScopes.isEmpty()) {
-            log.info("[getLuckyBagListScope] 验码福袋列表为空, mobile: {}.", mobile);
-            return Collections.emptyList();
+            log.info("[getLuckyBagListScope] 暂无验码权限, mobile: {}.", mobile);
+            ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("20003");
+            throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
         }
 
         // 查询福袋列表
@@ -154,13 +155,13 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
             return ResponseDto.failure(ErrorMapping.get("20800"));
         }
 
-        OrderDetailsVo vo = orderTicketsService.orderDetails(rewardUser.getOrderId());
-        if (vo == null) {
+        KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(rewardUser.getOrderId());
+        if (orderTicketVo == null) {
             log.error("订单详情为空, orderId: {}.", rewardUser.getOrderId());
             iFeishuBotService.sendTextMessage("订单不存在, orderId: " + rewardUser.getOrderId());
             return ResponseDto.failure(ErrorMapping.get("20801"));
         }
-        return ResponseDto.success(buildCodeDetailVo(rewardUser, vo.getOrderTicketVo()));
+        return ResponseDto.success(buildCodeDetailVo(rewardUser, orderTicketVo));
     }
 
     @Override
@@ -199,7 +200,7 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
             detailVo.setLuckyBagName(luckyBag.getName());
         }
         detailVo.setCode(rewardUser.getCode());
-        detailVo.setState(rewardUser.getState());
+        detailVo.setUseStatus(rewardUser.getState());
         detailVo.setCreatedAt(rewardUser.getCreatedAt());
         detailVo.setUpdatedAt(rewardUser.getUpdatedAt());
         detailVo.setUserInfo(getUserInfo(orderTicketVo));