Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
9ac32b4548
2 changed files with 5 additions and 5 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  2. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java View File

@@ -80,7 +80,7 @@ public interface WxRentContractService {

List<WxBillRent> 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);



+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -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<Long,String> feesMap = wxRentContract.getDepositEnergyFees();
WxEnergyFees fq = new WxEnergyFees();
fq.updateTenantInfo(user);
fq.updateTenantInfo(tenantEntity);
fq.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode());
Map<Long,WxEnergyFees> typeMap = wxEnergyService.getFeesMap(fq);
List<WxBillDeposit> insertList = new ArrayList<WxBillDeposit>();
@@ -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) {


Loading…
Cancel
Save