diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 7b0033e8d..168972fd9 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -80,7 +80,7 @@ public interface WxRentContractService { List buildRent(MallUserInfo user,WxRentContract rentContract,Integer isPreview,boolean saveDb); - void buildDeposit(MallUserInfo user,Long rentContractId); + void buildDeposit( TenantEntity tenantEntity,MallUserInfo user,Long rentContractId); Object getMerchants(WxRentContract wxRentContract); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 8da17e395..7cfed0803 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -943,7 +943,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Transactional(rollbackFor = {Exception.class}) @Override - public void buildDeposit( MallUserInfo user,Long rentContractId) { + public void buildDeposit( TenantEntity tenantEntity,MallUserInfo user,Long rentContractId) { WxRentContract wxRentContract = wxRentContractMapper.selectById(rentContractId); if (wxRentContract != null && StringUtils.isNotBlank(wxRentContract.getDeposit()) && new BigDecimal(wxRentContract.getDeposit()).compareTo(new BigDecimal(0)) > 0 ) { @@ -951,7 +951,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { Map feesMap = wxRentContract.getDepositEnergyFees(); WxEnergyFees fq = new WxEnergyFees(); - fq.updateTenantInfo(user); + fq.updateTenantInfo(tenantEntity); fq.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode()); Map typeMap = wxEnergyService.getFeesMap(fq); List insertList = new ArrayList(); @@ -1037,7 +1037,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { try { if (insertList.size() > 0 ) { - wxBillDepositMapper.insertBills(user.getTenantId(),insertList); + wxBillDepositMapper.insertBills(tenantEntity.getTenantId(),insertList); } } catch (Exception e) { logger.error("添加押金账单失败,e:" + e.getMessage()); @@ -2090,7 +2090,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { if(new BigDecimal(record.getDeposit()).compareTo(new BigDecimal(0)) > 0) { //押金 - buildDeposit( null, id); + buildDeposit(record, null, id); } //一起建立物业账单 if (buildProperyBill) {