From 08a19b964506d6a4f62c822a6832edcb662963b1 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Tue, 16 Mar 2021 15:02:34 +0800 Subject: [PATCH] . --- .../ssjygl/order/ordercluster/OrderclusterSyncService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java index c28abf0..6ab2104 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java @@ -722,7 +722,7 @@ public class OrderclusterSyncService extends BaseSyncService { // 客户在所有砂站的未完成的配额中，未执行完成的总金额 BigDecimal undo_price = OrderclusterService.me.undoPrice(oldobj.getCustomerId()); - BigDecimal surplus_weight = model.getTotalWeight().subtract(overweight); // 本次修改增加的重量 + BigDecimal surplus_weight = model.getTotalWeight().subtract(oldobj.getTotalWeight()); // 本次修改增加的重量 BigDecimal add_total_price = surplus_weight.multiply(oldobj.getUnitPrice()); // 本次修改增加的价格 BigDecimal plan_total_price = add_total_price.add(undo_price); // 剩余未完成金额加上本次增加的金额 @@ -943,7 +943,7 @@ public class OrderclusterSyncService extends BaseSyncService { // 客户在所有砂站的未完成的配额中，未执行完成的总金额 BigDecimal undo_price = OrderclusterService.me.undoPrice(oldobj.getCustomerId()); - BigDecimal plan_total_price = total_weight.subtract(over_weight).multiply(oldobj.getUnitPrice()).add(undo_price); // 本次转结的量，减去已完成量 + BigDecimal plan_total_price = total_weight.subtract(oldobj.getTotalWeight()).multiply(oldobj.getUnitPrice()).add(undo_price); // 本次转结的量，减去已完成量 if (plan_total_price.compareTo(prepayCustomer.getSurplus()) > 0) { return Result.failedstr("共计总配额达 %.2f元，客户余额（%.2f元）不足", plan_total_price, prepayCustomer.getSurplus());