Merge branch 'dev_fudai_v2' into container

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinLuckyBagService.java

@@ -10,17 +10,19 @@ import java.util.List;
 public interface IKylinLuckyBagService {
     /**
      * 根据订单ID获取福袋
+     *
      * @param orderId
      * @return
      */
-    KylinLuckyBagVo getLuckyBagByOrderId(String orderId);
+    ResponseDto<KylinLuckyBagVo> getLuckyBagByOrderId(String orderId);
 
     /**
      * 获取福袋验码列表
+     *
      * @param mobile
      * @return
      */
-    List<KylinLuckyBagScopeVo> getLuckyBagListScope(String mobile);
+    ResponseDto<List<KylinLuckyBagScopeVo>> getLuckyBagListScope(String mobile);
 
     /**
      * 获取福袋详情

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

@@ -29,13 +29,13 @@ public class KylinLuckyBagController {
     @GetMapping("")
     @ApiOperation("获取福袋权益列表")
     public ResponseDto<KylinLuckyBagVo> getLuckyBagByOrderId(@RequestParam(value = "orderId") String orderId) {
-        return ResponseDto.success(luckyBagService.getLuckyBagByOrderId(orderId));
+        return luckyBagService.getLuckyBagByOrderId(orderId);
     }
 
     @GetMapping("/scope")
     @ApiOperation("获取验码福袋列表")
     public ResponseDto<List<KylinLuckyBagScopeVo>> getLuckyBagListScope(@RequestParam(value = "mobile") String mobile){
-        return ResponseDto.success(luckyBagService.getLuckyBagListScope(mobile));
+        return luckyBagService.getLuckyBagListScope(mobile);
     }
 
     @ApiOperation("兑换码详情")

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

@@ -3,7 +3,6 @@ package com.liquidnet.service.kylin.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.StringUtil;
@@ -63,21 +62,20 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
 
 
     @Override
-    public KylinLuckyBagVo getLuckyBagByOrderId(String orderId) {
+    public ResponseDto<KylinLuckyBagVo> getLuckyBagByOrderId(String orderId) {
         //1. 首先校验用户权限
         OrderDetailsVo vo = orderTicketsService.orderDetails(orderId);
         String uid = CurrentUtil.getCurrentUid();
         if (null == vo) {
             log.error("[getLuckyBagByOrderId] 无权查看该订单, orderId: {}, uid: {}.", orderId, uid);
-            ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("20003");
-            throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+            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 KylinLuckyBagVo.ofEmpty();
+            return ResponseDto.success(KylinLuckyBagVo.ofEmpty());
         }
 
         // 2. 订单关联的演出ID
@@ -87,20 +85,18 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
         List<KylinLuckyBagVo.LuckyBagVo> luckyBagVos = getLuckyBagVos(vo);
 
         if (activityVos.isEmpty()) {
-            return KylinLuckyBagVo.of(luckyBagVos, null);
+            return ResponseDto.success(KylinLuckyBagVo.of(luckyBagVos, null));
         } else {
-            return KylinLuckyBagVo.of(luckyBagVos, activityVos.get(0));
+            return ResponseDto.success(KylinLuckyBagVo.of(luckyBagVos, activityVos.get(0)));
         }
-
-
     }
 
 
     @Override
-    public List<KylinLuckyBagScopeVo> getLuckyBagListScope(String mobile) {
+    public ResponseDto<List<KylinLuckyBagScopeVo>> getLuckyBagListScope(String mobile) {
         if (StringUtil.isBlank(mobile)) {
             log.info("[getLuckyBagListScope] 手机号为空");
-            return Collections.emptyList();
+            return ResponseDto.failure(ErrorMapping.get("20004"));
         }
         LambdaQueryWrapper<KylinLuckyBagScope> queryWrapper = new QueryWrapper<KylinLuckyBagScope>()
                 .lambda()
@@ -109,15 +105,14 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
         List<KylinLuckyBagScope> kylinLuckyBagScopes = kylinLuckyBagScopeMapper.selectList(queryWrapper);
         if (kylinLuckyBagScopes.isEmpty()) {
             log.info("[getLuckyBagListScope] 暂无验码权限, mobile: {}.", mobile);
-            ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("20003");
-            throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+            return ResponseDto.failure(ErrorMapping.get("20003"));
         }
 
         // 查询福袋列表
         List<KylinLuckyBag> luckyBagList = dataUtils.getKylinLuckyBagList();
         if (luckyBagList.isEmpty()) {
             log.info("[getLuckyBagListScope] 获取福袋列表为空.");
-            return Collections.emptyList();
+            return ResponseDto.success();
         }
 
         // 该手机号可以核验的福袋ID列表
@@ -125,7 +120,7 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
                 .map(KylinLuckyBagScope::getLuckyBagId)
                 .collect(Collectors.toSet());
 
-        return luckyBagList.stream()
+        return ResponseDto.success(luckyBagList.stream()
                 .filter(l -> collected.contains(l.getLuckyBagId()))
                 .map(l -> {
                     KylinLuckyBagScopeVo vo = new KylinLuckyBagScopeVo();
@@ -136,7 +131,7 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
                     vo.setPerformanceName(l.getPerformanceName());
                     return vo;
                 })
-                .collect(Collectors.toList());
+                .collect(Collectors.toList()));
     }
 
     @Override
@@ -262,9 +257,10 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
 
     /**
      * 获取核验人信息
+     *
      * @return
      */
-    private KylinLuckyBagCodeDetailVo.Operator getOperator(String mobile, String luckyBagId){
+    private KylinLuckyBagCodeDetailVo.Operator getOperator(String mobile, String luckyBagId) {
         if (StringUtil.isBlank(mobile)) {
             return null;
         }