From 2ecf227c03df1345d9b95180f505cf0026074c9e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 01 Sep 2022 16:47:11 +0800
Subject: [PATCH] 20220822

---
 src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 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 778cce6..602e4b3 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
@@ -116,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));
         }
     }
     /**
@@ -136,14 +136,15 @@
              * 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");
                     //直接舍弃小数点的第三位
-                    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());
@@ -157,14 +158,14 @@
 
 
                     //更新到已提成状态
-                    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