xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理统计短信问题

dev
lisai17@sina.com 2022-01-03 21:52:34 +08:00
parent 545a12f3ee
commit 73c1c6ce43
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/StatSmsJob.java
View File

@ -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);