|
@@ -162,9 +162,12 @@ public class CouponFontServiceImpl implements CouponFontService {
|
|
|
data.setValidStartTime(data.getCreatedTime());
|
|
data.setValidStartTime(data.getCreatedTime());
|
|
|
data.setValidEndTime(DateUtil.offsetDay(data.getValidStartTime(), data.getValidDays()));
|
|
data.setValidEndTime(DateUtil.offsetDay(data.getValidStartTime(), data.getValidDays()));
|
|
|
}
|
|
}
|
|
|
- this.setCouponUserStatus(data, now);
|
|
|
|
|
String str = couponSkuMapper.selectGoodsSkuStr(data.getCouponId());
|
|
String str = couponSkuMapper.selectGoodsSkuStr(data.getCouponId());
|
|
|
data.setGoodsSkuStr(str.replaceAll(",", "/").replaceAll(";", ""));
|
|
data.setGoodsSkuStr(str.replaceAll(",", "/").replaceAll(";", ""));
|
|
|
|
|
+ if (!data.getIsAvailable()) {
|
|
|
|
|
+ data.setReason(String.format("仅限%s", data.getGoodsSkuStr()));
|
|
|
|
|
+ }
|
|
|
|
|
+ this.setCouponUserStatus(data, now);
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
return availableCouponList;
|
|
return availableCouponList;
|
|
@@ -180,18 +183,17 @@ public class CouponFontServiceImpl implements CouponFontService {
|
|
|
if (data.getExpiryStatus() != null && !data.getExpiryStatus()) {
|
|
if (data.getExpiryStatus() != null && !data.getExpiryStatus()) {
|
|
|
data.setCouponUserStatus(CouponUser.Status.invalid);
|
|
data.setCouponUserStatus(CouponUser.Status.invalid);
|
|
|
data.setIsAvailable(false);
|
|
data.setIsAvailable(false);
|
|
|
- isFlag = true;
|
|
|
|
|
- }else if (data.getExpiryStatus() != null && !data.getStatus()) {
|
|
|
|
|
- data.setCouponUserStatus(CouponUser.Status.stop);
|
|
|
|
|
- data.setIsAvailable(false);
|
|
|
|
|
|
|
+ data.setReason("该优惠卷已失效");
|
|
|
isFlag = true;
|
|
isFlag = true;
|
|
|
} else if (now.isAfter(data.getValidEndTime())) {
|
|
} else if (now.isAfter(data.getValidEndTime())) {
|
|
|
data.setCouponUserStatus(CouponUser.Status.expired);
|
|
data.setCouponUserStatus(CouponUser.Status.expired);
|
|
|
data.setIsAvailable(false);
|
|
data.setIsAvailable(false);
|
|
|
|
|
+ data.setReason("该优惠卷已过期");
|
|
|
isFlag = true;
|
|
isFlag = true;
|
|
|
} else if (now.isBefore(data.getValidStartTime())) {
|
|
} else if (now.isBefore(data.getValidStartTime())) {
|
|
|
data.setCouponUserStatus(CouponUser.Status.notEffective);
|
|
data.setCouponUserStatus(CouponUser.Status.notEffective);
|
|
|
data.setIsAvailable(false);
|
|
data.setIsAvailable(false);
|
|
|
|
|
+ data.setReason("该优惠卷未生效");
|
|
|
isFlag = true;
|
|
isFlag = true;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|