| @@ -1358,13 +1358,14 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| wxFinanceReceiveMapper.updateStatus(record); | wxFinanceReceiveMapper.updateStatus(record); | ||||
| } | } | ||||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | |||||
| @Override | @Override | ||||
| public void redSetoffReceive(WxFinanceReceive record, MallUserInfo user) { | public void redSetoffReceive(WxFinanceReceive record, MallUserInfo user) { | ||||
| invalidReceive(record, user , true); | invalidReceive(record, user , true); | ||||
| copyRedSetOffReceive(record); | copyRedSetOffReceive(record); | ||||
| } | } | ||||
| private void copyRedSetOffReceive(WxFinanceReceive record) { | |||||
| public void copyRedSetOffReceive(WxFinanceReceive record) { | |||||
| Long oldRecordId = record.getId(); | Long oldRecordId = record.getId(); | ||||
| //新增一个红冲,金额是负数 | //新增一个红冲,金额是负数 | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| @@ -510,6 +510,8 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| WxFinanceReceive receive = wxFinanceService.getReceiveById(tenantEntity, Long.parseLong(businessId)); | WxFinanceReceive receive = wxFinanceService.getReceiveById(tenantEntity, Long.parseLong(businessId)); | ||||
| // 审批完成 | // 审批完成 | ||||
| if (EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { | if (EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { | ||||
| String remark = (String)mapInfo.get("remark"); | |||||
| receive.setRemark(StringUtils.trimToEmpty(receive.getRemark())+";"+remark); | |||||
| wxFinanceService.redSetoffReceive(receive, starterInfo); | wxFinanceService.redSetoffReceive(receive, starterInfo); | ||||
| }else if (EnumRentContractAppStatus.SETBACK.getCode().intValue() == applyStatus.intValue()) { | }else if (EnumRentContractAppStatus.SETBACK.getCode().intValue() == applyStatus.intValue()) { | ||||
| }else if(EnumRentContractAppStatus.REJECT.getCode().intValue() == applyStatus.intValue()){ | }else if(EnumRentContractAppStatus.REJECT.getCode().intValue() == applyStatus.intValue()){ | ||||