diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java
index 3a59948ee..5f864524b 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java
@@ -91,6 +91,10 @@ public class WxCouponChannel extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "用户积分", name = "userCredit")
private Integer userCredit;
+ @TableField(exist = false)
+ @io.swagger.annotations.ApiModelProperty(value="1:A端发卷,2:B端发卷",name="sourceType")
+ private Integer sourceType;
+
public String getWeappPath() {
if(type == null)
return Constant.mainPageUrl;
diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
index 0e7651abe..f914a55a7 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
@@ -98,6 +98,10 @@
and c.`credit_price` <= #{userCredit}
+
+
+ and `source_type` = #{sourceType}
+
@@ -148,7 +152,7 @@
,
c.remain_inventory,c.inventory,c.cover_img,c.title,c.sub_title,c.sale_price,
c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type,c.support_transfer,c.press_limit_num,c.auto_refund,c.conditions,
- c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.credit_price,c.content_type
+ c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.credit_price,c.content_type,c.source_type
@@ -187,6 +191,7 @@
+
+
+ and `put_apply_status` = #{putApplyStatus}
+
+
+ and `put_apply_status` != 2
+
+
+
+ and `stock_apply_status` = #{stockApplyStatus}
+
+
+
+ and `cancle_apply_status` = #{cancleApplyStatus}
+
+
and `source_type` = #{sourceType}
@@ -443,8 +458,23 @@
and c.`content_type` = #{contentType}
+
+ and `put_apply_status` = #{putApplyStatus}
+
+
+ and `put_apply_status` != 2
+
+
+
+ and c.`stock_apply_status` = #{stockApplyStatus}
+
+
+
+ and c.`cancle_apply_status` = #{cancleApplyStatus}
+
+
- and `source_type` = #{sourceType}
+ and c.`source_type` = #{sourceType}