Procházet zdrojové kódy

[修改][结算单][修改结算单]

release_toaliyun_real
luozukai před 6 roky
rodič
revize
8130387718
3 změnil soubory, kde provedl 23 přidání a 6 odebrání
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumSettleStatus.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  3. +21
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/enums/EnumSettleStatus.java Zobrazit soubor

@@ -6,7 +6,7 @@ package com.iformall.enums;
public enum EnumSettleStatus { public enum EnumSettleStatus {
//0待确认1未清算结余金额2结算完成 //0待确认1未清算结余金额2结算完成
DEF(0, "待确认"), DEF(0, "待确认"),
NOT_FINISH(7, "未清算结余金额"),
NOT_FINISH(7, "待清算"),
FINISH(3, "结算完成"), FINISH(3, "结算完成"),
; ;




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Zobrazit soubor

@@ -280,7 +280,7 @@ public class WxBillAllServiceImpl implements WxBillAllService {
try { try {
logger.info("更新结算单id:{}", JsonUtil.obj2Json(bill)); 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(); WxBillSettleRecord settleRecord = new WxBillSettleRecord();
settleRecord.setSettleId((Long)bill.get("id")); settleRecord.setSettleId((Long)bill.get("id"));


+ 21
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java Zobrazit soubor

@@ -322,7 +322,24 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
} }
wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent);
}else{ }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()); wxBillRent.setId(bill.getBillId());
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){ if(status != null){
@@ -330,14 +347,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(wxBillRent.getId());
WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
wxBillRent.setPay(dbBill.getReceivePay()); wxBillRent.setPay(dbBill.getReceivePay());
wxBillRent.setPayDate(new Date()); wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getReceivePay()); 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.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.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.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.setStatus(EnumSettleStatus.getEnum(s.getStatus()).getMessage());
vo.setApplyStatus(EnumRentContractAppStatus.getEnum(s.getApplyStatus()).getMessage()); vo.setApplyStatus(EnumRentContractAppStatus.getEnum(s.getApplyStatus()).getMessage());
voList.add(vo); voList.add(vo);


Načítá se…
Zrušit
Uložit