From ae59039491c3f6d308bca6d6ae4ac5f2e7c2a83d Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Mon, 26 Oct 2020 14:02:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E6=95=A3=E8=B4=AD=E7=A0=82=E6=80=BB?= =?UTF-8?q?=E4=BB=B7=E5=9B=9B=E8=88=8D=E4=BA=94=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cowr/ssjygl/transprice/TransPriceService.java | 2 +- .../ssjygl/order/ordertemp/OrderTempSyncService.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java index 1a7f70f..0b07046 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java @@ -82,7 +82,7 @@ public class TransPriceService { // return MathUtil.round4(up.multiply(net_weight).doubleValue()); // 三舍四入 保留 0 位小数 // 2020-07-01 保留两位小数 - return up.multiply(net_weight).setScale(2, BigDecimal.ROUND_UP).doubleValue(); + return up.multiply(net_weight).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java index 8c23172..fb86e84 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java @@ -378,10 +378,19 @@ public class OrderTempSyncService { order.setCustomerTexpayerNum(ordercluster.getCustomerTexpayerNum()); } + // 2020-10-26 应王乐要求，零散购砂客户总价四舍五入 + BigDecimal total_price = TransPriceService.me.caleTotalPrice(up, net_weight); + + if(total_price == null){ + return Result.failed("总价计算错误"); + } + + total_price = total_price.setScale(0, BigDecimal.ROUND_HALF_UP); + // 支付信息 order.setUnitPrice(up); order.setWeight(net_weight); // 使用净重更新重量 - order.setTotalPrice(TransPriceService.me.caleTotalPrice(up, net_weight)); // 获取根据净重和单价计算的总价，作为应付金额 + order.setTotalPrice(total_price); // 获取根据净重和单价计算的总价，作为应付金额 order.setPaid(order.getTotalPrice()); // 如果有预付费，该字段根据预付费情况设置。实付金额 order.setPayType(ordercluster.getPayType()); order.setOrderclusterId(ordercluster_id);