From 8967db4cf4d5e2f16830b499db04e850af61b08d Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期四, 22 二月 2024 10:39:45 +0800
Subject: [PATCH] 2.22

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index c38f5e1..a54881a 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -181,8 +181,8 @@
             d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
             c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
         }
-        incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), orderLogistics.getType(), d.doubleValue());
-        incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), orderLogistics.getType(), c.doubleValue());
+//        incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), orderLogistics.getType(), d.doubleValue());
+//        incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), orderLogistics.getType(), c.doubleValue());
         driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
         driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
         driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -312,6 +312,7 @@
                         d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
                         c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
                     }
+
                     incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), 4, d.doubleValue());
                     incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), 4, c.doubleValue());
                     Driver driver = driverService.selectById(orderLogistics.getDriverId());
@@ -322,9 +323,6 @@
                 }
 
                 if (orderLogistics.getPayType()==4||!orderLogisticsId.isEmpty()){
-
-                    System.err.println("1111111111111111111111111");
-
                     double sum = 0;
                     if (orderLogistics.getPayType()==4){
                         sum= orderLogistics.getOrderMoney();
@@ -353,7 +351,6 @@
                     }
                     //记录司机待结算金额
                     if(d.compareTo(new BigDecimal(0)) > 0){
-                        System.err.println("2222222222222222222222");
                         SettlementDetail settlementDetail = new SettlementDetail();
                         settlementDetail.setOrderId(orderId);
                         settlementDetail.setOrderType(1);
@@ -378,7 +375,7 @@
                                 settlementRecord.setDriverId(orderLogistics.getDriverId());
                                 settlementRecord.setType(1);
                                 settlementRecord.setPaymentStatus(1);
-                                settlementRecord.setPayMoney(sum);
+                                settlementRecord.setPayMoney(d.doubleValue());
                                 settlementRecord.setInsertTime(new Date());
                                 settlementRecordService.insert(settlementRecord);
 

--
Gitblit v1.7.1