| @@ -437,6 +437,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| record.setShopIds(wxPropertyContract.getShopIds()); | record.setShopIds(wxPropertyContract.getShopIds()); | ||||
| record.setFeeStandards(wxPropertyContract.getFeesStardarsList()); | record.setFeeStandards(wxPropertyContract.getFeesStardarsList()); | ||||
| record.setShopNumbers(wxPropertyContract.getShopNumbers()); | record.setShopNumbers(wxPropertyContract.getShopNumbers()); | ||||
| record.setMerchantId(wxPropertyContract.getMerchantId()); | |||||
| List<WxAllBill> billList = buildProperty(new WxMerchant(),user,record,EnumIsPreview.YES.getCode(),true); | List<WxAllBill> billList = buildProperty(new WxMerchant(),user,record,EnumIsPreview.YES.getCode(),true); | ||||
| record.setPreviewBillRentList(billList); | record.setPreviewBillRentList(billList); | ||||
| } | } | ||||
| @@ -597,7 +598,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| return JSONObject.toJSONString(shopInfo); | return JSONObject.toJSONString(shopInfo); | ||||
| } | } | ||||
| public List<WxAllBill> buildRentMonth(WxMerchant wxMerchant, MallUserInfo user,WxPropertyContract wxPropertyContract, int receivePeriod, Integer lease, Date rentalStartDate,Integer isPreview,boolean saveDb) { | |||||
| public List<WxAllBill> buildRentMonth( MallUserInfo user,WxPropertyContract wxPropertyContract, int receivePeriod, Integer lease, Date rentalStartDate,Integer isPreview,boolean saveDb) { | |||||
| // | // | ||||
| Map<String, Object> shopInfo = new HashMap<>(); | Map<String, Object> shopInfo = new HashMap<>(); | ||||
| if (wxPropertyContract.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { | if (wxPropertyContract.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { | ||||
| @@ -662,13 +663,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| // } | // } | ||||
| yearList.add(startDate); | yearList.add(startDate); | ||||
| } | } | ||||
| Map<String, Object> resultMap = buildRent(receivePeriod, priceArr, yearList, wxPropertyContract.getReceivePeriodUnit(), wxPropertyContract, user, wxMerchant, billcount, isPreview, shopInfo,saveDb); | |||||
| Map<String, Object> resultMap = buildRent(receivePeriod, priceArr, yearList, wxPropertyContract.getReceivePeriodUnit(), wxPropertyContract, user, billcount, isPreview, shopInfo,saveDb); | |||||
| List<WxAllBill> billRentList = (List<WxAllBill>)resultMap.get("billList"); | List<WxAllBill> billRentList = (List<WxAllBill>)resultMap.get("billList"); | ||||
| resultList.addAll(billRentList); | resultList.addAll(billRentList); | ||||
| return resultList; | return resultList; | ||||
| } | } | ||||
| public Map<String, Object> buildRent(int receivePeriod,String[] priceArrs, List<Date> yearList,int dayType, WxPropertyContract wxPropertyContract, MallUserInfo user, WxMerchant wxMerchant, int billcount, Integer isPreview,Map<String, Object> shopInfo,boolean saveDb) { | |||||
| public Map<String, Object> buildRent(int receivePeriod,String[] priceArrs, List<Date> yearList,int dayType, WxPropertyContract wxPropertyContract, MallUserInfo user, int billcount, Integer isPreview,Map<String, Object> shopInfo,boolean saveDb) { | |||||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxPropertyContract); | WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxPropertyContract); | ||||
| SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); | SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); | ||||
| Map<String,Object> resultMap = new HashedMap(); | Map<String,Object> resultMap = new HashedMap(); | ||||
| @@ -1015,7 +1016,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| String price = propertyContract.getPrice(); | 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++) { | //for (int i = 0; i < result.size(); i++) { | ||||
| // result.get(i).setPeriod(i+1); | // result.get(i).setPeriod(i+1); | ||||