Commit 7c596eca by 吕明尚

可用优惠卷适用星期只限制订单的开始时间

parent e68edc51
...@@ -209,10 +209,13 @@ public class SConsumerCouponServiceImpl extends ServiceImpl<SConsumerCouponMappe ...@@ -209,10 +209,13 @@ public class SConsumerCouponServiceImpl extends ServiceImpl<SConsumerCouponMappe
private Boolean chekcWeeks(SConsumerCoupon item, CouponRequest couponRequest) { private Boolean chekcWeeks(SConsumerCoupon item, CouponRequest couponRequest) {
if(StringUtils.isNotBlank(item.getWeeks())) { if(StringUtils.isNotBlank(item.getWeeks())) {
Integer startWeek = DateUtil.dayOfWeek(DateUtils.addDays(couponRequest.getPreStartDate(), -1)); Integer startWeek = DateUtil.dayOfWeek(DateUtils.addDays(couponRequest.getPreStartDate(), -1));
Integer endWeek = DateUtil.dayOfWeek(DateUtils.addDays(couponRequest.getPreEndDate(), -1)); //查询可用优惠卷判断星期只判断订单预约开始时间
// Integer endWeek = DateUtil.dayOfWeek(DateUtils.addDays(couponRequest.getPreEndDate(), -1));
ArrayList<Integer> weeks = (ArrayList<Integer>) Arrays.stream(item.getWeeks().split(",")) ArrayList<Integer> weeks = (ArrayList<Integer>) Arrays.stream(item.getWeeks().split(","))
.map(Integer::parseInt).collect(Collectors.toList()); .map(Integer::parseInt).collect(Collectors.toList());
if(!weeks.contains(startWeek)||!weeks.contains(endWeek)){ if (!weeks.contains(startWeek)
// ||!weeks.contains(endWeek)
) {
item.setIsAvailable(AvailableEnum.UNAVAILABLE.getCode()); item.setIsAvailable(AvailableEnum.UNAVAILABLE.getCode());
if(checkIfArrayIsContinuous(weeks.stream().mapToInt(i->i.intValue()).toArray())){ if(checkIfArrayIsContinuous(weeks.stream().mapToInt(i->i.intValue()).toArray())){
if(weeks.size()==1) { if(weeks.size()==1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment