From 85e8aaf7176d90317ddd8a971ddb8938a7000241 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Thu, 21 Oct 2021 11:04:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9F=AD=E4=BF=A1=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cowr/service/ssjygl/jobs/StatSmsJob.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 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 b67d93a..ecdc2dd 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 @@ -285,8 +285,16 @@ public class StatSmsJob implements Job { .subtract(subtractobj.getBigDecimal("total_price")); if ("2021".equals(year)) { - aggr_weight = aggr_weight.subtract(new BigDecimal("27.34")).subtract(new BigDecimal("5853.39")); - aggr_price = aggr_price.subtract(new BigDecimal("2011.27")).subtract(new BigDecimal("410322.58")); + aggr_weight = aggr_weight + .subtract(new BigDecimal("27.34")) // 2020提前充值客户运输量，要从2021年内扣除 + .subtract(new BigDecimal("5853.39")) // 石畈处置砂，要扣除 + .subtract(new BigDecimal("986.54")) // 石畈处置砂，要扣除 + ; + aggr_price = aggr_price + .subtract(new BigDecimal("2011.27")) // 2020提前充值客户运输量，要从2021年内扣除 + .subtract(new BigDecimal("410322.58")) // 石畈处置砂，要扣除 + .subtract(new BigDecimal("69156.42")) // 石畈处置砂，要扣除 + ; } obj.put("aggr_cnt", orderobj.get("aggr_cnt"));