|
|
@@ -787,8 +787,13 @@ public class LifeDiscountCouponServiceImpl extends ServiceImpl<LifeDiscountCoupo
|
|
|
lifeDiscountCouponVo.setStatus(Integer.parseInt(DiscountCouponEnum.UNDER_WAY.getValue()));
|
|
|
}
|
|
|
} else {
|
|
|
- // 开始结束时间为空,数据异常跳过
|
|
|
- continue;
|
|
|
+ if(lifeDiscountCoupon.getCouponStatus() == 0){
|
|
|
+ //如果为草稿则状态为未开始
|
|
|
+ lifeDiscountCouponVo.setStatus(Integer.parseInt(DiscountCouponEnum.HAVE_NOT_STARTED.getValue()));
|
|
|
+ } else {
|
|
|
+ // 开始结束时间为空,数据异常跳过
|
|
|
+ continue;
|
|
|
+ }
|
|
|
}
|
|
|
// 查询三个规则
|
|
|
List<LifeDiscountCouponUnavailableRules> discountCouponId = lifeDiscountCouponUnavailableRulesMapper.selectList(new QueryWrapper<LifeDiscountCouponUnavailableRules>().eq("discount_coupon_id", lifeDiscountCoupon.getId()));
|
|
|
@@ -862,8 +867,13 @@ public class LifeDiscountCouponServiceImpl extends ServiceImpl<LifeDiscountCoupo
|
|
|
record.setStatus(Integer.parseInt(DiscountCouponEnum.UNDER_WAY.getValue()));
|
|
|
}
|
|
|
} else {
|
|
|
- // 开始结束时间为空,数据异常跳过
|
|
|
- continue;
|
|
|
+ if(record.getCouponStatus() == 0){
|
|
|
+ //如果为草稿则状态为未开始
|
|
|
+ record.setStatus(Integer.parseInt(DiscountCouponEnum.HAVE_NOT_STARTED.getValue()));
|
|
|
+ } else {
|
|
|
+ // 开始结束时间为空,数据异常跳过
|
|
|
+ continue;
|
|
|
+ }
|
|
|
}
|
|
|
List<LifeDiscountCouponUnavailableRules> discountCouponId = lifeDiscountCouponUnavailableRulesMapper.selectList(new QueryWrapper<LifeDiscountCouponUnavailableRules>().eq("discount_coupon_id", record.getCouponId()));
|
|
|
Map<String, List<LifeDiscountCouponUnavailableRules>> collect = discountCouponId.stream().collect(Collectors.groupingBy(x -> x.getUnavailableRuleType()));
|