From cf5b8614d10dab3df6280e3b4e676d59b35ce0cf Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 02 十一月 2024 16:18:58 +0800
Subject: [PATCH] bug修改

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index ec16f92..ef036b5 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1299,9 +1299,9 @@
 				payOrderDto.setFinalAmount(payOrderDto.getOrderAmount());
 			}
 			if (payOrderDto.getType()==1&&payOrderDto.getStatus()==3){
-				payOrderDto.setFinalAmount(payOrderDto.getRechargeAmount());
-				payOrderDto.setOrderAmount(payOrderDto.getRechargeAmount());
-				payOrderDto.setPaymentAmount(payOrderDto.getRechargeAmount());
+				payOrderDto.setFinalAmount(payOrderDto.getOrderAmount());
+				payOrderDto.setOrderAmount(payOrderDto.getOrderAmount());
+				payOrderDto.setPaymentAmount(payOrderDto.getOrderAmount());
 			}
 		}
 		pageInfo.setRecords(list);
@@ -2623,26 +2623,26 @@
 			tSettlementConfirm.setTotalService(dto.getTotalService());
 			tSettlementConfirm.setRemark(dto.getRemark());
 			tSettlementConfirm.setServicePartner(dto.getServicePartner());
-			BigDecimal subtract = new BigDecimal("1").subtract(dto.getProportionPartner().multiply(new BigDecimal("0.01")));
+			BigDecimal subtract = new BigDecimal("1").subtract(dto.getProportionPartner());
+			BigDecimal subtract9 = new BigDecimal("1").subtract(dto.getServicePartner());
 			// 总电损费用
 			BigDecimal divide = tSettlementConfirm.getProportionMoney().divide(subtract, 2, RoundingMode.HALF_DOWN);
 			// 平台承担电损
 			BigDecimal subtract1 = divide.subtract(tSettlementConfirm.getProportionMoney());
 			BigDecimal multiply = dto.getServiceMoney().multiply(subtract);
 			BigDecimal subtract2 = multiply.subtract(subtract1);
-			tSettlementConfirm.setNewMoney(subtract2);
+			tSettlementConfirm.setNewMoney(dto.getServiceCharge().subtract(dto.getVenue()).subtract(dto.getClean())
+					.subtract(dto.getMaintain()).multiply(subtract9).subtract(subtract1));
 
 			tSettlementConfirm.setTotalService(dto.getTotalService());
 			tSettlementConfirm.setServiceRemark(dto.getServiceRemark());
 			tSettlementConfirm.setDistribution(dto.getDistribution());
 			tSettlementConfirm.setIncome(dto.getElectrovalence().add(dto.getServiceCharge()));
 			tSettlementConfirm.setCost(dto.getVenue().add(dto.getClean()).add(dto.getMaintain()).add(dto.getSupplyElectronic()));
-			BigDecimal divide1 = tSettlementConfirm.getProportionMoney().divide(tSettlementConfirm.getProportionPartner(), 2, RoundingMode.HALF_DOWN);
-			tSettlementConfirm.setProfitMoney(tSettlementConfirm.getServiceMoney().multiply(tSettlementConfirm.getServicePartner())
-					.subtract(divide1));
-			tSettlementConfirm.setNewSettlement(subtract2.subtract(tSettlementConfirm.getCost()));
-
-
+			tSettlementConfirm.setProfitMoney(tSettlementConfirm.getIncome().subtract(tSettlementConfirm.getCost()));
+			tSettlementConfirm.setNewSettlement(tSettlementConfirm.getProfitMoney().add(tSettlementConfirm.getCost()));
+			tSettlementConfirm.setServiceMoney(dto.getServiceCharge().subtract(dto.getVenue()).subtract(dto.getClean())
+					.subtract(dto.getMaintain()).multiply(dto.getServicePartner()));
 			tSettlementConfirmMapper.insert(tSettlementConfirm);
 		}
 		return tSettlementConfirm;

--
Gitblit v1.7.1