Merge remote-tracking branch 'origin/test' into test

2025-10-24 15:41:01 +08:00
parent 56dfdcd523 ee219f637c
commit 69c0de7651
12 changed files with 131 additions and 4 deletions
--- 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
@@ -32,6 +32,9 @@ import com.czg.service.market.mapper.MkBirthdayGiftMapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;

 import java.time.LocalDate;
@@ -52,6 +55,7 @@ import java.util.stream.Collectors;
 */
@Slf4j
@Service
+@CacheConfig(cacheNames = "birthdayGift")
 public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper, MkBirthdayGift> implements MkBirthdayGiftService {
    @Resource
    private MkBirthdayGiftRecordService birthdayGiftRecordService;
@@ -72,6 +76,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
    private ShopUserService shopUserService;

    @Override
+    @Cacheable(key = "#shopId")
    public MkBirthdayGiftVO detail(Long shopId) {
        MkBirthdayGift gift = getOne(new QueryWrapper().eq(MkBirthdayGift::getMainShopId, shopId));
        if (gift == null) {
@@ -88,6 +93,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
    }

    @Override
+    @CacheEvict(key = "#shopId")
    public Boolean edit(Long shopId, MkBirthdayGiftDTO giftDTO) {
        MkBirthdayGift birthdayGift = getOne(new QueryWrapper().eq(MkBirthdayGift::getMainShopId, shopId));
        BeanUtil.copyProperties(giftDTO, birthdayGift);
--- 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
@@ -5,8 +5,10 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONArray;
 import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
+import com.czg.account.entity.ShopConfig;
 import com.czg.account.entity.ShopInfo;
 import com.czg.account.entity.ShopUser;
+import com.czg.account.service.ShopConfigService;
 import com.czg.account.service.ShopInfoService;
 import com.czg.account.service.ShopUserService;
 import com.czg.constant.TableValueConstant;
@@ -29,6 +31,9 @@ import com.czg.service.market.mapper.MkConsumeCashbackMapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

@@ -46,6 +51,7 @@ import java.util.stream.Collectors;
 */
@Slf4j
@Service
+@CacheConfig(cacheNames = "consumeCashback")
 public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackMapper, MkConsumeCashback> implements MkConsumeCashbackService {
    @DubboReference
    private ShopInfoService shopInfoService;
@@ -53,10 +59,13 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
    private ShopUserService shopUserService;
    @DubboReference
    private OrderInfoService orderInfoService;
+    @DubboReference
+    private ShopConfigService shopConfigService;
    @Resource
    private MkConsumeCashbackRecordService consumeCashbackRecordService;

    @Override
+    @Cacheable(key = "#shopId")
    public MkConsumeCashbackVO detail(Long shopId) {
        MkConsumeCashback consumeCashback = getOne(new QueryWrapper().eq(MkConsumeCashback::getMainShopId, shopId));
        if (consumeCashback == null) {
@@ -78,6 +87,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
    }

    @Override
+    @CacheEvict(key = "#shopId")
    public Boolean edit(Long shopId, MkConsumeCashbackDTO consumeDiscountDTO) {
        MkConsumeCashback consumeCashback = getOne(new QueryWrapper().eq(MkConsumeCashback::getMainShopId, shopId));
        BeanUtil.copyProperties(consumeDiscountDTO, consumeCashback);
@@ -91,6 +101,9 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
            }
        }

+        shopConfigService.editStatusByShopIdList(shopId, consumeDiscountDTO.getIsEnable(), true, "is_account_ay",
+                consumeDiscountDTO.getUseType(), consumeDiscountDTO.getShopIdList());
+
        if (consumeDiscountDTO.getCashbackStepList() != null && !consumeDiscountDTO.getCashbackStepList().isEmpty()) {
            consumeCashback.setCashbackStepList(JSONArray.toJSONString(consumeDiscountDTO.getCashbackStepList()));
        }
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeDiscountServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeDiscountServiceImpl.java
@@ -13,6 +13,9 @@ import com.mybatisflex.spring.service.impl.ServiceImpl;
 import com.czg.market.entity.MkConsumeDiscount;
 import com.czg.market.service.MkConsumeDiscountService;
 import com.czg.service.market.mapper.MkConsumeDiscountMapper;
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;

 import java.math.BigDecimal;
@@ -24,8 +27,10 @@ import java.math.BigDecimal;
 * @since 2025-09-16
 */
@Service
+@CacheConfig(cacheNames = "consumeDiscount")
 public class MkConsumeDiscountServiceImpl extends ServiceImpl<MkConsumeDiscountMapper, MkConsumeDiscount> implements MkConsumeDiscountService {
    @Override
+    @Cacheable(key = "#shopId")
    public MkConsumeDiscountVO detail(Long shopId) {
        MkConsumeDiscount consumeDiscount = getOne(new QueryWrapper().eq(MkConsumeDiscount::getShopId, shopId));
        if (consumeDiscount == null) {
@@ -47,6 +52,7 @@ public class MkConsumeDiscountServiceImpl extends ServiceImpl<MkConsumeDiscountM
    }

    @Override
+    @CacheEvict(key = "#shopId")
    public Boolean edit(Long shopId, MkConsumeDiscountDTO consumeDiscountDTO) {
        if (consumeDiscountDTO.getRandomDiscountList() == null && consumeDiscountDTO.getDiscountAmount() == null) {
            throw new ApiNotPrintException("优惠金额和随机优惠金额不能同时为空");
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkEnableConfigServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkEnableConfigServiceImpl.java
@@ -13,6 +13,9 @@ import com.mybatisflex.spring.service.impl.ServiceImpl;
 import com.czg.market.entity.MkEnableConfig;
 import com.czg.market.service.MkEnableConfigService;
 import com.czg.service.market.mapper.MkEnableConfigMapper;
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;

 /**
@@ -22,9 +25,11 @@ import org.springframework.stereotype.Service;
 * @since 2025-10-21
 */
@Service
+@CacheConfig(cacheNames = "enableConfig")
 public class MkEnableConfigServiceImpl extends ServiceImpl<MkEnableConfigMapper, MkEnableConfig> implements MkEnableConfigService{

    @Override
+    @Cacheable(key = "#mainShopId + ':' + #shopId")
    public MkEnableConfigVO detail(Long mainShopId, Long shopId, TableValueConstant.EnableConfig.Type type) {
        MkEnableConfig one = getOne(new QueryWrapper().eq(MkEnableConfig::getMainShopId, mainShopId).eq(MkEnableConfig::getType, type.getCode()));
        if (one == null) {
@@ -43,6 +48,7 @@ public class MkEnableConfigServiceImpl extends ServiceImpl<MkEnableConfigMapper,
    }

    @Override
+    @CacheEvict(key = "#mainShopId + ':' + #shopId")
    public Boolean upEnable(Long mainShopId, Long shopId, MkEnableConfigDTO dto, TableValueConstant.EnableConfig.Type type) {
        MkEnableConfig one = getOne(new QueryWrapper().eq(MkEnableConfig::getMainShopId, mainShopId).eq(MkEnableConfig::getType, type.getCode()));
        if (one == null) {
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
@@ -4,9 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONArray;
 import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
+import com.czg.account.entity.ShopConfig;
 import com.czg.account.entity.ShopInfo;
 import com.czg.account.entity.ShopUser;
 import com.czg.account.service.MemberPointsService;
+import com.czg.account.service.ShopConfigService;
 import com.czg.account.service.ShopInfoService;
 import com.czg.account.service.ShopUserService;
 import com.czg.enums.ShopUserFlowBizEnum;
@@ -32,6 +34,7 @@ import com.czg.service.market.mapper.MkShopRechargeMapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;

 import java.math.BigDecimal;
@@ -60,6 +63,8 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
    private MkShopCouponRecordService shopCouponRecordService;
    @DubboReference
    private ShopInfoService shopInfoService;
+    @DubboReference
+    private ShopConfigService shopConfigService;

    @Override
    public MkShopRechargeVO detailApp(Long shopId) {
@@ -134,6 +139,10 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
                shopRechargeDetailService.save(mkShopRechargeDetail);
            });
        }
+        shopConfigService.editStatusByShopIdList(shopId, shopRechargeDTO.getIsEnable(), false, "is_account_ay",
+                shopRechargeDTO.getUseType(), shopRechargeDTO.getShopIdList());
+
+
        return updateById(shopRecharge);
    }