winter 1 год назад
Родитель
Сommit
9ac32b4548
2 измененных файлов: 5 добавлений и 5 удалений
  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 Просмотреть файл

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


List<WxBillRent> buildRent(MallUserInfo user,WxRentContract rentContract,Integer isPreview,boolean saveDb); 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); Object getMerchants(WxRentContract wxRentContract);




+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -943,7 +943,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
@Transactional(rollbackFor = {Exception.class}) @Transactional(rollbackFor = {Exception.class})
@Override @Override
public void buildDeposit( MallUserInfo user,Long rentContractId) {
public void buildDeposit( TenantEntity tenantEntity,MallUserInfo user,Long rentContractId) {
WxRentContract wxRentContract = wxRentContractMapper.selectById(rentContractId); WxRentContract wxRentContract = wxRentContractMapper.selectById(rentContractId);
if (wxRentContract != null && StringUtils.isNotBlank(wxRentContract.getDeposit()) if (wxRentContract != null && StringUtils.isNotBlank(wxRentContract.getDeposit())
&& new BigDecimal(wxRentContract.getDeposit()).compareTo(new BigDecimal(0)) > 0 ) { && new BigDecimal(wxRentContract.getDeposit()).compareTo(new BigDecimal(0)) > 0 ) {
@@ -951,7 +951,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
Map<Long,String> feesMap = wxRentContract.getDepositEnergyFees(); Map<Long,String> feesMap = wxRentContract.getDepositEnergyFees();
WxEnergyFees fq = new WxEnergyFees(); WxEnergyFees fq = new WxEnergyFees();
fq.updateTenantInfo(user);
fq.updateTenantInfo(tenantEntity);
fq.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode()); fq.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode());
Map<Long,WxEnergyFees> typeMap = wxEnergyService.getFeesMap(fq); Map<Long,WxEnergyFees> typeMap = wxEnergyService.getFeesMap(fq);
List<WxBillDeposit> insertList = new ArrayList<WxBillDeposit>(); List<WxBillDeposit> insertList = new ArrayList<WxBillDeposit>();
@@ -1037,7 +1037,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
try { try {
if (insertList.size() > 0 ) { if (insertList.size() > 0 ) {
wxBillDepositMapper.insertBills(user.getTenantId(),insertList);
wxBillDepositMapper.insertBills(tenantEntity.getTenantId(),insertList);
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("添加押金账单失败,e:" + e.getMessage()); logger.error("添加押金账单失败,e:" + e.getMessage());
@@ -2090,7 +2090,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if(new BigDecimal(record.getDeposit()).compareTo(new BigDecimal(0)) > 0) { if(new BigDecimal(record.getDeposit()).compareTo(new BigDecimal(0)) > 0) {
//押金 //押金
buildDeposit( null, id);
buildDeposit(record, null, id);
} }
//一起建立物业账单 //一起建立物业账单
if (buildProperyBill) { if (buildProperyBill) {


Загрузка…
Отмена
Сохранить