From 78698fdf122e986667c85378e1bed0527b780e27 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 22 Aug 2024 23:06:41 +0800 Subject: [PATCH] fix --- .../controller/rent/WxAllBillController.java | 26 +++++++++++++++++++ .../com/iformall/domain/po/WxMerchant.java | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) 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 93eaa30ee..d16d3f319 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -632,6 +632,19 @@ public class WxAllBillController extends BillBaseController { wxMerchant.updateTenantInfo(getTenantInfo()); //放开时间 //wxMerchant.setNeedPayPreDays(getNearBillBeforeDays()); + if (StringUtils.isNotBlank(wxMerchant.getFeesIdListStr())) { + String[] feesidstrs = wxMerchant.getFeesIdListStr().split(","); + if (null != feesidstrs) { + List feesidList = new ArrayList(); + for (int i = 0 ; i < feesidstrs.length ; i ++) { + String s = feesidstrs[i]; + if (StringUtils.isNotBlank(s)) { + feesidList.add(Long.parseLong(s)); + } + } + wxMerchant.setFeesIdList(feesidList); + } + } wxMerchant.setNeedPayNoDays(EnumYesOrNo.YES.getCode()); List list = billAllHelper.getMerchantBillList(wxMerchant); if (null != list && list.size() > 0 ) { @@ -669,6 +682,19 @@ public class WxAllBillController extends BillBaseController { if (null == wxMerchant.getId()) { return new ResultData(Result.ERROR,"请选择商户"); } + if (StringUtils.isNotBlank(wxMerchant.getFeesIdListStr())) { + String[] feesidstrs = wxMerchant.getFeesIdListStr().split(","); + if (null != feesidstrs) { + List feesidList = new ArrayList(); + for (int i = 0 ; i < feesidstrs.length ; i ++) { + String s = feesidstrs[i]; + if (StringUtils.isNotBlank(s)) { + feesidList.add(Long.parseLong(s)); + } + } + wxMerchant.setFeesIdList(feesidList); + } + } wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setToPayMerchant(EnumYesOrNo.YES.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index fc9199296..5c59b0f59 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -490,5 +490,6 @@ public class WxMerchant extends TenantEntity { public Long templateId; @TableField(exist = false) public String searchKey; - + @TableField(exist = false) + public String feesIdListStr; }