Merge branch 'KA-20210622-ID1032306总部和区域活动可同时生效-周晓航' into qa

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1325,27 +1325,33 @@ public class OrderServiceImpl implements Orderservice {
 
 //        BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoin(payGitRequestDto);
         //fisherman  【ID1032306】 【订单聚合层】总部和区域活动可同时生效
-        BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoinNew(payGitRequestDto);
-        ApiLog.info("fisherman 总部和区域活动可同时生效 ", payGitRequestDto, payGiftBaseResponse);
-        if (String.valueOf(RESPONSE_SUCCESS_CODE).equals(payGiftBaseResponse.getCode()) && payGiftBaseResponse.getResult() != null) {
-            PayGiftCheckAndJoinResponseObj result = payGiftBaseResponse.getResult();
-            PayGiftCheckAndJoinResponseDto oldPayGift = result.getOldPayGift();
-            // fisherman 版本前 原参数保留，暂不变更 向下兼容
-            if (oldPayGift != null) {
-                queryOrderResponseVo.setActivityName(oldPayGift.getActivityName());
-                queryOrderResponseVo.setCoupons(oldPayGift.getCoupons());
-                queryOrderResponseVo.setWechatCouponInfo(oldPayGift.getWechatCouponInfo());
-                queryOrderResponseVo.setPayGiftReps(oldPayGift);
-            }
-            queryOrderResponseVo.setNewPayGift(result.getNewPayGift());
-            // 造假数据 fisherman
-            if (CollectionUtils.isEmpty(result.getNewPayGift())) {
+        BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftBaseResponse;
+        try {
+            payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoinNew(payGitRequestDto);
+            ApiLog.info("fisherman 总部和区域活动可同时生效 ", payGitRequestDto, payGiftBaseResponse);
+            if (String.valueOf(RESPONSE_SUCCESS_CODE).equals(payGiftBaseResponse.getCode()) && payGiftBaseResponse.getResult() != null) {
+                PayGiftCheckAndJoinResponseObj result = payGiftBaseResponse.getResult();
+                PayGiftCheckAndJoinResponseDto oldPayGift = result.getOldPayGift();
+                // fisherman 版本前 原参数保留，暂不变更 向下兼容
+                if (oldPayGift != null) {
+                    queryOrderResponseVo.setActivityName(oldPayGift.getActivityName());
+                    queryOrderResponseVo.setCoupons(oldPayGift.getCoupons());
+                    queryOrderResponseVo.setWechatCouponInfo(oldPayGift.getWechatCouponInfo());
+                    queryOrderResponseVo.setPayGiftReps(oldPayGift);
+                }
+                queryOrderResponseVo.setNewPayGift(result.getNewPayGift());
+                // 造假数据 fisherman
+                if (CollectionUtils.isEmpty(result.getNewPayGift())) {
+                    queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
+                }
+
+            }else {
                 queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
             }
-
-        }else {
+        }catch (Exception e){
             queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
         }
+
     }