Pārlūkot izejas kodu

修改分账计算金额

silent 4 gadi atpakaļ
vecāks
revīzija
9111959737

+ 4 - 2
ldt-core/src/main/java/org/springblade/payment/listener/SubAccountHandle.java

@@ -96,14 +96,16 @@ public class SubAccountHandle {
 		Thread.sleep(5000);
 		Thread.sleep(5000);
 
 
 		//计算分账金额
 		//计算分账金额
-		BigDecimal amount = bills.getFee();
+//		BigDecimal amount = bills.getFee();
+		BigDecimal amount = BigDecimal.ZERO;
 
 
 		BalanceBills balanceBill = balanceBillsService.getOne(Wrappers.<BalanceBills>lambdaQuery().eq(BalanceBills::getTradeNo, bills.getId())
 		BalanceBills balanceBill = balanceBillsService.getOne(Wrappers.<BalanceBills>lambdaQuery().eq(BalanceBills::getTradeNo, bills.getId())
 			.eq(BalanceBills::getType, OrderType.SHOP_SEND.name()));
 			.eq(BalanceBills::getType, OrderType.SHOP_SEND.name()));
 
 
 		//计算赠送积分账单金额
 		//计算赠送积分账单金额
 		if (ObjectUtils.isNotEmpty(balanceBill)) {
 		if (ObjectUtils.isNotEmpty(balanceBill)) {
-			amount = amount.add(balanceBill.getTotalPrice());
+//			amount = amount.add(balanceBill.getTotalPrice());
+			amount = amount.add(balanceBill.getPrice().add(balanceBill.getFee()));
 		}
 		}
 
 
 		//分账
 		//分账