| @@ -91,6 +91,10 @@ public class WxCouponChannel extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "用户积分", name = "userCredit") | @io.swagger.annotations.ApiModelProperty(value = "用户积分", name = "userCredit") | ||||
| private Integer userCredit; | private Integer userCredit; | ||||
| @TableField(exist = false) | |||||
| @io.swagger.annotations.ApiModelProperty(value="1:A端发卷,2:B端发卷",name="sourceType") | |||||
| private Integer sourceType; | |||||
| public String getWeappPath() { | public String getWeappPath() { | ||||
| if(type == null) | if(type == null) | ||||
| return Constant.mainPageUrl; | return Constant.mainPageUrl; | ||||
| @@ -98,6 +98,10 @@ | |||||
| <if test=" null != userCredit "> | <if test=" null != userCredit "> | ||||
| and c.`credit_price` <= #{userCredit} | and c.`credit_price` <= #{userCredit} | ||||
| </if> | </if> | ||||
| <if test=" null != sourceType "> | |||||
| and `source_type` = #{sourceType} | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| @@ -148,7 +152,7 @@ | |||||
| <include refid="allColumns" />, | <include refid="allColumns" />, | ||||
| c.remain_inventory,c.inventory,c.cover_img,c.title,c.sub_title,c.sale_price, | 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.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 | |||||
| </sql> | </sql> | ||||
| <resultMap id="CouponChannelVoMap" type="com.iformall.domain.vo.WxCouponChannelVo"> | <resultMap id="CouponChannelVoMap" type="com.iformall.domain.vo.WxCouponChannelVo"> | ||||
| @@ -187,6 +191,7 @@ | |||||
| <result column="qr_code" property="qrCode"/> | <result column="qr_code" property="qrCode"/> | ||||
| <result column="conditions" jdbcType="VARCHAR" property="conditions" /> | <result column="conditions" jdbcType="VARCHAR" property="conditions" /> | ||||
| <result column="content_type" jdbcType="INTEGER" property="contentType"/> | <result column="content_type" jdbcType="INTEGER" property="contentType"/> | ||||
| <result column="source_type" jdbcType="INTEGER" property="sourceType"/> | |||||
| <collection column="{productId=coupon_id}" property="merchantVoList" | <collection column="{productId=coupon_id}" property="merchantVoList" | ||||
| @@ -255,6 +255,21 @@ | |||||
| and `content_type` = #{contentType} | and `content_type` = #{contentType} | ||||
| </if> | </if> | ||||
| <if test=" null != putApplyStatus and putApplyStatus == 2"> | |||||
| and `put_apply_status` = #{putApplyStatus} | |||||
| </if> | |||||
| <if test=" null != putApplyStatus and putApplyStatus == -1"> | |||||
| and `put_apply_status` != 2 | |||||
| </if> | |||||
| <if test=" null != stockApplyStatus "> | |||||
| and `stock_apply_status` = #{stockApplyStatus} | |||||
| </if> | |||||
| <if test=" null != cancleApplyStatus "> | |||||
| and `cancle_apply_status` = #{cancleApplyStatus} | |||||
| </if> | |||||
| <if test=" null != sourceType "> | <if test=" null != sourceType "> | ||||
| and `source_type` = #{sourceType} | and `source_type` = #{sourceType} | ||||
| </if> | </if> | ||||
| @@ -443,8 +458,23 @@ | |||||
| and c.`content_type` = #{contentType} | and c.`content_type` = #{contentType} | ||||
| </if> | </if> | ||||
| <if test=" null != putApplyStatus and putApplyStatus == 2"> | |||||
| and `put_apply_status` = #{putApplyStatus} | |||||
| </if> | |||||
| <if test=" null != putApplyStatus and putApplyStatus == -1"> | |||||
| and `put_apply_status` != 2 | |||||
| </if> | |||||
| <if test=" null != stockApplyStatus "> | |||||
| and c.`stock_apply_status` = #{stockApplyStatus} | |||||
| </if> | |||||
| <if test=" null != cancleApplyStatus "> | |||||
| and c.`cancle_apply_status` = #{cancleApplyStatus} | |||||
| </if> | |||||
| <if test=" null != sourceType "> | <if test=" null != sourceType "> | ||||
| and `source_type` = #{sourceType} | |||||
| and c.`source_type` = #{sourceType} | |||||
| </if> | </if> | ||||
| <!--如果配置了审批模板,需要过滤投放审批状态--> | <!--如果配置了审批模板,需要过滤投放审批状态--> | ||||