From 5b8a25c22f5d3d20d20475503cc9f3c31ea344ab Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 05 二月 2024 18:09:49 +0800
Subject: [PATCH] BUG修改
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 3c69268..5ceafb6 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -790,8 +790,8 @@
//添加已收入明细
Company company = companyService.selectById(orderLogistics.getCompanyId());
Double speMoney = orderLogistics.getType() == 4 ? company.getSameLogisticsMoney() : company.getCrossLogisticsMoney();
- BigDecimal d = null;
- BigDecimal c = null;
+ BigDecimal d = BigDecimal.ZERO;
+ BigDecimal c = BigDecimal.ZERO;
if(company.getIsSpeFixedOrProportional() == 2){//固定
d = new BigDecimal(speMoney);
c = new BigDecimal(orderMoney).subtract(d);
@@ -805,6 +805,7 @@
income.setMoney(income.getMoney() + d.doubleValue());
incomeService.updateById(income);
income = incomeService.selectOne(new EntityWrapper<Income>().eq("userType", 2).eq("objectId", orderLogistics.getCompanyId()).eq("type", 2).eq("incomeId", orderLogistics.getId()).eq("orderType", orderLogistics.getType()));
+ System.out.println("小件物流补差价income======"+income);
income.setMoney(income.getMoney() + c.doubleValue());
incomeService.updateById(income);
Driver driver = driverService.selectById(orderLogistics.getDriverId());
--
Gitblit v1.7.1