From 66c36c5262396f9705c3f7456c7fb120701bda11 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 1 Jul 2025 11:51:01 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E7=BB=93=E7=AE=97=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BF=94=E5=9B=9E=E5=95=86=E5=93=81=E7=9B=92?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/bonus/service/impl/BonusSettleRangeHandle.java | 6 +++--- .../bonus/bonus/service/impl/BonusSettleServiceImpl.java | 5 +++-- .../main/resources/mapper/bonus/order/BonusOrderMapper.xml | 4 ++-- .../com/hzs/common/domain/sale/ext/SaOrderWaresExt.java | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java index aa7e974e..a7fe58da 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java @@ -118,7 +118,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { BigDecimal boxNum = BigDecimal.ZERO; for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { if (RetailConstants.ALL_BOX_WARES_LIST.contains(saOrderItems.getWaresCode())) { - boxNum = boxNum.add(saOrderItems.getBoxNum().multiply(new BigDecimal(saOrderItems.getWaresQuantity()))); + boxNum = boxNum.add(saOrderItems.getWaresBoxNum().multiply(new BigDecimal(saOrderItems.getWaresQuantity()))); } } saOrderExt.setBoxNum(boxNum); @@ -256,7 +256,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { BigDecimal boxNum = BigDecimal.ZERO; for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { if (RetailConstants.ALL_BOX_WARES_LIST.contains(saOrderItems.getWaresCode())) { - boxNum = boxNum.add(saOrderItems.getBoxNum().multiply(new BigDecimal(saOrderItems.getWaresQuantity()))); + boxNum = boxNum.add(saOrderItems.getWaresBoxNum().multiply(new BigDecimal(saOrderItems.getWaresQuantity()))); } } saOrderExt.setBoxNum(boxNum); @@ -513,7 +513,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { BigDecimal boxNum = BigDecimal.ZERO; for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { if (RetailConstants.ALL_BOX_WARES_LIST.contains(saOrderItems.getWaresCode())) { - boxNum = boxNum.add(saOrderItems.getBoxNum().multiply(new BigDecimal(saOrderItems.getWaresQuantity()))); + boxNum = boxNum.add(saOrderItems.getWaresBoxNum().multiply(new BigDecimal(saOrderItems.getWaresQuantity()))); } } // 个人累计消费pv diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java index 650747c8..2bf79bda 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java @@ -126,7 +126,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { bonusSettleRangeHandle.calculateRetailBonusByDay(settleDate, cuMemberBonusMap, bonusConfigDTO, recordDetailVO, period, yesterdayPeriod, isSameMonth); - // TODO new 每月1号，需要计算4个月奖 + // new 每月1号，需要计算4个月奖 if (EEnv.TEST.getValue().equals(BdConfig.getEnv())) { // 测试环境，每天都执行 // 计算新零售团队福利、福利分红等奖金 @@ -142,7 +142,8 @@ public class BonusSettleServiceImpl implements IBonusSettleService { Date currentDate = DateUtils.afterDate(1, ChronoUnit.DAYS, DateUtils.parseStringToDate(settleDate)); String afterDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, currentDate); if (afterDate.endsWith("01")) { - // TODO new 区域考核处理 + log.info("afterDate: {}", afterDate); + log.info("settleDate: {}", settleDate); // 计算完月奖，计算考核（区域6个月要达到蓝宝以上） String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + period; cuRegionAssessService.assessRegionByEveryMonth(settleDate, rangeTableName); diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml index 7511475a..7b1ad32b 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml @@ -61,7 +61,7 @@ - + @@ -157,7 +157,7 @@ nvl(bw.wares_code,'~') wares_code, nvl(st.wares_quantity,0) wares_quantity, nvl(bw.area_income, 0) area_income, - nvl(bw.box_num, 0) box_num + nvl(bw.box_num, 0) wares_box_num from sa_order so left join sa_order_wares st on so.pk_id = st.pk_order and st.wares_price > 0 diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderWaresExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderWaresExt.java index 34bae43a..880b6b1b 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderWaresExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderWaresExt.java @@ -23,6 +23,6 @@ public class SaOrderWaresExt extends SaOrderWares { /** * 商品上传盒数 */ - private BigDecimal boxNum; + private BigDecimal waresBoxNum; }