From 73c1c6ce43e7f69e9340ae5323889487c96405b4 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Mon, 3 Jan 2022 21:52:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=9F=E8=AE=A1=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cowr/service/ssjygl/jobs/StatSmsJob.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/StatSmsJob.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/StatSmsJob.java index b9d04c9..f038eed 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/StatSmsJob.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/StatSmsJob.java @@ -286,21 +286,21 @@ public class StatSmsJob implements Job { // 其他需扣除预付费充值金额,需从本年度总销售额中扣除 BigDecimal otherPrepaidMoney = AddSubtractItemRecordService.me.getAddSubtractItemValueByYearAndCode(year, "otherPrepaidMoney"); - BigDecimal aggr_weight = orderobj.getBigDecimal("aggr_weight") - .subtract(subtractobj.getBigDecimal("weight")); - BigDecimal aggr_price = orderobj.getBigDecimal("aggr_price") - .subtract(subtractobj.getBigDecimal("total_price")); + BigDecimal aggr_weight = orderobj.getBigDecimal("aggr_weight"); + BigDecimal aggr_price = orderobj.getBigDecimal("aggr_price"); if ("2021".equals(year)) { aggr_weight = aggr_weight .subtract(new BigDecimal("27.34")) // 2020提前充值客户运输量，要从2021年内扣除 .subtract(new BigDecimal("5853.39")) // 石畈处置砂，要扣除 .subtract(new BigDecimal("986.54")) // 石畈处置砂，要扣除 + .subtract(subtractobj.getBigDecimal("weight")) // 一河两岸，要扣除 ; aggr_price = aggr_price .subtract(new BigDecimal("2011.27")) // 2020提前充值客户运输量，要从2021年内扣除 .subtract(new BigDecimal("410322.58")) // 石畈处置砂，要扣除 .subtract(new BigDecimal("69156.42")) // 石畈处置砂，要扣除 + .subtract(subtractobj.getBigDecimal("total_price")) // 一河两岸，要扣除 ; } else if (Integer.parseInt(year) > 2021) { aggr_weight = aggr_weight.subtract(otherPrepaidAmount);