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

空指针问题

Browse Source
This commit is contained in:
wangw
2025-12-24 14:42:03 +08:00
parent b359b08713
commit 441ede37cf
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,13 +106,14 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
.eq(MkShopConsumeDiscountRecord::getIsUse, 1) .eq(MkShopConsumeDiscountRecord::getIsUse, 1)
.eq(MkShopConsumeDiscountRecord::getShopUserId, shopUser.getId())); .eq(MkShopConsumeDiscountRecord::getShopUserId, shopUser.getId()));
boolean exists = orderInfoService.exists(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId()) boolean exists = orderInfoService.exists(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId())
.eq(OrderInfo::getShopId, shopUser.getSourceShopId()).eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())); .eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()));
return !exists && discountRecord == null; return !exists && discountRecord == null;
} }
@Override @Override
public MkShopConsumeDiscountRecord getDiscount(Long shopId, Long userId, Long orderId) { public MkShopConsumeDiscountRecord getDiscount(Long shopId, Long userId, Long orderId) {
ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getUserId, userId).eq(ShopUser::getSourceShopId, shopId)); ShopUser shopUser = shopUserService.getUserInfo(shopId, userId);
AssertUtil.isTrue(shopUser == null, "用户不存在");
boolean newUser = isNewUser(shopUser, shopId); boolean newUser = isNewUser(shopUser, shopId);
if (!newUser) { if (!newUser) {
// throw new CzgException("新客立减仅新用户可用"); // throw new CzgException("新客立减仅新用户可用");