czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新客立减修改

Browse Source
This commit is contained in:
张松
2025-12-01 17:50:35 +08:00
parent c2960553b7
commit 5956051522
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java
View File

@@ -119,17 +119,7 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
log.info("新客立减仅限新用户使用"); log.info("新客立减仅限新用户使用");
return null; return null;
} }
MkShopConsumeDiscountRecord discountRecord = getOne(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId)
.eq(MkShopConsumeDiscountRecord::getOrderId, orderId)
.eq(MkShopConsumeDiscountRecord::getIsUse, 0)
.eq(MkShopConsumeDiscountRecord::getShopUserId, shopUser.getId()));
if (discountRecord != null) {
if (discountRecord.getOrderId() == null && orderId != null) {
discountRecord.setOrderId(orderId);
updateById(discountRecord);
}
return discountRecord;
}
try { try {
MkConsumeDiscountVO consumeDiscountVO = canUse(shopId, userId); MkConsumeDiscountVO consumeDiscountVO = canUse(shopId, userId);
@@ -140,6 +130,18 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
log.info("此时间段未开启新客立减"); log.info("此时间段未开启新客立减");
return null; return null;
} }
MkShopConsumeDiscountRecord discountRecord = getOne(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId)
.eq(MkShopConsumeDiscountRecord::getOrderId, orderId)
.eq(MkShopConsumeDiscountRecord::getIsUse, 0)
.eq(MkShopConsumeDiscountRecord::getShopUserId, shopUser.getId()));
if (discountRecord != null) {
if (discountRecord.getOrderId() == null && orderId != null) {
discountRecord.setOrderId(orderId);
updateById(discountRecord);
}
return discountRecord;
}
MkShopConsumeDiscountRecord shopConsumeDiscountRecord = new MkShopConsumeDiscountRecord(); MkShopConsumeDiscountRecord shopConsumeDiscountRecord = new MkShopConsumeDiscountRecord();
shopConsumeDiscountRecord.setShopId(shopId); shopConsumeDiscountRecord.setShopId(shopId);
shopConsumeDiscountRecord.setShopUserId(shopUser.getId()); shopConsumeDiscountRecord.setShopUserId(shopUser.getId());