diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java index 61111c54f..7a03bd90f 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java @@ -125,10 +125,8 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl 0, "新客立减仅限新用户使用"); + boolean exists = orderInfoService.exists(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId()) + .eq(OrderInfo::getShopId, shopUser.getSourceShopId()).eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())); + AssertUtil.isTrue(exists, "新客立减仅限新用户使用"); - long recordCount = count(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId).eq(MkShopConsumeDiscountRecord::getShopUserId, shopUser.getId()) + boolean exists1 = exists(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId).eq(MkShopConsumeDiscountRecord::getShopUserId, shopUser.getId()) .eq(MkShopConsumeDiscountRecord::getIsUse, 1)); - AssertUtil.isTrue(recordCount > 0, "新客立减已使用"); + AssertUtil.isTrue(exists1, "新客立减已使用"); return consumeDiscountVO; } @@ -115,9 +115,9 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl 0) { + boolean exists = orderInfoService.exists(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId()) + .eq(OrderInfo::getShopId, shopUser.getSourceShopId()).eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())); + if (exists) { // throw new ApiNotPrintException("新客立减仅新用户可用"); log.info("新客立减仅限新用户使用"); return null; diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java index 4389a6bf0..361f07db1 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java @@ -112,13 +112,13 @@ public class ShopCouponServiceImpl extends ServiceImpl 0) { + boolean exists = orderInfoService.exists(new QueryWrapper().eq(OrderInfo::getUserId, userId) + .eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())); + if (exists) { continue; } - long count1 = recordService.count(new QueryWrapper().eq(MkShopCouponRecord::getCouponSyncId, coupon.getSyncId())); - if (count1 > 0) { + boolean exists1 = recordService.exists(new QueryWrapper().eq(MkShopCouponRecord::getCouponSyncId, coupon.getSyncId())); + if (exists1) { continue; } } else if ("vip".equals(coupon.getGetUserType()) && shopUser.getIsVip() != 1) {