From 552e9c3aefd7e41effc9e4bbc75c15099352c8b5 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 23 Sep 2024 16:18:59 +0800 Subject: [PATCH] fix --- .../service/impl/WxPropertyContractServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 017e9aa5e..80731ed26 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -437,6 +437,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService record.setShopIds(wxPropertyContract.getShopIds()); record.setFeeStandards(wxPropertyContract.getFeesStardarsList()); record.setShopNumbers(wxPropertyContract.getShopNumbers()); + record.setMerchantId(wxPropertyContract.getMerchantId()); List billList = buildProperty(new WxMerchant(),user,record,EnumIsPreview.YES.getCode(),true); record.setPreviewBillRentList(billList); } @@ -597,7 +598,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService return JSONObject.toJSONString(shopInfo); } - public List buildRentMonth(WxMerchant wxMerchant, MallUserInfo user,WxPropertyContract wxPropertyContract, int receivePeriod, Integer lease, Date rentalStartDate,Integer isPreview,boolean saveDb) { + public List buildRentMonth( MallUserInfo user,WxPropertyContract wxPropertyContract, int receivePeriod, Integer lease, Date rentalStartDate,Integer isPreview,boolean saveDb) { // Map shopInfo = new HashMap<>(); if (wxPropertyContract.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { @@ -662,13 +663,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService // } yearList.add(startDate); } - Map resultMap = buildRent(receivePeriod, priceArr, yearList, wxPropertyContract.getReceivePeriodUnit(), wxPropertyContract, user, wxMerchant, billcount, isPreview, shopInfo,saveDb); + Map resultMap = buildRent(receivePeriod, priceArr, yearList, wxPropertyContract.getReceivePeriodUnit(), wxPropertyContract, user, billcount, isPreview, shopInfo,saveDb); List billRentList = (List)resultMap.get("billList"); resultList.addAll(billRentList); return resultList; } - public Map buildRent(int receivePeriod,String[] priceArrs, List yearList,int dayType, WxPropertyContract wxPropertyContract, MallUserInfo user, WxMerchant wxMerchant, int billcount, Integer isPreview,Map shopInfo,boolean saveDb) { + public Map buildRent(int receivePeriod,String[] priceArrs, List yearList,int dayType, WxPropertyContract wxPropertyContract, MallUserInfo user, int billcount, Integer isPreview,Map shopInfo,boolean saveDb) { WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxPropertyContract); SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashedMap(); @@ -1015,7 +1016,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService String price = propertyContract.getPrice(); //按月计租 - result = buildRentMonth(wxMerchant, user, propertyContract, receivePeriod, lease, rentalStartDate,isPreview,saveDb); + result = buildRentMonth(user, propertyContract, receivePeriod, lease, rentalStartDate,isPreview,saveDb); } //for (int i = 0; i < result.size(); i++) { // result.get(i).setPeriod(i+1);