新客立减修改
This commit is contained in:
@@ -119,6 +119,17 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
|
||||
log.info("新客立减仅限新用户使用");
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
MkConsumeDiscountVO consumeDiscountVO = canUse(shopId, userId);
|
||||
|
||||
DateTime now = DateUtil.date();
|
||||
|
||||
if (!now.isAfterOrEquals(DateUtil.date(consumeDiscountVO.getStartTime())) || !now.isBeforeOrEquals(DateUtil.date(consumeDiscountVO.getEndTime()))) {
|
||||
log.info("此时间段未开启新客立减");
|
||||
return null;
|
||||
}
|
||||
MkShopConsumeDiscountRecord discountRecord = getOne(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId)
|
||||
.eq(MkShopConsumeDiscountRecord::getOrderId, orderId)
|
||||
.eq(MkShopConsumeDiscountRecord::getIsUse, 0)
|
||||
@@ -131,15 +142,6 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
|
||||
return discountRecord;
|
||||
}
|
||||
|
||||
try {
|
||||
MkConsumeDiscountVO consumeDiscountVO = canUse(shopId, userId);
|
||||
|
||||
DateTime now = DateUtil.date();
|
||||
|
||||
if (!now.isAfterOrEquals(DateUtil.date(consumeDiscountVO.getStartTime())) || !now.isBeforeOrEquals(DateUtil.date(consumeDiscountVO.getEndTime()))) {
|
||||
log.info("此时间段未开启新客立减");
|
||||
return null;
|
||||
}
|
||||
MkShopConsumeDiscountRecord shopConsumeDiscountRecord = new MkShopConsumeDiscountRecord();
|
||||
shopConsumeDiscountRecord.setShopId(shopId);
|
||||
shopConsumeDiscountRecord.setShopUserId(shopUser.getId());
|
||||
|
||||
Reference in New Issue
Block a user