Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
1ef2ff6e15
3 changed files with 39 additions and 31 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumBillExtraCreateFrom.java
  2. +33
    -27
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java
  3. +5
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/enums/EnumBillExtraCreateFrom.java View File

@@ -6,7 +6,7 @@ package com.iformall.enums;
*/

public enum EnumBillExtraCreateFrom {
RNET_TIAODIAN_HUISUAN(1,"跳点租金合同汇算差额自动生成"),
RNET_TIAODIAN_HUISUAN(1,"跳点合同年度汇算差额自动生成"),
RNET_REVENUE_SALES(2,"录入销售额自动生成")
;



+ 33
- 27
mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java View File

@@ -303,33 +303,39 @@ public class WxEnergyServiceImpl implements WxEnergyService {
if (null == fees) {
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "记录未查询到");
}
if (fees.getIsSystem().intValue() == EnumYesOrNo.YES.getCode().intValue()) {
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "系统内置不能修改");
}
record.setUpdateTime(date);
wxEnergyFeesMapper.updateById(record);
//如果是预充的,则需处理管理科目
if (fees.getBillType().intValue() == EnumBillAllType.ADVANCE.getCode().intValue()) {
//先删掉之前的关联
WxEnergyFeesSetoff fd = new WxEnergyFeesSetoff();
fd.updateTenantInfo(record);
fd.setAdvanceFeesId(record.getId());
wxEnergyFeesSetoffMapper.deleteByAdvanceId(fd);
if (null != record.getFeesIds()) {
for (int i = 0 ; i < record.getFeesIds().size(); i++) {
Long feeid = record.getFeesIds().get(i);
WxEnergyFeesSetoff tf = new WxEnergyFeesSetoff();
tf.updateTenantInfo(record);
tf.setId(idWorker.nextId());
tf.setAdvanceFeesId(record.getId());
tf.setFeesId(feeid);
tf.setCreateTime(new Date());
tf.setUpdateTime(new Date());
wxEnergyFeesSetoffMapper.insert(tf);
}
}
if (fees.getIsSystem().intValue() == EnumYesOrNo.YES.getCode().intValue() && StringUtils.isNotBlank(record.getTaxRate())) {
WxEnergyFees updatefees = new WxEnergyFees();
updatefees.updateTenantInfo(record);
updatefees.setId(fees.getId());
updatefees.setTaxRate(record.getTaxRate());
updatefees.setUpdateTime(date);
wxEnergyFeesMapper.updateById(updatefees);;
}else {
record.setUpdateTime(date);
wxEnergyFeesMapper.updateById(record);
//如果是预充的,则需处理管理科目
if (fees.getBillType().intValue() == EnumBillAllType.ADVANCE.getCode().intValue()) {
//先删掉之前的关联
WxEnergyFeesSetoff fd = new WxEnergyFeesSetoff();
fd.updateTenantInfo(record);
fd.setAdvanceFeesId(record.getId());
wxEnergyFeesSetoffMapper.deleteByAdvanceId(fd);
if (null != record.getFeesIds()) {
for (int i = 0 ; i < record.getFeesIds().size(); i++) {
Long feeid = record.getFeesIds().get(i);
WxEnergyFeesSetoff tf = new WxEnergyFeesSetoff();
tf.updateTenantInfo(record);
tf.setId(idWorker.nextId());
tf.setAdvanceFeesId(record.getId());
tf.setFeesId(feeid);
tf.setCreateTime(new Date());
tf.setUpdateTime(new Date());
wxEnergyFeesSetoffMapper.insert(tf);
}
}
}
}
}
}


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

@@ -2604,8 +2604,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if (null != propertyContractId && null != propertyBill) {
propertyContract = wxPropertyContractMapper.selectById(propertyContractId);
//有可能物业的单价时间跟租金的不一致,需要根据物业的单价重新计算
propertyPrice = calcuteRentPropertyPrice(rentcontract, propertyContract, rentBill.getStarttime(), rentBill.getEndtime(),
new BigDecimal(propertyBill.getNeedPay()));
//propertyPrice = calcuteRentPropertyPrice(rentcontract, propertyContract, rentBill.getStarttime(), rentBill.getEndtime(),
//new BigDecimal(propertyBill.getNeedPay()));
}
}
//计算每一年的基数
@@ -2643,7 +2643,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if (null != operationManagerPriceArrs) {
rentTotal = rentTotal.add(new BigDecimal(operationManagerPriceArrs[yearIndex]));
}
rentTotal = rentTotal.add(propertyPrice);
if (null != propertyContractArrs) {
rentTotal = rentTotal.add(new BigDecimal(propertyContractArrs[yearIndex]));
}
//跟扣点相比较
BigDecimal priceDecimal = rentTotal;


Loading…
Cancel
Save