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

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

@@ -1325,7 +1325,9 @@ public class OrderServiceImpl implements Orderservice {
 
 //        BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoin(payGitRequestDto);
         //fisherman  【ID1032306】 【订单聚合层】总部和区域活动可同时生效
-        BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoinNew(payGitRequestDto);
+        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();
@@ -1346,6 +1348,10 @@ public class OrderServiceImpl implements Orderservice {
             }else {
                 queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
             }
+        }catch (Exception e){
+            queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
+        }
+
     }