Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa

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

@@ -13,6 +13,8 @@
 package cn.freemud.entities.dto.activity;
 
 import cn.freemud.entities.vo.PayGiftCouponVo;
+import cn.freemud.entities.vo.PayGiftGoodsConfigVo;
+import cn.freemud.entities.vo.PayGiftMicroProgramConfigVo;
 import cn.freemud.entities.vo.PayGiftWechatCouponInfoVo;
 import lombok.Data;
 
@@ -35,4 +37,34 @@ public class PayGiftCheckAndJoinResponseDto {
     private  String type;
     private List<PayGiftCouponVo> coupons;
     private PayGiftWechatCouponInfoVo wechatCouponInfo;
+
+    /**
+     * 奖励类型：1-非码券，2-微信商家券，3-弹窗奖励
+     */
+    private String syncWechat;
+
+    /**
+     * 活动配图
+     */
+    private String activityPicture;
+
+    /**
+     * 跳转设置(跳转类型) 0:无 5:跳转页面 10:外部小程序 15:跳转商品 20:跳转H5
+     */
+    private String redirectType;
+
+    /**
+     * 跳转商品
+     */
+    private PayGiftGoodsConfigVo goodsConfig;
+
+    /**
+     * 跳转小程序
+     */
+    private PayGiftMicroProgramConfigVo microProgramConfig;
+
+    /**
+     * 跳转页面5和20跳转外部H5对应的路径或者URL
+     */
+    private String redirectPage;
 }

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

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+
+@Data
+public class PayGiftGoodsConfigVo {
+
+    /**
+     * 跳转商品ID
+     */
+    private String goodsId;
+    /**
+     * 跳转商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 跳转商品价格，单位分
+     */
+    private Integer price;
+
+}

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

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+
+@Data
+public class PayGiftMicroProgramConfigVo {
+
+    /**
+     * 跳转小程序ID
+     */
+    private String appId;
+    /**
+     * 跳转小程序跳转路径
+     */
+    private String redirectUrl;
+
+}

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

@@ -371,6 +371,37 @@ public class QueryOrderResponseVo {
     private List<PayGiftCouponVo> coupons;
     private PayGiftWechatCouponInfoVo wechatCouponInfo;
 
+
+    /**
+     * 支付有礼奖励类型：1-非码券，2-微信商家券，3-弹窗奖励
+     */
+    private String syncWechat;
+
+    /**
+     * 支付有礼活动配图
+     */
+    private String activityPicture;
+
+    /**
+     * 支付有礼跳转设置(跳转类型) 0:无 5:跳转页面 10:外部小程序 15:跳转商品 20:跳转H5
+     */
+    private String redirectType;
+
+    /**
+     * 支付有礼跳转商品
+     */
+    private PayGiftGoodsConfigVo goodsConfig;
+
+    /**
+     * 支付有礼跳转小程序
+     */
+    private PayGiftMicroProgramConfigVo microProgramConfig;
+
+    /**
+     * 支付有礼跳转页面5和20跳转外部H5对应的路径或者URL
+     */
+    private String redirectPage;
+
     /**
      * 收件人省份
      */

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

@@ -1300,6 +1300,12 @@ public class OrderServiceImpl implements Orderservice {
             queryOrderResponseVo.setActivityName(payGiftResponse.getActivityName());
             queryOrderResponseVo.setCoupons(payGiftResponse.getCoupons());
             queryOrderResponseVo.setWechatCouponInfo(payGiftResponse.getWechatCouponInfo());
+            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());
         }
     }