czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

引流配置修改

Browse Source
This commit is contained in:
张松
2025-10-15 11:32:00 +08:00
parent b2c287d368
commit 47cea3310c
6 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java
View File

@@ -152,9 +152,13 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
JSONArray.parseArray(birthdayGift.getConfigList()).toJavaList(MkBirthdayGiftConfig.class).forEach(config -> {
LocalDate current = DateUtil.date().toLocalDateTime().toLocalDate();
if ("day".equals(config.getDeliverDate())) {
current = current.plusDays(config.getDeliverTime());
if (config.getDeliverTime() != 1) {
current = current.plusDays(config.getDeliverTime());
}
}else {
current = current.plusDays(config.getDeliverTime() * 30);
DateTime now = DateUtil.date();
// 获取当月第一天
current = DateUtil.beginOfMonth(now).toLocalDateTime().toLocalDate();
}
QueryWrapper queryWrapper = new QueryWrapper().isNotNull(ShopUser::getBirthDay)

4
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDrainageConfigServiceImpl.java
View File

@@ -5,9 +5,7 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSONArray;
import com.czg.account.entity.ShopInfo;
import com.czg.account.service.ShopInfoService;
import com.czg.market.dto.MkConsumeCashbackDTO;
import com.czg.market.dto.MkDrainageConfigDTO;
import com.czg.market.entity.MkConsumeCashback;
import com.czg.market.vo.MkDrainageConfigVO;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
@@ -36,7 +34,7 @@ public class MkDrainageConfigServiceImpl extends ServiceImpl<MkDrainageConfigMap
config.setMainShopId(mainShopId);
config.setShopId(shopId);
save(config);
config = getOne(new QueryWrapper().eq(MkConsumeCashback::getMainShopId, shopId));
config = getOne(new QueryWrapper().eq(MkDrainageConfig::getShopId, shopId));
}
MkDrainageConfigVO info = BeanUtil.copyProperties(config, MkDrainageConfigVO.class, "useType");
if (StrUtil.isNotBlank(config.getUseType())) {