From 2bc5c8cff31ec35dfc7c5441c0d705582e0c7f7b Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sat, 20 Dec 2025 17:38:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E5=B0=9D=E8=AF=954?= =?UTF-8?q?=20=E7=94=9F=E6=97=A5=E6=9C=89=E7=A4=BC=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 4 ++++ .../admin/BirthdayGiftController.java | 13 ++++++++++++ .../com/czg/controller/NotifyController.java | 12 ++++++++--- .../market/service/MkBirthdayGiftService.java | 3 +++ .../czg/market/vo/MkBirthdayGiftRecordVO.java | 8 +++---- .../impl/MkBirthdayGiftServiceImpl.java | 21 +++++++++++++++++++ 6 files changed, 54 insertions(+), 7 deletions(-) diff --git a/cash-api/account-server/src/main/resources/application-dev.yml b/cash-api/account-server/src/main/resources/application-dev.yml index a07b7f122..f5f288b6b 100644 --- a/cash-api/account-server/src/main/resources/application-dev.yml +++ b/cash-api/account-server/src/main/resources/application-dev.yml @@ -37,6 +37,10 @@ dubbo: name: dubbo serialization: hessian2 port: 10101 + serialization: + allow-list: + - com.czg.utils.CzgUpdateChain + seata: diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/BirthdayGiftController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/BirthdayGiftController.java index 2acd5a2d3..f05d67fe5 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/BirthdayGiftController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/BirthdayGiftController.java @@ -1,8 +1,11 @@ package com.czg.controller.admin; +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.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; @@ -23,6 +26,16 @@ import java.time.LocalDateTime; public class BirthdayGiftController { @Resource private MkBirthdayGiftService service; + /** + * 记录获取 + * @return 是否成功 + */ + @SaAdminCheckPermission(parentName = "生日有礼",value = "birthdayGift:summary", name = "生日有礼概述") + @GetMapping("/summary") + public CzgResult summary(@RequestParam(required = false) String dateTime, @RequestParam(required = false) String key) { + return CzgResult.success(service.summary(StpKit.USER.getMainShopId(), key, StrUtil.isNotBlank(dateTime) ? DateUtil.parseLocalDateTime(dateTime) : null)); +// return null; + } /** * 配置信息获取 diff --git a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java index 237e7ae38..c2a624ee9 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java @@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.IoUtil; import com.alibaba.fastjson2.JSONObject; import com.czg.CzgPayUtils; +import com.czg.account.entity.ShopUser; +import com.czg.account.service.ShopUserService; import com.czg.entity.CzgBaseRespParams; import com.czg.market.entity.MkShopConsumeDiscountRecord; import com.czg.market.service.MkDistributionUserService; @@ -38,6 +40,9 @@ import java.io.IOException; public class NotifyController { private static final String SUCCESS = "SUCCESS"; + @Resource + private ShopUserService shopUserService; + @Resource private OrderInfoCustomService orderInfoCustomService; @Resource @@ -52,9 +57,10 @@ public class NotifyController { private MkShopConsumeDiscountRecordService consumeDiscountRecordService; @RequestMapping("clear") - public String clear(@RequestParam Integer shopId) { - consumeDiscountRecordService.remove(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId)); - orderInfoService.remove(new QueryWrapper().eq(OrderInfo::getShopId, shopId)); + public String clear() { + shopUserService.updateChain().eq(ShopUser::getId, 127437).set(ShopUser::getAmount, 999); +// consumeDiscountRecordService.remove(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId)); +// orderInfoService.remove(new QueryWrapper().eq(OrderInfo::getShopId, shopId)); return "success"; } 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 a4f58ec6c..dac0f68a3 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 @@ -2,6 +2,7 @@ package com.czg.market.service; import com.czg.market.dto.MkBirthdayGiftDTO; import com.czg.market.entity.MkBirthdayGift; +import com.czg.market.vo.MkBirthdayGiftRecordSummaryVO; import com.czg.market.vo.MkBirthdayGiftRecordVO; import com.czg.market.vo.MkBirthdayGiftVO; import com.mybatisflex.core.paginate.Page; @@ -24,6 +25,8 @@ public interface MkBirthdayGiftService extends IService { Boolean edit(Long shopId, MkBirthdayGiftDTO giftDTO); Page getRecord(Long shopId, String key, LocalDateTime dateTime); + MkBirthdayGiftRecordSummaryVO summary(Long shopId, String key, LocalDateTime dateTime); + void deliver(); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkBirthdayGiftRecordVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkBirthdayGiftRecordVO.java index 94915134d..f1aa320ca 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkBirthdayGiftRecordVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkBirthdayGiftRecordVO.java @@ -40,10 +40,10 @@ public class MkBirthdayGiftRecordVO implements Serializable { */ private List couponList; -// /** -// * 已经使用的优惠券 -// */ -// private List usedCouponList; + /** + * 已经使用的优惠券 + */ + private List usedCouponList; /** * 创建时间 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 db8005b00..3f41be446 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 @@ -19,6 +19,7 @@ import com.czg.market.dto.MkRewardCouponDTO; import com.czg.market.dto.ShopCouponDTO; import com.czg.market.entity.*; import com.czg.market.service.*; +import com.czg.market.vo.MkBirthdayGiftRecordSummaryVO; import com.czg.market.vo.MkBirthdayGiftRecordVO; import com.czg.market.vo.MkBirthdayGiftVO; import com.czg.service.market.mapper.MkBirthdayGiftMapper; @@ -90,6 +91,26 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl { + and.or(or -> { + or.like(ShopUser::getNickName, key); + }).or(or -> { + or.like(ShopUser::getPhone, key); + }); + }); + } + + return birthdayGiftRecordCouponService.getOneAsOpt(queryWrapper, MkBirthdayGiftRecordSummaryVO.class).orElseGet(MkBirthdayGiftRecordSummaryVO::new); + } + @Override @CacheEvict(key = "#shopId") public Boolean edit(Long shopId, MkBirthdayGiftDTO giftDTO) {