From b7d02900762cd81b6ddade1885a86492ecbc13dd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Sep 2022 14:35:05 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 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 fa3a580..78aa155 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
@@ -64,12 +64,6 @@
@Autowired
private IMallAchieveService mallAchieveService;
- @Autowired
- private IApiMallMemberWalletService memberWalletService;
-
- @Autowired
- private IMallMoneyFlowService mallMoneyFlowService;
-
/**
* 普通商品结算
*/
@@ -122,7 +116,7 @@
mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
mallLeaderAchieveMapper.insert(mallLeaderAchieve);
}
- mallOrderInfoMapper.updateOrderConfirmStatus(DateUtil.offsetDay(new Date(), -value));
+ mallOrderInfoMapper.updateOrderConfirmStatus(DateUtil.date(),DateUtil.offsetDay(new Date(), -value));
}
}
/**
@@ -143,12 +137,14 @@
* , IFNULL(sum(a.amount),0) amount 每日提成总金额
*/
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");
//直接舍弃小数点的第三位
- BigDecimal amount = new BigDecimal(map.get("amount")).setScale(2,BigDecimal.ROUND_DOWN);
+ BigDecimal amount = new BigDecimal(String.valueOf(amountOrder)).setScale(2,BigDecimal.ROUND_DOWN);
BigDecimal achieveMoney = amount.multiply(bonusPercent).setScale(2,BigDecimal.ROUND_DOWN);
MallMember mallMember = mallMemberMapper.selectInfoByInviteId(uniqueCode);
memberWalletService.addBalance(achieveMoney,mallMember.getId());
@@ -160,16 +156,15 @@
achieveNo,
FlowTypeEnum.BALANCE.getValue());
-
//更新到已提成状态
- mallLeaderAchieveMapper.updateByUniqueCodeStateAndTime(uniqueCode,MallLeaderAchieve.STATE_ONE,dateTime);
+ mallLeaderAchieveMapper.updateByUniqueCodeStateAndTime(DateUtil.date(),uniqueCode,MallLeaderAchieve.STATE_ONE,dateTime);
}
}
}
}
- public static void main(String[] args) {
- BigDecimal bigDecimal = new BigDecimal(0.1256).setScale(2,BigDecimal.ROUND_DOWN);
- System.out.println(bigDecimal);
- }
+// public static void main(String[] args) {
+// BigDecimal bigDecimal = new BigDecimal(0.1256).setScale(2,BigDecimal.ROUND_DOWN);
+// System.out.println(bigDecimal);
+// }
}
--
Gitblit v1.9.1