Merge remote-tracking branch 'remotes/origin/feature/1.9.29_支付有礼活动支持发放微信支付商家券'

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

@@ -13,6 +13,7 @@
 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;
@@ -22,4 +23,5 @@ public class PayGiftCheckAndJoinResponseDto {
 
     private  String activityName;
     private List<PayGiftCouponVo> coupons;
+    private PayGiftWechatCouponInfoVo wechatCouponInfo;
 }

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

+package cn.freemud.entities.vo;
+
+import java.util.List;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+public class PayGiftWechatCouponInfoVo {
+
+    // 发券商户号
+    private String send_coupon_merchant;
+    //send_coupon_params
+    private List<sendCouponParams> send_coupon_params;
+    //签名
+    private String sign;
+
+    @Data
+    @NoArgsConstructor
+    static class sendCouponParams {
+        //批次号
+        private String stock_id;
+        //发券凭证
+        private String out_request_no;
+    }
+}

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

@@ -325,6 +325,7 @@ public class QueryOrderResponseVo {
 
     //支付有礼领券集合
     private List<PayGiftCouponVo> coupons;
+    private PayGiftWechatCouponInfoVo wechatCouponInfo;
 
     /**
      * 收件人省份

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

@@ -55,6 +55,7 @@ import cn.freemud.utils.ValidationCode;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.freemud.api.assortment.datamanager.entity.db.*;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.manager.*;
@@ -808,6 +809,7 @@ public class OrderServiceImpl implements Orderservice {
             PayGiftCheckAndJoinResponseDto payGiftResponse = payGiftBaseResponse.getResult();
             queryOrderResponseVo.setActivityName(payGiftResponse.getActivityName());
             queryOrderResponseVo.setCoupons(payGiftResponse.getCoupons());
+            queryOrderResponseVo.setWechatCouponInfo(payGiftResponse.getWechatCouponInfo());
         }
     }