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

aa

dev
wuwenxiong 2022-02-15 18:01:43 +08:00
parent 9104c4992e
commit f3a2c394b1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java
View File

@ -141,7 +141,7 @@ public class PrepayService {
//获取账户可用余额 //获取账户可用余额
BigDecimal availableBalance = RefundDetailService.me.getAvailableBalance(prepayCustomer.getCustomerId(), prepayCustomer.getSurplus()); BigDecimal availableBalance = RefundDetailService.me.getAvailableBalance(prepayCustomer.getCustomerId(), prepayCustomer.getSurplus());
if (ordercluster.getSaleType() == 1) { if (ordercluster.getSaleType() == 1) {
availableBalance = PresellOrderService.me.getPresellCustomerSurplusById(ordercluster.getCustomerId()); availableBalance = PresellOrderService.me.getPresellCustomerSurplus2ById(ordercluster.getCustomerId());
} }
out.set("prepay_truck", true); out.set("prepay_truck", true);
out.set("prepay_threshold", prepayCustomer.getThreshold()); out.set("prepay_threshold", prepayCustomer.getThreshold());

2
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java
View File

@ -180,7 +180,9 @@ public class PresellOrderService extends BaseService {
Integer customer_id = r.getInt("customer_id"); Integer customer_id = r.getInt("customer_id");
if (customer_id != null) { if (customer_id != null) {
BigDecimal surplus = getPresellCustomerSurplus2ById(customer_id); BigDecimal surplus = getPresellCustomerSurplus2ById(customer_id);
BigDecimal kep_surplus = getPresellCustomerSurplusById(customer_id);
r.set("surplus", surplus); r.set("surplus", surplus);
r.set("kep_surplus", kep_surplus);
} }
} }
} }

6
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
View File

@ -2765,12 +2765,11 @@ public class OrderStatService {
Record s = sups.get(i); Record s = sups.get(i);
row.createCell(a).setCellValue(s.getStr("name")); row.createCell(a).setCellValue(s.getStr("name"));
sheet.addMergedRegion(new CellRangeAddress(0, 0, a, a + 3)); sheet.addMergedRegion(new CellRangeAddress(0, 0, a, a + 2));
a += 4; a += 3;
row2.createCell(a2++).setCellValue("预售金额（元）"); row2.createCell(a2++).setCellValue("预售金额（元）");
row2.createCell(a2++).setCellValue("已提货金额（元）"); 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) { for (Record s : sups) {
row.createCell(b++).setCellValue(DataUtil.getDefaultByRecord(rec, "xsl_" + s.getInt("id"))); 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, "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"))); row.createCell(b++).setCellValue(DataUtil.getDefaultByRecord(rec, "xsw_" + s.getInt("id")));
} }