KA 支付有礼 多重活动开发

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseObj.java

+package cn.freemud.entities.dto.activity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2021/6/24 上午11:20
+ * @description :
+ */
+@Data
+public class PayGiftCheckAndJoinResponseObj {
+    private PayGiftCheckAndJoinResponseDto oldPayGift;
+
+    private List<PayGiftCheckAndJoinResponseDtoNew> newPayGift;
+}

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -14,6 +14,7 @@ package cn.freemud.entities.vo;
 
 import cn.freemud.entities.dto.PromotionMessageDto;
 import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto;
+import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDtoNew;
 import cn.freemud.entities.dto.promotion.QueryHistoryGroupVO;
 import cn.freemud.entities.dto.promotion.QuerySpellGroupVo;
 import com.alibaba.fastjson.annotation.JSONField;
@@ -640,4 +641,8 @@ public class QueryOrderResponseVo {
      */
     private boolean orderCompareAfterSaleOrder;
 
+    /**
+     * 【订单聚合层】总部和区域活动可同时生效  直接反馈促销给的活动数据
+     */
+    private List<PayGiftCheckAndJoinResponseDtoNew> newPayGift;
 }

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

@@ -30,6 +30,7 @@ import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.QueryOrdersResponseDto.DataBean.OrderBean;
 import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto;
 import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDtoNew;
+import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseObj;
 import cn.freemud.entities.dto.activity.PayGitCheckAndJoinRequestDto;
 import cn.freemud.entities.dto.delivery.OrderRemindRequestDto;
 import cn.freemud.entities.dto.delivery.QueryDeliveryAmountResponseDto;
@@ -1322,27 +1323,20 @@ public class OrderServiceImpl implements Orderservice {
 
 //        BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoin(payGitRequestDto);
         //fisherman  【ID1032306】 【订单聚合层】总部和区域活动可同时生效
-        BaseResponse<PayGiftCheckAndJoinResponseDtoNew> payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoinNew(payGitRequestDto);
+        BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoinNew(payGitRequestDto);
+        ApiLog.info("fisherman 总部和区域活动可同时生效 ", payGitRequestDto, payGiftBaseResponse);
         if (String.valueOf(RESPONSE_SUCCESS_CODE).equals(payGiftBaseResponse.getCode()) && payGiftBaseResponse.getResult() != null) {
-            PayGiftCheckAndJoinResponseDtoNew payGiftResponse = payGiftBaseResponse.getResult();
-            // fisherman 需要向下兼容
-
-            //版本前 原参数保留，暂不变更
-            //防止牵扯其他服务返回参数结构引起异常
-            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());
+            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());
+
         }
     }
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java

@@ -15,6 +15,7 @@ package cn.freemud.service.thirdparty;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto;
 import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDtoNew;
+import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseObj;
 import cn.freemud.entities.dto.activity.PayGitCheckAndJoinRequestDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -38,5 +39,5 @@ public interface ActivityApplicationClient {
      * @return
      */
     @PostMapping("/promotionActivity/payGiftShareCheckAndJoin")
-    BaseResponse<PayGiftCheckAndJoinResponseDtoNew> payGiftCheckAndJoinNew(@RequestBody PayGitCheckAndJoinRequestDto requestVo);
+    BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftCheckAndJoinNew(@RequestBody PayGitCheckAndJoinRequestDto requestVo);
 }