Browse Source

//有效期

release_toaliyun_real
xhxu 3 years ago
parent
commit
fafc545565
4 changed files with 41 additions and 59 deletions
  1. +8
    -10
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java
  2. +10
    -13
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  3. +16
    -28
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java
  4. +7
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 8
- 10
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java View File

@@ -207,16 +207,14 @@ public class WxOrderController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR);
}

if (wxCouponChannel.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode())) {
Date now = new Date();
if (wxCouponChannel.getBeginTime().getTime() > now.getTime()) {
logger.error("此券活动未开始:" + orderSaveDto.getCouponChannelId());
return new ResultData(ErrorCode.COUPON_CHANNEL_IS_NOT_STARTED);
}
if (wxCouponChannel.getEndTime().getTime() < now.getTime()) {
logger.error("此券活动已结束:" + orderSaveDto.getCouponChannelId());
return new ResultData(ErrorCode.COUPON_CHANNEL_IS_END);
}
Date now = new Date();
if (wxCouponChannel.getBeginTime() != null && wxCouponChannel.getBeginTime().getTime() > now.getTime()) {
logger.error("此券活动未开始:" + orderSaveDto.getCouponChannelId());
return new ResultData(ErrorCode.COUPON_CHANNEL_IS_NOT_STARTED);
}
if (wxCouponChannel.getEndTime() != null && wxCouponChannel.getEndTime().getTime() < now.getTime()) {
logger.error("此券活动已结束:" + orderSaveDto.getCouponChannelId());
return new ResultData(ErrorCode.COUPON_CHANNEL_IS_END);
}

if (wxCouponChannel.getStatus() == EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()) {


+ 10
- 13
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java View File

@@ -216,19 +216,16 @@ public class WxCouponChannelController extends BaseController {
}

private void filterTimed(WxCouponChannel wxCouponChannel, PageInfo<WxCouponChannelVo> page) {
if (wxCouponChannel.getTargetAd()!= null &&
wxCouponChannel.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode())) {
Date now = new Date();
page.getList().stream().forEach(cc->{
if (cc.getBeginTime().getTime() > now.getTime()) {
cc.setActivityStatus(EnumCouponChannelActivityStatus.PREPARED.getCode());
} else if (cc.getEndTime().getTime() < now.getTime()) {
cc.setActivityStatus(EnumCouponChannelActivityStatus.ENDED.getCode());
} else {
cc.setActivityStatus(EnumCouponChannelActivityStatus.STARTED.getCode());
}
});
}
Date now = new Date();
page.getList().stream().forEach(cc->{
if (cc.getBeginTime() != null && cc.getBeginTime().getTime() > now.getTime()) {
cc.setActivityStatus(EnumCouponChannelActivityStatus.PREPARED.getCode());
} else if (cc.getEndTime() != null && cc.getEndTime().getTime() < now.getTime()) {
cc.setActivityStatus(EnumCouponChannelActivityStatus.ENDED.getCode());
} else {
cc.setActivityStatus(EnumCouponChannelActivityStatus.STARTED.getCode());
}
});
}

@RedisCache(expireTime = 60)


+ 16
- 28
mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java View File

@@ -664,38 +664,26 @@ public class WxCouponController extends BaseController {
}
private void updateActivityStatus(WxCouponCVo wxCouponCVo) {
if (wxCouponCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode()) ||
(wxCouponCVo.getTargetAd() != null && wxCouponCVo.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode()))
) {
Date now = new Date();
//
// logger.info("系统时间"+ now.getTime());
// logger.info("开始时间"+ wxCouponCVo.getBeginTime().getTime());
// logger.info("结束时间"+ wxCouponCVo.getEndTime().getTime());

if (wxCouponCVo.getBeginTime().getTime() > now.getTime()) {
wxCouponCVo.setActivityStatus(EnumCouponChannelActivityStatus.PREPARED.getCode());
} else if (wxCouponCVo.getEndTime().getTime() < now.getTime()) {
wxCouponCVo.setActivityStatus(EnumCouponChannelActivityStatus.ENDED.getCode());
} else {
wxCouponCVo.setActivityStatus(EnumCouponChannelActivityStatus.STARTED.getCode());
}

Date now = new Date();
if (wxCouponCVo.getBeginTime() != null && wxCouponCVo.getBeginTime().getTime() > now.getTime()) {
wxCouponCVo.setActivityStatus(EnumCouponChannelActivityStatus.PREPARED.getCode());
} else if (wxCouponCVo.getEndTime() != null && wxCouponCVo.getEndTime().getTime() < now.getTime()) {
wxCouponCVo.setActivityStatus(EnumCouponChannelActivityStatus.ENDED.getCode());
} else {
wxCouponCVo.setActivityStatus(EnumCouponChannelActivityStatus.STARTED.getCode());
}
}
private void updateActivityStatus(WxCoupon coupon,WxCouponChannel couponChannel) {
if (coupon.getType().equals(EnumCouponType.COUPON_PREORDER.getCode()) ||
(couponChannel.getTargetAd() != null && couponChannel.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode()))
) {
Date now = new Date();

if (couponChannel.getBeginTime().getTime() > now.getTime()) {
coupon.setActStatus(EnumCouponChannelActivityStatus.PREPARED.getCode());
} else if (couponChannel.getEndTime().getTime() < now.getTime()) {
coupon.setActStatus(EnumCouponChannelActivityStatus.ENDED.getCode());
} else {
coupon.setActStatus(EnumCouponChannelActivityStatus.STARTED.getCode());
}
Date now = new Date();

if (couponChannel.getBeginTime() != null && couponChannel.getBeginTime().getTime() > now.getTime()) {
coupon.setActStatus(EnumCouponChannelActivityStatus.PREPARED.getCode());
} else if (couponChannel.getEndTime() != null && couponChannel.getEndTime().getTime() < now.getTime()) {
coupon.setActStatus(EnumCouponChannelActivityStatus.ENDED.getCode());
} else {
coupon.setActStatus(EnumCouponChannelActivityStatus.STARTED.getCode());
}
}



+ 7
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -3949,14 +3949,13 @@ public class WxOrderServiceImpl implements WxOrderService {
}

private void couponChannelCheck(WxCouponChannel wxCouponChannel,String premsg) {
if (wxCouponChannel.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode())) {
Date now = new Date();
if (wxCouponChannel.getBeginTime().getTime() > now.getTime()) {
throw new MallinkException(ErrorCode.COUPON_CHANNEL_IS_NOT_STARTED.getCode(),premsg+"活动未开始");
}
if (wxCouponChannel.getEndTime().getTime() < now.getTime()) {
throw new MallinkException(ErrorCode.COUPON_CHANNEL_IS_END.getCode(),premsg+"活动已结束");
}

Date now = new Date();
if (wxCouponChannel.getBeginTime() != null && wxCouponChannel.getBeginTime().getTime() > now.getTime()) {
throw new MallinkException(ErrorCode.COUPON_CHANNEL_IS_NOT_STARTED.getCode(),premsg+"活动未开始");
}
if (wxCouponChannel.getEndTime() != null && wxCouponChannel.getEndTime().getTime() < now.getTime()) {
throw new MallinkException(ErrorCode.COUPON_CHANNEL_IS_END.getCode(),premsg+"活动已结束");
}

if (wxCouponChannel.getStatus() != EnumCouponChannelStatus.STATUS_THROW_IN.getCode()) {


Loading…
Cancel
Save