| @@ -2,12 +2,12 @@ package com.iformall.domain.po; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import javax.persistence.*; | |||||
| import java.util.*; | |||||
| import javax.persistence.Transient; | |||||
| import java.util.List; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | |||||
| import javax.persistence.Transient; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| import java.util.Date; | |||||
| import java.util.List; | |||||
| @Table(name = "wx_card_info") | @Table(name = "wx_card_info") | ||||
| @Data | @Data | ||||
| @@ -56,6 +56,9 @@ public class WxCardInfo 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 = "是否支持转送(0:不支持,1支持)", name = "supportTransfer") | |||||
| private Integer supportTransfer; | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -233,10 +233,12 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| } | } | ||||
| } | } | ||||
| //10、消费后修改转赠状态 | |||||
| if (coupon.getSupportTransfer().equals(EnumCouponTransfer.YES.getCode())) { | |||||
| coupon.setSupportTransfer(EnumCouponTransfer.NO.getCode()); | |||||
| wxCouponMapper.updateByPrimaryKeySelective(coupon); | |||||
| //10、消费后修改卡转赠状态 | |||||
| WxCardInfo wxCardInfo = new WxCardInfo(); | |||||
| wxCardInfo.setId(record.getCardId()); | |||||
| wxCardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode()); | |||||
| if (cardInfo.getSupportTransfer().equals(EnumCouponTransfer.YES.getCode())) { | |||||
| wxCardInfoMapper.updateByPrimaryKeySelective(wxCardInfo); | |||||
| } | } | ||||
| return new ResultData(record); | return new ResultData(record); | ||||
| } | } | ||||
| @@ -14,10 +14,13 @@ | |||||
| <result column="remaining_share_fee_amount" jdbcType="INTEGER" property="remainingShareFeeAmount" /> | <result column="remaining_share_fee_amount" jdbcType="INTEGER" property="remainingShareFeeAmount" /> | ||||
| <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="support_transfer" jdbcType="INTEGER" property="supportTransfer"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`coupon_id`,`transaction_id`,`amount`,`sale_amount`,`remaining_amount`,`service_fee_amount`,`share_fee_amount`,`remaining_share_fee_amount`,`create_date`,`update_date` | |||||
| `id`,`tenant_id`,`coupon_id`,`transaction_id`,`amount`,`sale_amount`,`remaining_amount`,`service_fee_amount`, | |||||
| `share_fee_amount`,`remaining_share_fee_amount`,`create_date`,`update_date`,`support_transfer` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||