diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java index f14965636..5384ac1c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -291,14 +291,24 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { List wxCouponChannels = wxCouponChannelMapper.findList(wxCouponChannelQuery); WxCouponChannel wxCouponChannel = null; Date now = new Date(); + Date showBeginTime = now; + Date beginTime = null; + Date endTime = null; + if(coupon.getSoldStartTime() != null && coupon.getSoldEndTime() != null){ + beginTime = coupon.getSoldStartTime(); + endTime = coupon.getSoldEndTime(); + }else{ + beginTime = showBeginTime; + endTime = coupon.getValidEndDate(); + } if(wxCouponChannels == null || wxCouponChannels.isEmpty()){ wxCouponChannel = new WxCouponChannel(); final IdWorker idWorker = IdWorker.get(); wxCouponChannel.setId(idWorker.nextId()); wxCouponChannel.updateTenantInfo(coupon); - wxCouponChannel.setShowBeginTime(now); - wxCouponChannel.setBeginTime(now); - wxCouponChannel.setEndTime(coupon.getValidEndDate()); + wxCouponChannel.setShowBeginTime(showBeginTime); + wxCouponChannel.setBeginTime(beginTime); + wxCouponChannel.setEndTime(endTime); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_BEFORE.getCode()); wxCouponChannel.setCouponId(coupon.getId()); wxCouponChannel.setMakeMerchantId(coupon.getMakeMerchantId()); @@ -311,9 +321,9 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { }else if(wxCouponChannels.size() == 1){ wxCouponChannel = wxCouponChannels.get(0); - wxCouponChannel.setShowBeginTime(now); - wxCouponChannel.setBeginTime(now); - wxCouponChannel.setEndTime(coupon.getValidEndDate()); + wxCouponChannel.setShowBeginTime(showBeginTime); + wxCouponChannel.setBeginTime(beginTime); + wxCouponChannel.setEndTime(endTime); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_BEFORE.getCode()); wxCouponChannel.setCouponId(coupon.getId()); wxCouponChannel.setMakeMerchantId(coupon.getMakeMerchantId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index c86cf937e..586cb65b4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -1552,7 +1552,7 @@ public class WxCouponServiceImpl implements WxCouponService { } if(EnumPayShare.YES.getCode().equals(payAccount.getShare())){ Date startDate = null; - if(wxCoupon.getSoldStartTime() != null && wxCoupon.getEnddate() != null){ + if(wxCoupon.getSoldStartTime() != null && wxCoupon.getSoldEndTime() != null){ startDate = wxCoupon.getSoldStartTime(); }else{ startDate = new Date();