From 6af888e3f2b88be523d55219dbd8234cf778a15e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 14 Feb 2019 16:59:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E8=BD=AC=E8=B5=A0][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E9=A2=86=E5=8F=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxCardTransferInfo.java | 10 ++++++++++ .../service/impl/WxCouponOrderServiceImpl.java | 1 + .../src/main/resources/mapper/WxCouponOrderMapper.xml | 10 ++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java index 32940be75..014f0cbf4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java @@ -72,6 +72,8 @@ public class WxCardTransferInfo implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "updateDate") private Date updateDate; + @io.swagger.annotations.ApiModelProperty(value = "过期时间", name = "expiredTime") + private Date expiredTime; public Long getCouponOrderId() { return couponOrderId; @@ -152,4 +154,12 @@ public class WxCardTransferInfo implements Serializable { public void setUpdateDate(Date updateDate) { this.updateDate = updateDate; } + + public Date getExpiredTime() { + return expiredTime; + } + + public void setExpiredTime(Date expiredTime) { + this.expiredTime = expiredTime; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index b87e7fbbd..dbf69e6c6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -753,6 +753,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { wxCardTransferInfo.setRemainAmount(cardCVo.getRemainingAmount()); wxCardTransferInfo.setStatus(EnumCouponOrderStatus.CARD_TRANSFER.getCode()); wxCardTransferInfo.setTitle(cardCVo.getTitle()); + wxCardTransferInfo.setExpiredTime(cardCVo.getExpiredTime()); Date date = new Date(); wxCardTransferInfo.setCreateDate(date); wxCardTransferInfo.setUpdateDate(date); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 573a71eee..48a042696 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -664,8 +664,10 @@