From b5688bce787a214e2931f4db5c33f59a184e2b49 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Sep 2022 17:39:26 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
index f852aea..0a09cb7 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
@@ -110,6 +110,8 @@
List<MallOrderInfo> orderInfos = mallOrderInfoMapper.selectOrderByStatusAndPayTime(3,DateUtil.offsetDay(new Date(), -value));
if(CollUtil.isNotEmpty(orderInfos)){
for(MallOrderInfo orderInfo : orderInfos){
+ DataDictionaryCustom dicBonusPercent = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_PERCENT.getType(), DataDictionaryEnum.BONUS_PERCENT.getCode());
+ BigDecimal bonusPercent = new BigDecimal(dicBonusPercent.getValue()).setScale(2,BigDecimal.ROUND_DOWN);
//生成一条团长提成记录
Long id = orderInfo.getId();
List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(id);
@@ -120,9 +122,11 @@
MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
+ mallLeaderAchieve.setOrderItemId(mallOrderItem.getId());
BigDecimal itemAmount = mallOrderItem.getAmount();
-// BigDecimal subtract = orderInfo.getAmount().subtract(orderInfo.getCarriage() == null ? BigDecimal.ZERO : orderInfo.getCarriage());
mallLeaderAchieve.setAmount(itemAmount);
+ BigDecimal bigDecimal = bonusPercent.multiply(itemAmount).setScale(2, BigDecimal.ROUND_DOWN);
+ mallLeaderAchieve.setProfitAmount(bigDecimal);
mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode());
mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
mallLeaderAchieveMapper.insert(mallLeaderAchieve);
@@ -146,8 +150,8 @@
DataDictionaryCustom dicBonusSwitch = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_SWITCH.getType(), DataDictionaryEnum.BONUS_SWITCH.getCode());
String bonusSwitch = dicBonusSwitch.getValue();
if("1".equals(bonusSwitch)){
- DataDictionaryCustom dicBonusPercent = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_PERCENT.getType(), DataDictionaryEnum.BONUS_PERCENT.getCode());
- BigDecimal bonusPercent = new BigDecimal(dicBonusPercent.getValue()).setScale(2,BigDecimal.ROUND_DOWN);;
+// DataDictionaryCustom dicBonusPercent = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_PERCENT.getType(), DataDictionaryEnum.BONUS_PERCENT.getCode());
+// BigDecimal bonusPercent = new BigDecimal(dicBonusPercent.getValue()).setScale(2,BigDecimal.ROUND_DOWN);
//获取每日提成总数
/**
* a.unique_code uniqueCode 团长特征码
@@ -159,10 +163,9 @@
if (CollUtil.isNotEmpty(allLeaderAchieve)) {
for (Map<String, String> map : allLeaderAchieve) {
String uniqueCode = map.get("uniqueCode");
- Object amountOrder = map.get("amount");
+ Object profitAmount = map.get("profitAmount");
//直接舍弃小数点的第三位
- BigDecimal amount = new BigDecimal(String.valueOf(amountOrder)).setScale(2,BigDecimal.ROUND_DOWN);
- BigDecimal achieveMoney = amount.multiply(bonusPercent).setScale(2,BigDecimal.ROUND_DOWN);
+ BigDecimal achieveMoney = new BigDecimal(String.valueOf(profitAmount)).setScale(2,BigDecimal.ROUND_DOWN);
MallMember mallMember = mallMemberMapper.selectInfoByInviteId(uniqueCode);
memberWalletService.addBalance(achieveMoney,mallMember.getId());
String achieveNo = "TC."+ MallUtils.getOrderNum();
--
Gitblit v1.9.1