diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendRecordsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendRecordsServiceImpl.java index 37dbbd862..1464da02e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendRecordsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendRecordsServiceImpl.java @@ -325,7 +325,8 @@ public class ActiveRecommendRecordsServiceImpl extends ServiceImpl() - .eq(ActiveUserRechargeRecords::getUserId, activeRecommendRecords.getUserId())); + .eq(ActiveUserRechargeRecords::getUserId, activeRecommendRecords.getUserId()) + .eq(ActiveUserRechargeRecords::getStoreId, storeId)); if (count >= activeUserRecharge.getFrequencyLimit()) { return; } @@ -359,6 +360,7 @@ public class ActiveRecommendRecordsServiceImpl extends ServiceImpl() - .eq(CardFavorableRecord::getMtUserId, nowAccountInfo.getId()) - .eq(CardFavorableRecord::getStatus, 0) - .eq(CardFavorableRecord::getStoreId, balance.getStoreId())); + //新表 + Integer count = cardCouponUserMapper.selectCount(new LambdaQueryWrapper() + .eq(CardCouponUser::getMtUserId, nowAccountInfo.getId()) + .eq(CardCouponUser::getStoreId, balance.getStoreId()) + .eq(CardCouponUser::getStatus, "0")); +// Integer count = cardFavorableRecordMapper.selectCount(new LambdaQueryWrapper() +// .eq(CardFavorableRecord::getMtUserId, nowAccountInfo.getId()) +// .eq(CardFavorableRecord::getStatus, "0") +// .eq(CardFavorableRecord::getStoreId, balance.getStoreId())); userBlanceUniVo.setCardFavorableCount(count); //查询礼品卡已兑换数量和金额 List cardGifts = cardGiftMapper.selectList(new LambdaQueryWrapper()