diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumSettleStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumSettleStatus.java index 8f7956ce3..946e51d77 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumSettleStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumSettleStatus.java @@ -6,7 +6,7 @@ package com.iformall.enums; public enum EnumSettleStatus { //0待确认1未清算结余金额2结算完成 DEF(0, "待确认"), - NOT_FINISH(7, "未清算结余金额"), + NOT_FINISH(7, "待清算"), FINISH(3, "结算完成"), ; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index b017769df..767bd2a20 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -280,7 +280,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { try { logger.info("更新结算单id:{}", JsonUtil.obj2Json(bill)); - WxBillSettle wxBillSettle = wxBillSettleService.getById((Long)bill.get("id"), EnumFilterSettle.NO.getCode()); + WxBillSettle wxBillSettle = wxBillSettleService.getById((Long)bill.get("id"), EnumFilterSettle.YES.getCode()); WxBillSettleRecord settleRecord = new WxBillSettleRecord(); settleRecord.setSettleId((Long)bill.get("id")); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 0b0715156..e6619d943 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -322,7 +322,24 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { } wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); }else{ - WxBillDaily wxBillRent = new WxBillDaily(); + WxBillDaily wxBillDaily = new WxBillDaily(); + wxBillDaily.setId(bill.getBillId()); + if(freezeStatus != null) wxBillDaily.setFreeze(freezeStatus); + if(status != null){ + wxBillDaily.setStatus(status); + wxBillDaily.setPayDate(new Date()); + } + if(EnumBillRentStatus.PAID.getCode().equals(status)){ + WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(wxBillDaily.getId()); + if(dbBill!=null) { + wxBillDaily.setPay(dbBill.getReceivePay()); + wxBillDaily.setPayDate(new Date()); + addBillAction(bill.getBillId(), dbBill.getReceivePay()); + } + } + wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); + + WxBillOther wxBillRent = new WxBillOther(); wxBillRent.setId(bill.getBillId()); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(status != null){ @@ -330,14 +347,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ - WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(wxBillRent.getId()); + WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId()); if(dbBill!=null) { wxBillRent.setPay(dbBill.getReceivePay()); wxBillRent.setPayDate(new Date()); addBillAction(bill.getBillId(), dbBill.getReceivePay()); } } - wxBillDailyMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); } } } @@ -404,7 +421,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { vo.setReceiveMoney(new BigDecimal(s.getReceiveMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP).toString()); vo.setPayMoney(new BigDecimal(s.getPayMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP).toString()); vo.setBalance(new BigDecimal(s.getReceiveMoney()).subtract(new BigDecimal(s.getPayMoney())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP).toString()); - vo.setSettletime(DateUtils.formatDateTime(s.getSettletime())); + vo.setSettletime(DateUtils.formatDateTime(s.getCreatetime())); vo.setStatus(EnumSettleStatus.getEnum(s.getStatus()).getMessage()); vo.setApplyStatus(EnumRentContractAppStatus.getEnum(s.getApplyStatus()).getMessage()); voList.add(vo);