From b4f52dd555a655b7c88d34f8111af19cd5d20c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 16 Oct 2025 16:23:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=97=A5=E6=9C=89=E7=A4=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/UBirthdayGiftController.java | 14 +++----------- .../market/service/MkBirthdayGiftService.java | 4 +++- .../impl/MkBirthdayGiftServiceImpl.java | 18 +++++++++++------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UBirthdayGiftController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UBirthdayGiftController.java index 60ec6ae67..3dd460d62 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UBirthdayGiftController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UBirthdayGiftController.java @@ -1,21 +1,13 @@ package com.czg.controller.user; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import com.czg.annotation.SaAdminCheckPermission; -import com.czg.market.dto.MkBirthdayGiftDTO; +import com.czg.market.entity.ShopCoupon; import com.czg.market.service.MkBirthdayGiftService; -import com.czg.market.vo.MkBirthdayGiftRecordSummaryVO; -import com.czg.market.vo.MkBirthdayGiftRecordVO; -import com.czg.market.vo.MkBirthdayGiftVO; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; -import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.time.LocalDateTime; +import java.util.List; /** * 生日有礼相关 @@ -32,7 +24,7 @@ public class UBirthdayGiftController { * 获取生日有礼 不为空则代表今日发放生日有礼的奖励 */ @GetMapping - public CzgResult detail(@RequestParam Integer shopId) { + public CzgResult> detail(@RequestParam Integer shopId) { return CzgResult.success(service.getInfo(StpKit.USER.getLoginIdAsLong(), shopId)); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkBirthdayGiftService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkBirthdayGiftService.java index bea02614d..0f16f1c66 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkBirthdayGiftService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkBirthdayGiftService.java @@ -1,6 +1,7 @@ package com.czg.market.service; import com.czg.market.dto.MkBirthdayGiftDTO; +import com.czg.market.entity.ShopCoupon; import com.czg.market.vo.MkBirthdayGiftRecordSummaryVO; import com.czg.market.vo.MkBirthdayGiftRecordVO; import com.czg.market.vo.MkBirthdayGiftVO; @@ -9,6 +10,7 @@ import com.mybatisflex.core.service.IService; import com.czg.market.entity.MkBirthdayGift; import java.time.LocalDateTime; +import java.util.List; /** * 生日有礼 服务层。 @@ -28,5 +30,5 @@ public interface MkBirthdayGiftService extends IService { void deliver(); - MkBirthdayGiftVO getInfo(long userId, Integer shopId); + List getInfo(long userId, Integer shopId); } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java index 80fcf2132..26f3595b8 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java @@ -1,7 +1,6 @@ package com.czg.service.market.service.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; @@ -36,6 +35,7 @@ import org.springframework.stereotype.Service; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -173,7 +173,12 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl { + for (ShopUser shopUser : shopUserService.list(queryWrapper)) { + long count = birthdayGiftRecordService.count(new QueryWrapper().eq(MkBirthdayGiftRecord::getUserId, shopUser.getUserId()).eq(MkBirthdayGiftRecord::getBirthday, current)); + if (count > 1) { + log.info("用户{}已领取过生日礼包", shopUser.getUserId()); + continue; + } // 发放记录 MkBirthdayGiftRecord giftRecord = new MkBirthdayGiftRecord().setUserId(shopUser.getUserId()).setShopUserId(shopUser.getId()) .setPushStatus(birthdayGift.getSendSms() == 1 ? @@ -211,7 +216,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl getInfo(long userId, Integer shopId) { MkBirthdayGift birthdayGift = getOne(new QueryWrapper().eq(MkBirthdayGift::getMainShopId, shopId).eq(MkBirthdayGift::getIsEnable, 1)); if (birthdayGift == null) { return null; @@ -248,9 +253,8 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl couponInfoList = config.getCouponInfoList(); + return shopCouponService.list(new QueryWrapper().in(ShopCoupon::getId, couponInfoList.stream().map(CouponInfoDTO::getId).toList())); } }