From f3a2c394b12826d86204a853a8e2ebcb8dd9b89e Mon Sep 17 00:00:00 2001 From: wuwenxiong <646448316@qq.com> Date: Tue, 15 Feb 2022 18:01:43 +0800 Subject: [PATCH] aa --- .../src/main/java/com/cowr/ssjygl/prepay/PrepayService.java | 2 +- .../com/cowr/ssjygl/presellorder/PresellOrderService.java | 2 ++ .../java/com/cowr/ssjygl/stat/sale/OrderStatService.java | 6 ++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java index fbd1f93..a99b7d7 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java @@ -141,7 +141,7 @@ public class PrepayService { //获取账户可用余额 BigDecimal availableBalance = RefundDetailService.me.getAvailableBalance(prepayCustomer.getCustomerId(), prepayCustomer.getSurplus()); if (ordercluster.getSaleType() == 1) { - availableBalance = PresellOrderService.me.getPresellCustomerSurplusById(ordercluster.getCustomerId()); + availableBalance = PresellOrderService.me.getPresellCustomerSurplus2ById(ordercluster.getCustomerId()); } out.set("prepay_truck", true); out.set("prepay_threshold", prepayCustomer.getThreshold()); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java index 42872b8..62d2f24 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java @@ -180,7 +180,9 @@ public class PresellOrderService extends BaseService { Integer customer_id = r.getInt("customer_id"); if (customer_id != null) { BigDecimal surplus = getPresellCustomerSurplus2ById(customer_id); + BigDecimal kep_surplus = getPresellCustomerSurplusById(customer_id); r.set("surplus", surplus); + r.set("kep_surplus", kep_surplus); } } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java index 358caab..368345d 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java @@ -2765,12 +2765,11 @@ public class OrderStatService { Record s = sups.get(i); row.createCell(a).setCellValue(s.getStr("name")); - sheet.addMergedRegion(new CellRangeAddress(0, 0, a, a + 3)); - a += 4; + sheet.addMergedRegion(new CellRangeAddress(0, 0, a, a + 2)); + a += 3; row2.createCell(a2++).setCellValue("预售金额（元）"); row2.createCell(a2++).setCellValue("已提货金额（元）"); - row2.createCell(a2++).setCellValue("预售余额（元）"); row2.createCell(a2++).setCellValue("已提货量（吨）"); } @@ -2800,7 +2799,6 @@ public class OrderStatService { for (Record s : sups) { row.createCell(b++).setCellValue(DataUtil.getDefaultByRecord(rec, "xsl_" + s.getInt("id"))); row.createCell(b++).setCellValue(DataUtil.getDefaultByRecord(rec, "xse_" + s.getInt("id"))); - row.createCell(b++).setCellValue(DataUtil.getDefaultByRecord(rec, "xsl_" + s.getInt("id")) - DataUtil.getDefaultByRecord(rec, "xse_" + s.getInt("id"))); row.createCell(b++).setCellValue(DataUtil.getDefaultByRecord(rec, "xsw_" + s.getInt("id"))); }