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

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

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

@@ -1322,25 +1322,25 @@ public class OrderServiceImpl implements Orderservice {
             payGitRequestDto.setVer(1);
         }
 
-        BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoin(payGitRequestDto);
-        if (String.valueOf(RESPONSE_SUCCESS_CODE).equals(payGiftBaseResponse.getCode()) && payGiftBaseResponse.getResult() != null) {
-            PayGiftCheckAndJoinResponseDto payGiftResponse = payGiftBaseResponse.getResult();
-            //版本前 原参数保留，暂不变更
-            //防止牵扯其他服务返回参数结构引起异常
-            queryOrderResponseVo.setActivityName(payGiftResponse.getActivityName());
-            queryOrderResponseVo.setCoupons(payGiftResponse.getCoupons());
-            queryOrderResponseVo.setWechatCouponInfo(payGiftResponse.getWechatCouponInfo());
-
-            //20201223本次变更-》去掉set，直接以对象进行返参
-            queryOrderResponseVo.setPayGiftReps(payGiftResponse);
-//            queryOrderResponseVo.setActivityNo(payGiftResponse.getActivityNo());
-//            queryOrderResponseVo.setSyncWechat(payGiftResponse.getSyncWechat());
-//            queryOrderResponseVo.setActivityPicture(payGiftResponse.getActivityPicture());
-//            queryOrderResponseVo.setRedirectType(payGiftResponse.getRedirectType());
-//            queryOrderResponseVo.setGoodsConfig(payGiftResponse.getGoodsConfig());
-//            queryOrderResponseVo.setMicroProgramConfig(payGiftResponse.getMicroProgramConfig());
-//            queryOrderResponseVo.setRedirectPage(payGiftResponse.getRedirectPage());
-//            queryOrderResponseVo.setActivitySendType(payGiftResponse.getSendType());
+        //fisherman  【ID1032306】 【订单聚合层】总部和区域活动可同时生效
+        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());
+            }
+        }catch (Exception e){
+            ApiLog.error("error to /promotionActivity/payGiftShareCheckAndJoin ", payGitRequestDto, e);
         }
     }