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 | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 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 602e4b3..0a09cb7 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
@@ -38,6 +38,9 @@
private MallOrderInfoMapper mallOrderInfoMapper;
@Autowired
+ private MallOrderItemMapper mallOrderItemMapper;
+
+ @Autowired
private IApiMallMemberWalletService memberWalletService;
@Autowired
@@ -107,20 +110,38 @@
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);
//生成一条团长提成记录
- MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
- mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
- mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
- mallLeaderAchieve.setAmount(orderInfo.getAmount());
- mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode());
- mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
- mallLeaderAchieveMapper.insert(mallLeaderAchieve);
+ Long id = orderInfo.getId();
+ List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(id);
+ if(CollUtil.isNotEmpty(mallOrderItemList)){
+ for(MallOrderItem mallOrderItem : mallOrderItemList){
+ Integer state = mallOrderItem.getState() == null ? 1 : mallOrderItem.getState();
+ if(1 == state){
+ MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
+ mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
+ mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
+ mallLeaderAchieve.setOrderItemId(mallOrderItem.getId());
+ BigDecimal itemAmount = mallOrderItem.getAmount();
+ 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);
+ }
+ }
+ }
}
mallOrderInfoMapper.updateOrderConfirmStatus(DateUtil.date(),DateUtil.offsetDay(new Date(), -value));
}
}
/**
- * 自动确认收货
+ * 团长第二天才会结算前一天的所有提成
+ * 从团长业绩表中查询出前一天的所有已完成订单金额*提成系数，得到今日提成
+ * 修改业绩的状态
+ * 并生成一条提成流水
*/
// @Scheduled(cron = "0 0 1 * * ?")
@Scheduled(cron = "1 * * * * ?")
@@ -129,23 +150,22 @@
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 团长特征码
* , IFNULL(sum(a.amount),0) amount 每日提成总金额
*/
- DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
-// DateTime dateTime = DateUtil.offsetDay(new Date(), 0);
+// DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
+ DateTime dateTime = DateUtil.offsetDay(new Date(), 0);
List<Map<String, String>> allLeaderAchieve = mallLeaderAchieveMapper.selectListByStateAndCreateTimeAndUniqueCode(MallLeaderAchieve.STATE_ONE,dateTime);
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();
@@ -155,7 +175,6 @@
MoneyFlowTypeEnum.LEADERACHIEVE.getValue(),
achieveNo,
FlowTypeEnum.BALANCE.getValue());
-
//更新到已提成状态
mallLeaderAchieveMapper.updateByUniqueCodeStateAndTime(DateUtil.date(),uniqueCode,MallLeaderAchieve.STATE_ONE,dateTime);
--
Gitblit v1.9.1