Ver código fonte

[系统][修复]:发券比较条件问题

release_toaliyun_real
hupeng 7 anos atrás
pai
commit
6e2ed83a81
2 arquivos alterados com 8 adições e 8 exclusões
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java
  2. +6
    -6
      mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java Ver arquivo

@@ -55,11 +55,11 @@ public class WxCouponSendController extends BaseController {
return new ResultData(ErrorCode.COUPON_SEND_IS_EXISTED);
}
WxCoupon wxCoupon = wxCouponService.getById(wxCouponSend.getCouponId());
if (wxCoupon.getStatus() != EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()){
if (!wxCoupon.getStatus().equals(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()) ){
return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF);
}

if (wxCoupon.getSendType() != EnumCouponSendType.PASSIVE.getCode()) {
if (!wxCoupon.getSendType().equals(EnumCouponSendType.PASSIVE.getCode())) {
return new ResultData(ErrorCode.COUPON_TYPE_IS_NOT_PASSIVE);
}



+ 6
- 6
mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java Ver arquivo

@@ -67,15 +67,15 @@ public class CouponInjectServiceImpl implements CouponInjectService {
public ResultData add(CouponInject record) {

WxCoupon wxCoupon = wxCouponService.getById(record.getCouponId());
if (wxCoupon.getValidType() == EnumCouponValidType.BETWEEN_TWO_TIME.getCode()) { //时间范围
if (wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode()) ) { //时间范围
if (new Date().after(wxCoupon.getValidEndDate())) {
return new ResultData(ErrorCode.COUPON_IS_EXPIRED);
}
}
if(wxCoupon.getStatus() != EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()){
if(!wxCoupon.getStatus().equals(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode())){
return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF);
}
if(wxCoupon.getSendType()!= EnumCouponSendType.PASSIVE.getCode()) {
if(!wxCoupon.getSendType().equals(EnumCouponSendType.PASSIVE.getCode())) {
return new ResultData(ErrorCode.COUPON_TYPE_IS_NOT_PASSIVE);
}

@@ -100,7 +100,7 @@ public class CouponInjectServiceImpl implements CouponInjectService {
//生成雪花id
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
if(record.getSendType() == EnumCouponInjectSendType.IMMEDIATE.getCode()){
if(record.getSendType().equals(EnumCouponInjectSendType.IMMEDIATE.getCode())){
record.setStatus(EnumCouponInjectStatus.SENDING.getCode());
record.setSendTime(new Date());
}else{
@@ -110,7 +110,7 @@ public class CouponInjectServiceImpl implements CouponInjectService {
record.setCouponName(wxCoupon.getTitle());
record.setSendAmount(cUsers.size());
couponInjectMapper.insertSelective(record);
if(record.getSendType()==0) {
if(record.getSendType().equals(0)) {
sendNow(wxCoupon,cUsers,record.getId());
}
return new ResultData();
@@ -137,7 +137,7 @@ public class CouponInjectServiceImpl implements CouponInjectService {
wxCouponOrder.setCUserId(tempCUser.getId());
wxCouponOrder.setCouponPrice(0);
wxCouponOrder.setCreateDate(new Date());
if (wxCoupon.getValidType() == EnumCouponValidType.BETWEEN_TWO_TIME.getCode()) { //时间范围区间
if (wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())) { //时间范围区间
wxCouponOrder.setExpiredTime(wxCoupon.getValidEndDate());
} else {
Date date = DateUtils.addDays(new Date(), wxCoupon.getValidDays());


Carregando…
Cancelar
Salvar