支付有礼活动-暂未开发完 启动会报错 别合代码

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

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

+package cn.freemud.entities.dto.activity;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2021/6/23 下午9:24
+ * @description :
+ */
+@Data
+public class ActivitysDtoNew {
+
+    /**
+     * 活动号
+     */
+    private String activityId;
+
+    /**
+     * 活动名称
+     */
+    private String activityName;
+
+    /**
+     * 活动弹窗图片
+     */
+    private String activityPicture;
+
+    /**
+     * 跳转类型:0:无 5:跳转页面 10:外部小程序 15:跳转商品 20:跳转H5
+     */
+    private String redirectType;
+
+    /**
+     * 跳转页面5和20跳转外部H5对应的路径或者URL
+     */
+    private String redirectPage;
+
+    /**
+     * 跳转商品对象
+     */
+    private GoodsConfig goodsConfig;
+
+    /**
+     * 跳转小程序对象
+     */
+    private MicroProgramConfig microProgramConfig;
+
+
+
+    @Data
+    @NoArgsConstructor
+    static class GoodsConfig {
+        /**
+         * 跳转商品ID
+         */
+        private String goodsId;
+
+        /**
+         * 跳转商品名称
+         */
+        private String goodsName;
+
+        /**
+         * 跳转商品价格,单位分
+         */
+        private String price;
+    }
+
+    @Data
+    @NoArgsConstructor
+    static class MicroProgramConfig {
+        /**
+         * 跳转小程序ID
+         */
+        private String appId;
+
+        /**
+         * 跳转小程序跳转路径
+         */
+        private String redirectUrl;
+
+    }
+}

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

+package cn.freemud.entities.dto.activity;
+
+import cn.freemud.entities.vo.PayGiftCouponVo;
+import cn.freemud.entities.vo.PayGiftWechatCouponInfoVo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2021/6/23 下午9:22
+ * @description :
+ */
+@Data
+public class PayGiftCheckAndJoinResponseDtoNew {
+    /**
+     * 发送方式
+     * 0-静默发送
+     * 5-手动发送
+     */
+    private  Integer sendType;
+
+
+    /**
+     * 活动类型 支付有礼-6
+     */
+    private  String type;
+
+
+    /**
+     * 奖励类型：0-非码券，2-微信商家券，3-弹窗奖励
+     */
+    private String syncWechat;
+
+    /**
+     * 微信发券插件对象
+     */
+    private PayGiftWechatCouponInfoVo wechatCouponInfo;
+
+    /**
+     * 券列表
+     */
+    private List<PayGiftCouponVo> coupons;
+
+    /**
+     *活动及弹窗奖励的集合
+     */
+    private List<ActivitysDtoNew> activitys;
+}

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

@@ -6,7 +6,7 @@ import lombok.Data;
 public class PayGiftCouponVo {
 
     /**
-     * 优惠券类型 0-商品券 1-代金券 2-折扣券
+     * 优惠券类型 0-商品券 1-代金券 3-折扣券 4-换购券 5-配送券
      */
     private Integer couponType;
     /**
@@ -29,7 +29,10 @@ public class PayGiftCouponVo {
      * 抵扣金额
      */
     private Integer discountAmount;
+
+    // 废弃
     private String validityPeriodEnd;
+    // 废弃
     private String validityPeriodStart;
     /**
      * 有效期 2019.01.12-2019.02.12
@@ -44,4 +47,9 @@ public class PayGiftCouponVo {
      * 券log
      */
     private String logo;
+
+    /**
+     * 起用金额
+     */
+    private String minAmount;
 }

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

@@ -22,5 +22,7 @@ public class PayGiftWechatCouponInfoVo {
         private String stock_id;
         //发券凭证
         private String out_request_no;
+        // 券code，如果批次是发放时指定code的类型，则发券时必填
+        private String coupon_code;
     }
 }

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

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

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

@@ -14,6 +14,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.PayGitCheckAndJoinRequestDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,4 +30,13 @@ public interface ActivityApplicationClient {
      */
     @PostMapping("/promotionActivity/payGiftCheckAndJoin")
     public BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftCheckAndJoin(@RequestBody PayGitCheckAndJoinRequestDto requestVo);
+
+
+    /**
+     *  同享支付有礼活动验证与参与
+     * @param requestVo
+     * @return
+     */
+    @PostMapping("/promotionActivity/payGiftShareCheckAndJoin")
+    BaseResponse<PayGiftCheckAndJoinResponseDtoNew> payGiftCheckAndJoinNew(@RequestBody PayGitCheckAndJoinRequestDto requestVo);
 }