Merge remote-tracking branch…

Merge remote-tracking branch 'origin/feature/20201223_用户订单查询促销信息转为payGiftReps_wanghanghang' into develop

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

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

@@ -13,6 +13,7 @@
 package cn.freemud.entities.vo;
 
 import cn.freemud.entities.dto.PromotionMessageDto;
+import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Builder;
@@ -239,7 +240,6 @@ public class QueryOrderResponseVo {
      */
     private String refundCreateTime;
 
-
     /**
      * 订单备注
      */
@@ -318,7 +318,6 @@ public class QueryOrderResponseVo {
      * 运单号
      */
     private String deliveryId;
-
     /**
      * 骑手名称 商家自配送名称
      */
@@ -364,12 +363,15 @@ public class QueryOrderResponseVo {
     //支付有礼活动名称
     private String activityName;
 
+    //支付有礼活动号
+//    private String activityNo;
+
     /**
      * 支付有礼发送方式
      * 0-静默发送
      * 5-手动发送
      */
-    private Integer activitySendType;
+//    private Integer activitySendType;
 
     //支付有礼领券集合
     private List<PayGiftCouponVo> coupons;
@@ -379,32 +381,32 @@ public class QueryOrderResponseVo {
     /**
      * 支付有礼奖励类型：1-非码券，2-微信商家券，3-弹窗奖励
      */
-    private String syncWechat;
+//    private String syncWechat;
 
     /**
      * 支付有礼活动配图
      */
-    private String activityPicture;
+//    private String activityPicture;
 
     /**
      * 支付有礼跳转设置(跳转类型) 0:无 5:跳转页面 10:外部小程序 15:跳转商品 20:跳转H5
      */
-    private String redirectType;
+//    private String redirectType;
 
     /**
      * 支付有礼跳转商品
      */
-    private PayGiftGoodsConfigVo goodsConfig;
+//    private PayGiftGoodsConfigVo goodsConfig;
 
     /**
      * 支付有礼跳转小程序
      */
-    private PayGiftMicroProgramConfigVo microProgramConfig;
+//    private PayGiftMicroProgramConfigVo microProgramConfig;
 
     /**
      * 支付有礼跳转页面5和20跳转外部H5对应的路径或者URL
      */
-    private String redirectPage;
+//    private String redirectPage;
 
     /**
      * 收件人省份
@@ -524,5 +526,13 @@ public class QueryOrderResponseVo {
          *  是否已选择寄杯
          */
         private Boolean sendCoupon;
+
     }
+
+    /**
+     *促销返回参数对象 20201223 提出紧急需求变更
+     */
+    private PayGiftCheckAndJoinResponseDto payGiftReps;
+
+
 }