Просмотр исходного кода

[修改][结算单][修改跳点率计算]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
f88ac61be1
2 измененных файлов: 31 добавлений и 13 удалений
  1. +29
    -11
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java

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

@@ -930,18 +930,36 @@ public class WxBillAllServiceImpl implements WxBillAllService {
}
} else if (billType.equals(EnumBillTypeParam.RENT_DEPOSIT.getCode())) {
WxBillDeposit dbBill = wxBillDepositMapper.selectByPrimaryKey(id);
//租赁押金账单更新
WxBillDeposit wxBillDeposit = new WxBillDeposit();
wxBillDeposit.setId(id);
wxBillDeposit.setReceivePay(newPrice);
wxBillDeposit.setOwe(newPrice - dbBill.getPay());
if (newPrice.equals(dbBill.getPay())) {
wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode());
if(dbBill!=null) {
//租赁押金账单更新
WxBillDeposit wxBillDeposit = new WxBillDeposit();
wxBillDeposit.setId(id);
wxBillDeposit.setReceivePay(newPrice);
wxBillDeposit.setOwe(newPrice - dbBill.getPay());
if (newPrice.equals(dbBill.getPay())) {
wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode());
}
wxBillDeposit.setUpdatetime(updateDate);
wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit);
//账单日志
addBillAction(EnumBillAction.UPDATE_BILL, id, oldPrice, newPrice, user);
}

WxBillPropertyDeposit propertyDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(id);
if(propertyDeposit!=null){
//物业押金账单更新
WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit();
wxBillPropertyDeposit.setId(id);
wxBillPropertyDeposit.setReceivePay(newPrice);
wxBillPropertyDeposit.setOwe(newPrice - propertyDeposit.getPay());
if (newPrice.equals(propertyDeposit.getPay())) {
wxBillPropertyDeposit.setStatus(EnumBillRentStatus.PAID.getCode());
}
wxBillPropertyDeposit.setUpdatetime(updateDate);
wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillPropertyDeposit);
//账单日志
addBillAction(EnumBillAction.UPDATE_BILL, id, oldPrice, newPrice, user);
}
wxBillDeposit.setUpdatetime(updateDate);
wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit);
//账单日志
addBillAction(EnumBillAction.UPDATE_BILL, id, oldPrice, newPrice, user);
} else if (billType.equals(EnumBillTypeParam.PROPERTY.getCode())) {
WxBillProperty dbBill = wxBillPropertyMapper.selectByPrimaryKey(id);
//物业账单更新


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

@@ -213,7 +213,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {

WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit();
propertyDeposit.setId(bill.getBillId());
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus);
if(status != null){
propertyDeposit.setStatus(status);
propertyDeposit.setPayDate(new Date());
@@ -248,7 +248,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {

WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit();
propertyDeposit.setId(bill.getBillId());
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus);
if(status != null){
propertyDeposit.setStatus(status);
propertyDeposit.setPayDate(new Date());


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