| @@ -56,7 +56,7 @@ public class WxCouponSend implements Serializable { | |||||
| private Integer sendType; | private Integer sendType; | ||||
| /*发券条件**/ | /*发券条件**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="发券条件",name="condition") | @io.swagger.annotations.ApiModelProperty(value="发券条件",name="condition") | ||||
| private String condition; | |||||
| private String conditions; | |||||
| /*0:有效 1:无效**/ | /*0:有效 1:无效**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="0:有效 1:无效",name="status") | @io.swagger.annotations.ApiModelProperty(value="0:有效 1:无效",name="status") | ||||
| private Integer status; | private Integer status; | ||||
| @@ -98,12 +98,12 @@ public class WxCouponSend implements Serializable { | |||||
| sendType = _sendType; | 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() { | public Integer getStatus() { | ||||
| @@ -75,7 +75,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { | |||||
| WxOrder wxOrder = (WxOrder)param; | WxOrder wxOrder = (WxOrder)param; | ||||
| try { | try { | ||||
| JSONObject jo = JSONObject.parseObject(wxCouponSend.getCondition()); | |||||
| JSONObject jo = JSONObject.parseObject(wxCouponSend.getConditions()); | |||||
| if (wxOrder.getProductId().equals(jo.getLong("id"))) | if (wxOrder.getProductId().equals(jo.getLong("id"))) | ||||
| return true; | return true; | ||||
| else | else | ||||
| @@ -7,14 +7,14 @@ | |||||
| <result column="coupon_id" jdbcType="BIGINT" property="couponId" /> | <result column="coupon_id" jdbcType="BIGINT" property="couponId" /> | ||||
| <result column="title" jdbcType="VARCHAR" property="title" /> | <result column="title" jdbcType="VARCHAR" property="title" /> | ||||
| <result column="send_type" jdbcType="INTEGER" property="sendType" /> | <result column="send_type" jdbcType="INTEGER" property="sendType" /> | ||||
| <result column="condition" jdbcType="VARCHAR" property="condition" /> | |||||
| <result column="conditions" jdbcType="VARCHAR" property="conditions" /> | |||||
| <result column="status" jdbcType="INTEGER" property="status" /> | <result column="status" jdbcType="INTEGER" property="status" /> | ||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | ||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `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` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -118,7 +118,7 @@ | |||||
| left join wx_merchant_b_user mbu on mtd.b_user_id = mbu.id | left join wx_merchant_b_user mbu on mtd.b_user_id = mbu.id | ||||
| where 1=1 | where 1=1 | ||||
| and m.status = 1 | |||||
| <if test=" null != merchantName "> | <if test=" null != merchantName "> | ||||
| and m.name like concat('%', #{merchantName},'%') | and m.name like concat('%', #{merchantName},'%') | ||||
| </if> | </if> | ||||