From b6e4f22553a78d13bd21d443fc00f75d5b61b059 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Tue, 19 Nov 2024 18:43:00 +0800 Subject: [PATCH] fix --- .../controller/rent/WxAllBillController.java | 69 ++++++++++++++----- 1 file changed, 52 insertions(+), 17 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 6a0a727a7..b2d296b60 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -672,9 +672,9 @@ public class WxAllBillController extends BillBaseController { // } //商户可以缴费账单,临期账单以内都可以缴费 - @GetMapping("merchantPayBills") - public ResultData merchantPayBills(@ModelAttribute WxShop wxShop) { - if (null == wxShop.getId()) { + @PostMapping("merchantPayBills") + public ResultData merchantPayBills(@RequestBody WxShop wxShop) { + if (null == wxShop.getIds() || wxShop.getIds().size() <= 0 ) { return new ResultData(Result.ERROR,"请选择店铺"); } wxShop.setIsPreview(EnumYesOrNo.NO.getCode()); @@ -696,8 +696,16 @@ public class WxAllBillController extends BillBaseController { } wxShop.setNeedPayNoDays(EnumYesOrNo.YES.getCode()); - WxShop shop = wxShopSerivce.getById(wxShop.getId()); - WxShopUsers shopUser = wxShopSerivce.getCurrentShopUser(shop, shop.getId()); + WxShopUsers shopUser = new WxShopUsers(); + shopUser.updateTenantInfo(wxShop); + shopUser.setShopIds(wxShop.getIds()); + shopUser.setStatus(EnumShopUsersStatus.LIVE.getCode()); + Map shopUserMap = wxShopSerivce.getShopUserMap(shopUser); + + WxShop sq = new WxShop(); + sq.updateTenantInfo(wxShop); + sq.setIds(wxShop.getIds()); + Map shopMap = wxShopSerivce.findShopMap(sq); List list = billAllHelper.getMerchantBillList(wxShop); if (null != list && list.size() > 0 ) { @@ -706,15 +714,24 @@ public class WxAllBillController extends BillBaseController { Map feesMap = wxEnergyService.getFeesMap(fq); for (int i = 0 ; i < list.size(); i++) { WxAllBill be = list.get(i); - be.setShopNumber(shop.getShopNumber()); + if (null != shopMap) { + WxShop sh = shopMap.get(be.getShopId()); + if (null != sh) { + be.setShopNumber(sh.getShopNumber()); + } + } + if (null != feesMap) { WxEnergyFees fees = feesMap.get(be.getEnergyFeesId()); if (null != fees) { be.setEnergyFeesName(fees.getName()); } } - if (null != shopUser && StringUtils.isBlank(be.getCusName())) { - be.setCusName(shopUser.getName()); + if (null != shopUserMap) { + WxShopUsers su = shopUserMap.get(be.getShopId()); + if (null != su) { + be.setCusName(su.getName()); + } } } } @@ -722,9 +739,9 @@ public class WxAllBillController extends BillBaseController { } //待支付给商户的账单 - @GetMapping("toPaymerchantBills") - public ResultData toPaymerchantBills(@ModelAttribute WxShop wxShop) { - if (null == wxShop.getId()) { + @PostMapping("toPaymerchantBills") + public ResultData toPaymerchantBills(@RequestBody WxShop wxShop) { + if (null == wxShop.getIds() || wxShop.getIds().size() <= 0 ) { return new ResultData(Result.ERROR,"请选择店铺"); } if (StringUtils.isNotBlank(wxShop.getFeesIdListStr())) { @@ -746,23 +763,41 @@ public class WxAllBillController extends BillBaseController { wxShop.setToPayMerchant(EnumYesOrNo.YES.getCode()); } List list = billAllHelper.getMerchantBillList(wxShop); - WxShop shop = wxShopSerivce.getById(wxShop.getId()); - WxShopUsers shopUser = wxShopSerivce.getCurrentShopUser(shop, shop.getId()); + + WxShopUsers shopUser = new WxShopUsers(); + shopUser.updateTenantInfo(wxShop); + shopUser.setShopIds(wxShop.getIds()); + shopUser.setStatus(EnumShopUsersStatus.LIVE.getCode()); + Map shopUserMap = wxShopSerivce.getShopUserMap(shopUser); + + WxShop sq = new WxShop(); + sq.updateTenantInfo(wxShop); + sq.setIds(wxShop.getIds()); + Map shopMap = wxShopSerivce.findShopMap(sq); + if (null != list && list.size() > 0 ) { WxEnergyFees fq = new WxEnergyFees(); - fq.updateTenantInfo(shop); + fq.updateTenantInfo(wxShop); Map feesMap = wxEnergyService.getFeesMap(fq); for (int i = 0 ; i < list.size(); i++) { WxAllBill be = list.get(i); - be.setShopNumber(shop.getShopNumber()); + if (null != shopMap) { + WxShop sh = shopMap.get(be.getShopId()); + if (null != sh) { + be.setShopNumber(sh.getShopNumber()); + } + } if (null != feesMap) { WxEnergyFees fees = feesMap.get(be.getEnergyFeesId()); if (null != fees) { be.setEnergyFeesName(fees.getName()); } } - if (null != shopUser && StringUtils.isBlank(be.getCusName())) { - be.setCusName(shopUser.getName()); + if (null != shopUserMap) { + WxShopUsers su = shopUserMap.get(be.getShopId()); + if (null != su) { + be.setCusName(su.getName()); + } } } }