From 3d83fe59399df5f7c80749841b8d26851c016c18 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Sep 2022 16:16:41 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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..200a901 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
@@ -111,7 +111,8 @@
MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
- mallLeaderAchieve.setAmount(orderInfo.getAmount());
+ BigDecimal subtract = orderInfo.getAmount().subtract(orderInfo.getCarriage() == null ? BigDecimal.ZERO : orderInfo.getCarriage());
+ mallLeaderAchieve.setAmount(subtract);
mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode());
mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
mallLeaderAchieveMapper.insert(mallLeaderAchieve);
@@ -120,7 +121,10 @@
}
}
/**
- * 自动确认收货
+ * 团长第二天才会结算前一天的所有提成
+ * 从团长业绩表中查询出前一天的所有已完成订单金额*提成系数，得到今日提成
+ * 修改业绩的状态
+ * 并生成一条提成流水
*/
// @Scheduled(cron = "0 0 1 * * ?")
@Scheduled(cron = "1 * * * * ?")
@@ -136,8 +140,8 @@
* 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) {
@@ -155,7 +159,6 @@
MoneyFlowTypeEnum.LEADERACHIEVE.getValue(),
achieveNo,
FlowTypeEnum.BALANCE.getValue());
-
//更新到已提成状态
mallLeaderAchieveMapper.updateByUniqueCodeStateAndTime(DateUtil.date(),uniqueCode,MallLeaderAchieve.STATE_ONE,dateTime);
--
Gitblit v1.9.1