angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
sangelxiu1 2025-07-01 14:16:59 +08:00
parent 01ea3d0601 737fab9b8a
commit c92433086f
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
View File

@ -118,7 +118,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
BigDecimal boxNum = BigDecimal.ZERO; BigDecimal boxNum = BigDecimal.ZERO;
for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) {
if (RetailConstants.ALL_BOX_WARES_LIST.contains(saOrderItems.getWaresCode())) { 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); saOrderExt.setBoxNum(boxNum);
@ -256,7 +256,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
BigDecimal boxNum = BigDecimal.ZERO; BigDecimal boxNum = BigDecimal.ZERO;
for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) {
if (RetailConstants.ALL_BOX_WARES_LIST.contains(saOrderItems.getWaresCode())) { 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); saOrderExt.setBoxNum(boxNum);
@ -513,7 +513,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
BigDecimal boxNum = BigDecimal.ZERO; BigDecimal boxNum = BigDecimal.ZERO;
for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) {
if (RetailConstants.ALL_BOX_WARES_LIST.contains(saOrderItems.getWaresCode())) { 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 // 个人累计消费pv

5
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java
View File

@ -126,7 +126,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
bonusSettleRangeHandle.calculateRetailBonusByDay(settleDate, cuMemberBonusMap, bonusConfigDTO, recordDetailVO, bonusSettleRangeHandle.calculateRetailBonusByDay(settleDate, cuMemberBonusMap, bonusConfigDTO, recordDetailVO,
period, yesterdayPeriod, isSameMonth); period, yesterdayPeriod, isSameMonth);
// TODO new 每月1号，需要计算4个月奖 // new 每月1号，需要计算4个月奖
if (EEnv.TEST.getValue().equals(BdConfig.getEnv())) { 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)); Date currentDate = DateUtils.afterDate(1, ChronoUnit.DAYS, DateUtils.parseStringToDate(settleDate));
String afterDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, currentDate); String afterDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, currentDate);
if (afterDate.endsWith("01")) { if (afterDate.endsWith("01")) {
// TODO new 区域考核处理 log.info("afterDate: {}", afterDate);
log.info("settleDate: {}", settleDate);
// 计算完月奖，计算考核（区域6个月要达到蓝宝以上） // 计算完月奖，计算考核（区域6个月要达到蓝宝以上）
String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + period; String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + period;
cuRegionAssessService.assessRegionByEveryMonth(settleDate, rangeTableName); cuRegionAssessService.assessRegionByEveryMonth(settleDate, rangeTableName);

4
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml
View File

@ -61,7 +61,7 @@
<result column="WARES_PRICE" property="waresPrice"/> <result column="WARES_PRICE" property="waresPrice"/>
<result column="WARES_CODE" property="waresCode"/> <result column="WARES_CODE" property="waresCode"/>
<result column="AREA_INCOME" property="areaIncome"/> <result column="AREA_INCOME" property="areaIncome"/>
<result column="BOX_NUM" property="boxNum"/> <result column="WARES_BOX_NUM" property="waresBoxNum"/>
</collection> </collection>
<collection property="orderItemsExtList" ofType="com.hzs.common.domain.sale.ext.SaOrderItemsExt"> <collection property="orderItemsExtList" ofType="com.hzs.common.domain.sale.ext.SaOrderItemsExt">
<result column="SI_ITEMS_ID" property="pkId"/> <result column="SI_ITEMS_ID" property="pkId"/>
@ -157,7 +157,7 @@
nvl(bw.wares_code,'~') wares_code, nvl(bw.wares_code,'~') wares_code,
nvl(st.wares_quantity,0) wares_quantity, nvl(st.wares_quantity,0) wares_quantity,
nvl(bw.area_income, 0) area_income, 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 from sa_order so
left join sa_order_wares st left join sa_order_wares st
on so.pk_id = st.pk_order and st.wares_price > 0 on so.pk_id = st.pk_order and st.wares_price > 0

2
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderWaresExt.java
View File

@ -23,6 +23,6 @@ public class SaOrderWaresExt extends SaOrderWares {
/** /**
* 商品上传盒数 * 商品上传盒数
*/ */
private BigDecimal boxNum; private BigDecimal waresBoxNum;
} }