From e14a6debcb17348164f703fcb2a7b9b1c3608352 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 二月 2024 10:19:32 +0800
Subject: [PATCH] 提交版本
---
meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallCommissionSettlementMonthServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallCommissionSettlementMonthServiceImpl.java b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallCommissionSettlementMonthServiceImpl.java
index cd98546..2115498 100644
--- a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallCommissionSettlementMonthServiceImpl.java
+++ b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallCommissionSettlementMonthServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.rest.modular.mall.dao.MallCommissionSettlementMonthMapper;
@@ -44,7 +45,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void commissionSettlemenMonth() {
+ public void commissionSettlementMonth() {
// 上月时间
DateTime lastMonth = DateUtil.offsetMonth(DateUtil.date(), -1);
String beginLastMonth = DateUtil.beginOfMonth(lastMonth).toString();
@@ -65,10 +66,10 @@
for (MallCommissionSettlementMonth m : notCommissionSettlementList) {
for (MemUser u : memUserList) {
// 匹配用户城市
- if (u.getId().equals(m.getUserId())) {
- m.setProvinceCode(u.getAgentProvinceCode());
- m.setCityCode(u.getAgentCityCode());
- m.setCountyCode(u.getAgentCountyCode());
+ if (u.getId().equals(m.getUserId()) && StrUtil.isNotBlank(u.getCityCode())) {
+ m.setProvinceCode(u.getCityCode().substring(0, 2) + "0000");
+ m.setCityCode(u.getCityCode().substring(0, 4) + "00");
+ m.setCountyCode(u.getCityCode());
break;
}
}
--
Gitblit v1.7.1