From c8f56f461bbc38d9bc4c39107f53793c40422242 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sun, 24 Nov 2024 20:36:43 +0800 Subject: [PATCH] fix --- .../controller/rent/WxAllBillController.java | 34 ++++++++++++------- .../java/com/iformall/domain/po/WxShop.java | 2 ++ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 8143709cf..0b058eca7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -289,6 +289,12 @@ public class WxAllBillController extends BillBaseController { if (null != wxShop.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxShop.getOnlyOwe().intValue()) { wxShop.setOweBillBeforeDays(getOweBillBeforeDays()); } + + WxShopUsers su = wxShopSerivce.getCurrentShopUser(ws, ws.getId()); + if (null != su) { + vo.setCusName(su.getName()); + } + //根据科目来 List sumList = billAllHelper.getFeesBillSum(wxShop,starttime, enttime); if (null == sumList ) { @@ -301,6 +307,7 @@ public class WxAllBillController extends BillBaseController { BigDecimal needpay = new BigDecimal(0); BigDecimal paid = new BigDecimal(0); BigDecimal owe = new BigDecimal(0); + BigDecimal returnPay = new BigDecimal(0); for (int i = 0 ; i < sumList.size() ; i ++) { WxBillSum s = sumList.get(i); if (null != s.getEnergyFeesId() && null != feesMap) { @@ -312,11 +319,13 @@ public class WxAllBillController extends BillBaseController { needpay = needpay.add(s.getNeedPayNumber()); paid = paid.add(s.getPaidNumber()); owe = owe.add(s.getOweNumber()); + returnPay = returnPay.add(s.getReturnPayNumber()); } } vo.setNeedPay(needpay.toPlainString()); vo.setPaid(paid.toPlainString()); vo.setOwe(owe.toPlainString()); + vo.setReturnPay(returnPay.toPlainString()); vo.setBillSumList(sumList); return vo; } @@ -325,19 +334,18 @@ public class WxAllBillController extends BillBaseController { @PostMapping("viewSettleTemplate") @TenantIgnore public ResultData viewSettleTemplate(@RequestBody WxShop wxShop) { -// if (null == merchant.getId() || null == merchant.getTemplateId() ||null == merchant.getFeesIdList() || merchant.getFeesIdList().size() <= 0 ) { -// return new ResultData(Result.ERROR,"清选择商户和科目"); -// } -// merchant.updateTenantInfo(getTenantInfo()); -// WxPayAccountBill ab = wxPayAccountBillService.getByTenantInfo(merchant); -// WxShopBillVo vo = getMerchantBillVo(merchant); -// if (null != ab) { -// vo.setMallBankAccount(ab.getBankCardId()); -// vo.setMallBankAccountName(ab.getBankName()); -// vo.setMallBankName(ab.getBankAccountName()); -// } -// return new ResultData(wxFinancePrintService.parseTemplateData(merchant.getTenantId(),merchant.getTemplateId(),merchant.getFeesIdList(),vo)); - return new ResultData(); + if (null == wxShop.getId() || null == wxShop.getTemplateId() ||null == wxShop.getFeesIdList() || wxShop.getFeesIdList().size() <= 0 ) { + return new ResultData(Result.ERROR,"清选择商户和科目"); + } + wxShop.updateTenantInfo(getTenantInfo()); + WxPayAccountBill ab = wxPayAccountBillService.getByTenantInfo(wxShop); + WxShopBillVo vo = getMerchantBillVo(wxShop); + if (null != ab) { + vo.setMallBankAccount(ab.getBankCardId()); + vo.setMallBankAccountName(ab.getBankName()); + vo.setMallBankName(ab.getBankAccountName()); + } + return new ResultData(wxFinancePrintService.parseTemplateData(wxShop.getTenantId(),wxShop.getTemplateId(),wxShop.getFeesIdList(),vo)); } /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index 2e0d6fbc9..e97e0292c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -244,4 +244,6 @@ public class WxShop extends TenantEntity { private String cusName; @TableField(exist = false) private String queryShopIdStr; + @TableField(exist = false) + private Long templateId; }