| @@ -7,7 +7,6 @@ import javax.persistence.Id; | |||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.text.DecimalFormat; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| @JsonIgnoreProperties(value = {"handler"}) | @JsonIgnoreProperties(value = {"handler"}) | ||||
| @@ -55,6 +54,9 @@ public class WxCouponCVo extends WxCoupon implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") | @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") | ||||
| private List<WxMerchantVo> merchantVoList; | private List<WxMerchantVo> merchantVoList; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "是否支持转送(0:不支持,1支持)", name = "supportTransfer") | |||||
| private Integer supportTransfer; | |||||
| public Long getCouponId() { | public Long getCouponId() { | ||||
| return couponId; | return couponId; | ||||
| } | } | ||||
| @@ -125,4 +127,13 @@ public class WxCouponCVo extends WxCoupon implements Serializable { | |||||
| this.priceStr = priceStr; | this.priceStr = priceStr; | ||||
| } | } | ||||
| @Override | |||||
| public Integer getSupportTransfer() { | |||||
| return supportTransfer; | |||||
| } | |||||
| @Override | |||||
| public void setSupportTransfer(Integer supportTransfer) { | |||||
| this.supportTransfer = supportTransfer; | |||||
| } | |||||
| } | } | ||||
| @@ -150,6 +150,7 @@ | |||||
| <sql id="WxCouponCVoColumn"> | <sql id="WxCouponCVoColumn"> | ||||
| cc.id,cc.coupon_id,cc.target_ad,cc.begin_time,cc.end_time, | cc.id,cc.coupon_id,cc.target_ad,cc.begin_time,cc.end_time, | ||||
| c.tenant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business | c.tenant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business | ||||
| c.support_transfer | |||||
| </sql> | </sql> | ||||
| <resultMap id="WxCouponCVoMap" type="com.iformall.domain.vo.WxCouponCVo"> | <resultMap id="WxCouponCVoMap" type="com.iformall.domain.vo.WxCouponCVo"> | ||||
| @@ -182,7 +183,9 @@ | |||||
| <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"/> | ||||
| <result column="business" jdbcType="INTEGER" property="business"/> | <result column="business" jdbcType="INTEGER" property="business"/> | ||||
| <result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/> | |||||
| <collection column="{productId=coupon_id}" property="merchantVoList" | <collection column="{productId=coupon_id}" property="merchantVoList" | ||||
| ofType="com.iformall.domain.vo.WxMerchantVo" | ofType="com.iformall.domain.vo.WxMerchantVo" | ||||
| javaType="java.util.List" | javaType="java.util.List" | ||||
| @@ -664,6 +664,8 @@ | |||||
| <select id="findCardListOfCUser" parameterType="com.iformall.domain.vo.WxCardCVo" resultMap="CCardVoResultMap"> | <select id="findCardListOfCUser" parameterType="com.iformall.domain.vo.WxCardCVo" resultMap="CCardVoResultMap"> | ||||
| select c.* from ( | |||||
| select id,tenant_id,0 coupon_id,0 coupon_type,expired_time,`status`as | select id,tenant_id,0 coupon_id,0 coupon_type,expired_time,`status`as | ||||
| coupon_order_status,create_date,update_date,'' cover_img,title,'' sub_title,'' detail,0 unit, | coupon_order_status,create_date,update_date,'' cover_img,title,'' sub_title,'' detail,0 unit, | ||||
| '' remark,amount,remain_amount as remaining_amount,0 support_transfer | '' remark,amount,remain_amount as remaining_amount,0 support_transfer | ||||
| @@ -683,7 +685,8 @@ | |||||
| </otherwise> | </otherwise> | ||||
| </choose> | </choose> | ||||
| union | union | ||||
| select <include refid="allCUserCardListColumns" /> | |||||
| select | |||||
| <include refid="allCUserCardListColumns"/> | |||||
| from wx_coupon_order co | from wx_coupon_order co | ||||
| inner join wx_coupon c on co.coupon_id = c.id | inner join wx_coupon c on co.coupon_id = c.id | ||||
| inner join wx_card_info a on co.id=a.id | inner join wx_card_info a on co.id=a.id | ||||
| @@ -707,6 +710,7 @@ | |||||
| #{sItem} | #{sItem} | ||||
| </foreach> | </foreach> | ||||
| </if> | </if> | ||||
| ) c | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | <if test=" null != sortColumns"> order by ${sortColumns} </if> | ||||
| </select> | </select> | ||||