diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java
index 9dd23d62f..cb044d5b3 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java
@@ -56,7 +56,7 @@ public class WxCouponSend implements Serializable {
private Integer sendType;
/*发券条件**/
@io.swagger.annotations.ApiModelProperty(value="发券条件",name="condition")
- private String condition;
+ private String conditions;
/*0:有效 1:无效**/
@io.swagger.annotations.ApiModelProperty(value="0:有效 1:无效",name="status")
private Integer status;
@@ -98,12 +98,12 @@ public class WxCouponSend implements Serializable {
sendType = _sendType;
}
- public String getCondition() {
- return condition;
+ public String getConditions() {
+ return conditions;
}
- public void setCondition(String condition) {
- this.condition = condition;
+ public void setConditions(String conditions) {
+ this.conditions = conditions;
}
public Integer getStatus() {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
index a30213834..232257648 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
@@ -75,7 +75,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
WxOrder wxOrder = (WxOrder)param;
try {
- JSONObject jo = JSONObject.parseObject(wxCouponSend.getCondition());
+ JSONObject jo = JSONObject.parseObject(wxCouponSend.getConditions());
if (wxOrder.getProductId().equals(jo.getLong("id")))
return true;
else
diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml
index 6ed5fb8b3..6efc8ee86 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml
@@ -7,14 +7,14 @@
-
+
- `id`,`tenant_id`,`coupon_id`,`title`,`send_type`,`condition`,`status`,`create_date`,`update_date`
+ `id`,`tenant_id`,`coupon_id`,`title`,`send_type`,`conditions`,`status`,`create_date`,`update_date`
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml
index 1da5b4074..ead1f2c2d 100644
--- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml
@@ -118,7 +118,7 @@
left join wx_merchant_b_user mbu on mtd.b_user_id = mbu.id
where 1=1
-
+ and m.status = 1
and m.name like concat('%', #{merchantName},'%')