diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
index d73e6b1d4..ecaf79ef6 100644
--- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
+++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
@@ -106,6 +106,9 @@ public class WxCouponOrderBVo extends WxCouponOrder {
@io.swagger.annotations.ApiModelProperty(value = "补贴类型", name = "subsidyType")
private Integer subsidyType;
+ @io.swagger.annotations.ApiModelProperty(value="1:A端发卷,2:B端发卷",name="sourceType")
+ private Integer sourceType;
+
public String getbUserName() {
return bUserName;
}
diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
index 818ac6818..a167bd8c3 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
@@ -720,6 +720,7 @@
+
@@ -749,7 +750,7 @@
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,
co.create_date,co.update_date,co.coupon_price, co.verify_type, co.pay_vendor,c.title,c.sale_price,c.use_price,c.price,
- c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num,
+ c.unit,c.auto_refund,c.business,c.subsidy_type,c.source_type,ms.subsidy subsidy_num,
(CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name,
(CASE WHEN couc.mc = 1 THEN m1.id ELSE 0 END) AS merchant_id,
cu.phone,m2.name AS verify_merchant_name,cal.channel_type
@@ -854,6 +855,9 @@
and c.business = #{business}
+
+ and c.`source_type` = #{sourceType}
+
and bu.verify_merchant_name = #{verifyMerchantName}