Explorar el Código

[BUG][修改][【ID1002325】测试环境:账单管理下-押金缴费一次性结清接口500]

release_toaliyun_real
gongbiao hace 6 años
padre
commit
3658c51762
Se han modificado 2 ficheros con 6 adiciones y 11 borrados
  1. +3
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
  2. +3
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java

+ 3
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java Ver fichero

@@ -128,23 +128,20 @@ public class WxBillDepositServiceImpl implements WxBillDepositService {
return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND);
} }
Long addpay = wxBillDeposit.getPay(); Long addpay = wxBillDeposit.getPay();
wxBillDeposit.setPayDate(record.getPayDate());
wxBillDeposit.setPay(record.getPay()); wxBillDeposit.setPay(record.getPay());
wxBillDeposit.setReceivePay(record.getReceivePay()); wxBillDeposit.setReceivePay(record.getReceivePay());
wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); wxBillDeposit.setOwe(record.getReceivePay()-record.getPay());
if (record.getPay().equals(record.getReceivePay())) { if (record.getPay().equals(record.getReceivePay())) {
wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode());
Date payDate = record.getPayDate();
Date receiveDate = wxBillDeposit.getReceiveDate(); Date receiveDate = wxBillDeposit.getReceiveDate();
wxBillDeposit.setExpiredDay(0L); wxBillDeposit.setExpiredDay(0L);
if (payDate.after(receiveDate)) {
int expiredDay = DateUtils.daysBetween(receiveDate, payDate);
if (date.after(receiveDate)) {
int expiredDay = DateUtils.daysBetween(receiveDate, date);
wxBillDeposit.setExpiredDay((long) expiredDay); wxBillDeposit.setExpiredDay((long) expiredDay);
} }
} }
wxBillDeposit.setPayDate(record.getPayDate());
wxBillDeposit.setPayDate(date);
wxBillDeposit.setUpdatetime(date); wxBillDeposit.setUpdatetime(date);
wxBillDeposit.setUpdatetime(new Date());
wxBillDeposit.setPayWay(record.getPayWay()); wxBillDeposit.setPayWay(record.getPayWay());
try { try {
wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit);


+ 3
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java Ver fichero

@@ -128,21 +128,19 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe
return new ResultData(ErrorCode.BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND); return new ResultData(ErrorCode.BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND);
} }
Long addpay = wxBillDeposit.getPay(); Long addpay = wxBillDeposit.getPay();
wxBillDeposit.setPayDate(record.getPayDate());
wxBillDeposit.setPay(record.getPay()); wxBillDeposit.setPay(record.getPay());
wxBillDeposit.setReceivePay(record.getReceivePay()); wxBillDeposit.setReceivePay(record.getReceivePay());
wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); wxBillDeposit.setOwe(record.getReceivePay()-record.getPay());
if (record.getPay().equals(record.getReceivePay())) { if (record.getPay().equals(record.getReceivePay())) {
wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode());
Date payDate = record.getPayDate();
Date receiveDate = wxBillDeposit.getReceiveDate(); Date receiveDate = wxBillDeposit.getReceiveDate();
wxBillDeposit.setExpiredDay(0L); wxBillDeposit.setExpiredDay(0L);
if (payDate.after(receiveDate)) {
int expiredDay = DateUtils.daysBetween(receiveDate, payDate);
if (date.after(receiveDate)) {
int expiredDay = DateUtils.daysBetween(receiveDate, date);
wxBillDeposit.setExpiredDay((long) expiredDay); wxBillDeposit.setExpiredDay((long) expiredDay);
} }
} }
wxBillDeposit.setPayDate(record.getPayDate());
wxBillDeposit.setPayDate(date);
wxBillDeposit.setUpdatetime(date); wxBillDeposit.setUpdatetime(date);
wxBillDeposit.setPayWay(record.getPayWay()); wxBillDeposit.setPayWay(record.getPayWay());
try { try {


Cargando…
Cancelar
Guardar