Преглед изворни кода

Merge tag 'refs/tags/jenkins-back-end-3097' into release

develop
release_toaliyun_real
gongbiao пре 6 година
родитељ
комит
600cecefc0
2 измењених фајлова са 7 додато и 7 уклоњено
  1. +6
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 6
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Прегледај датотеку

@@ -967,14 +967,14 @@ public class WxBillAllServiceImpl implements WxBillAllService {
wxBillRent.setUpdatetime(updateDate); wxBillRent.setUpdatetime(updateDate);
if (oldLatePrice != null) { if (oldLatePrice != null) {
wxBillRent.setLatePayPrice(newLatePrice); wxBillRent.setLatePayPrice(newLatePrice);
wxBillRent.setOwe(newPrice + wxBillRent.getServiceChargePay() + newLatePrice - wxBillRent.getPay());
wxBillRent.setOwe(newPrice + dbBill.getServiceChargePay() + newLatePrice - dbBill.getPay());
wxBillRentMapper.updateById(wxBillRent); wxBillRentMapper.updateById(wxBillRent);
addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, id, oldLatePrice, newLatePrice, user); addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, id, oldLatePrice, newLatePrice, user);
} else { } else {
//租赁账单更新 //租赁账单更新
wxBillRent.setReceivePay(newPrice); wxBillRent.setReceivePay(newPrice);
long latePayPrice = wxBillRent.getLatePayPrice() == null ? 0 : wxBillRent.getLatePayPrice();
wxBillRent.setOwe(newPrice + wxBillRent.getServiceChargePay() + latePayPrice - dbBill.getPay());
long latePayPrice = dbBill.getLatePayPrice() == null ? 0 : dbBill.getLatePayPrice();
wxBillRent.setOwe(newPrice + dbBill.getServiceChargePay() + latePayPrice - dbBill.getPay());
if (newPrice.equals(dbBill.getPay())) { if (newPrice.equals(dbBill.getPay())) {
wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode());
} }
@@ -1022,13 +1022,13 @@ public class WxBillAllServiceImpl implements WxBillAllService {
wxBillProperty.setUpdatetime(updateDate); wxBillProperty.setUpdatetime(updateDate);
if (oldLatePrice != null) { if (oldLatePrice != null) {
wxBillProperty.setLatePayPrice(newLatePrice); wxBillProperty.setLatePayPrice(newLatePrice);
wxBillProperty.setOwe(newPrice + wxBillProperty.getServiceChargePay() + newLatePrice - wxBillProperty.getPay());
wxBillProperty.setOwe(newPrice + dbBill.getServiceChargePay() + newLatePrice - dbBill.getPay());
wxBillPropertyMapper.updateById(wxBillProperty); wxBillPropertyMapper.updateById(wxBillProperty);
addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, id, oldLatePrice, newLatePrice, user); addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, id, oldLatePrice, newLatePrice, user);
} else { } else {
wxBillProperty.setReceivePay(newPrice); wxBillProperty.setReceivePay(newPrice);
long latePayPrice = wxBillProperty.getLatePayPrice() == null ? 0 : wxBillProperty.getLatePayPrice();
wxBillProperty.setOwe(newPrice + wxBillProperty.getServiceChargePay() + latePayPrice - dbBill.getPay());
long latePayPrice = dbBill.getLatePayPrice() == null ? 0 : dbBill.getLatePayPrice();
wxBillProperty.setOwe(newPrice + dbBill.getServiceChargePay() + latePayPrice - dbBill.getPay());
if (newPrice.equals(dbBill.getPay())) { if (newPrice.equals(dbBill.getPay())) {
wxBillProperty.setStatus(EnumBillRentStatus.PAID.getCode()); wxBillProperty.setStatus(EnumBillRentStatus.PAID.getCode());
} }


+ 1
- 1
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Прегледај датотеку

@@ -914,7 +914,7 @@
<select id="allDepositList" parameterType="com.iformall.domain.vo.WxBillAll" resultMap="allVoResultMap"> <select id="allDepositList" parameterType="com.iformall.domain.vo.WxBillAll" resultMap="allVoResultMap">
select bill.* select bill.*
from ( from (
select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 billTypeValue,'租赁押金','租赁押金'
select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 billTypeValue,'租赁押金'
billType,need_pay,receive_pay receivePay,pay,owe,receive_date receiveDate,pay_date,expired_day,status,freeze,0 billType,need_pay,receive_pay receivePay,pay,owe,receive_date receiveDate,pay_date,expired_day,status,freeze,0
late_pay_price,0 late_pay_price,0
service_charge_pay service_charge_pay


Loading…
Откажи
Сачувај