| @@ -72,6 +72,8 @@ public class WxCardTransferInfo implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "updateDate") | @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "过期时间", name = "expiredTime") | |||||
| private Date expiredTime; | |||||
| public Long getCouponOrderId() { | public Long getCouponOrderId() { | ||||
| return couponOrderId; | return couponOrderId; | ||||
| @@ -152,4 +154,12 @@ public class WxCardTransferInfo implements Serializable { | |||||
| public void setUpdateDate(Date updateDate) { | public void setUpdateDate(Date updateDate) { | ||||
| this.updateDate = updateDate; | this.updateDate = updateDate; | ||||
| } | } | ||||
| public Date getExpiredTime() { | |||||
| return expiredTime; | |||||
| } | |||||
| public void setExpiredTime(Date expiredTime) { | |||||
| this.expiredTime = expiredTime; | |||||
| } | |||||
| } | } | ||||
| @@ -753,6 +753,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| wxCardTransferInfo.setRemainAmount(cardCVo.getRemainingAmount()); | wxCardTransferInfo.setRemainAmount(cardCVo.getRemainingAmount()); | ||||
| wxCardTransferInfo.setStatus(EnumCouponOrderStatus.CARD_TRANSFER.getCode()); | wxCardTransferInfo.setStatus(EnumCouponOrderStatus.CARD_TRANSFER.getCode()); | ||||
| wxCardTransferInfo.setTitle(cardCVo.getTitle()); | wxCardTransferInfo.setTitle(cardCVo.getTitle()); | ||||
| wxCardTransferInfo.setExpiredTime(cardCVo.getExpiredTime()); | |||||
| Date date = new Date(); | Date date = new Date(); | ||||
| wxCardTransferInfo.setCreateDate(date); | wxCardTransferInfo.setCreateDate(date); | ||||
| wxCardTransferInfo.setUpdateDate(date); | wxCardTransferInfo.setUpdateDate(date); | ||||
| @@ -664,8 +664,10 @@ | |||||
| <select id="findCardListOfCUser" parameterType="com.iformall.domain.vo.WxCardCVo" resultMap="CCardVoResultMap"> | <select id="findCardListOfCUser" parameterType="com.iformall.domain.vo.WxCardCVo" resultMap="CCardVoResultMap"> | ||||
| select id,tenant_id,coupon_id,coupon_type,expired_time,coupon_order_status,create_date,update_date, | |||||
| cover_img,title,sub_title,detail,unit,remark,amount,remaining_amount,support_transfer | |||||
| select id,tenant_id,'' coupon_id,'' coupon_type,expired_time,`status`as | |||||
| coupon_order_status,create_date,update_date, | |||||
| '' cover_img,title,'' sub_title,'' detail,'' unit,'' remark,amount,remain_amount as remaining_amount,'' | |||||
| support_transfer | |||||
| from wx_card_transfer_info where 1=1 | from wx_card_transfer_info where 1=1 | ||||
| <if test="tenantId != null"> | <if test="tenantId != null"> | ||||
| and tenant_id = #{tenantId} | and tenant_id = #{tenantId} | ||||
| @@ -675,10 +677,10 @@ | |||||
| </if> | </if> | ||||
| <choose> | <choose> | ||||
| <when test="couponOrderStatus != null"> | <when test="couponOrderStatus != null"> | ||||
| co.coupon_order_status = #{couponOrderStatus} | |||||
| and status = #{couponOrderStatus} | |||||
| </when> | </when> | ||||
| <otherwise> | <otherwise> | ||||
| co.coupon_order_status=8 | |||||
| and status=8 | |||||
| </otherwise> | </otherwise> | ||||
| </choose> | </choose> | ||||
| union | union | ||||