Commit f493c626 by xiaoer.li@freemud.com

微信商家券

parent cb8fc120
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
package cn.freemud.entities.dto.activity; package cn.freemud.entities.dto.activity;
import cn.freemud.entities.vo.PayGiftCouponVo; import cn.freemud.entities.vo.PayGiftCouponVo;
import cn.freemud.entities.vo.PayGiftWechatCouponInfoVo;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
...@@ -22,4 +23,5 @@ public class PayGiftCheckAndJoinResponseDto { ...@@ -22,4 +23,5 @@ public class PayGiftCheckAndJoinResponseDto {
private String activityName; private String activityName;
private List<PayGiftCouponVo> coupons; private List<PayGiftCouponVo> coupons;
private List<PayGiftWechatCouponInfoVo> wechatCouponInfo;
} }
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;
//券code
private String couponCode;
}
}
...@@ -325,6 +325,7 @@ public class QueryOrderResponseVo { ...@@ -325,6 +325,7 @@ public class QueryOrderResponseVo {
//支付有礼领券集合 //支付有礼领券集合
private List<PayGiftCouponVo> coupons; private List<PayGiftCouponVo> coupons;
private List<PayGiftWechatCouponInfoVo> wechatCouponInfo;
/** /**
* 收件人省份 * 收件人省份
......
...@@ -808,6 +808,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -808,6 +808,7 @@ public class OrderServiceImpl implements Orderservice {
PayGiftCheckAndJoinResponseDto payGiftResponse = payGiftBaseResponse.getResult(); PayGiftCheckAndJoinResponseDto payGiftResponse = payGiftBaseResponse.getResult();
queryOrderResponseVo.setActivityName(payGiftResponse.getActivityName()); queryOrderResponseVo.setActivityName(payGiftResponse.getActivityName());
queryOrderResponseVo.setCoupons(payGiftResponse.getCoupons()); queryOrderResponseVo.setCoupons(payGiftResponse.getCoupons());
queryOrderResponseVo.setWechatCouponInfo(payGiftResponse.getWechatCouponInfo());
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment