diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java b/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java index daf6b8be0..8ecda8385 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java @@ -43,7 +43,7 @@ public enum EnumFlowKey { CARD_ORDER_REFUND(31,"消费卡退款审批"), - FINANCE_RED(40,"收付款单红冲审核") + FINANCE_RED(40,"收付款单红冲审批") ; public static EnumFlowKey getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 3a04ad146..0b1efc1f3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -141,8 +141,9 @@ public class WxFlowServiceImpl implements WxFlowService { " ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '多经点位租金+物业合同签约', '19', '0', '" + nowTimestr + "', '" + nowTimestr + "', '11')," + " ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '多经点位租金+物业合同终止', '20', '0', '" + nowTimestr + "', '" + nowTimestr + "', '12')," + - " ( '" + idWorker.nextId() + "', '" + id3 + "', '" + tenantId + "', '账单应收金额变更', '8', '0', '" + nowTimestr + "', '" + nowTimestr + "', '1')," + - " ( '" + idWorker.nextId() + "', '" + id3 + "', '" + tenantId + "', '结算单审批', '21', '0', '" + nowTimestr + "', '" + nowTimestr + "', '2');"; + //" ( '" + idWorker.nextId() + "', '" + id3 + "', '" + tenantId + "', '账单应收金额变更', '8', '0', '" + nowTimestr + "', '" + nowTimestr + "', '1')," + + //" ( '" + idWorker.nextId() + "', '" + id3 + "', '" + tenantId + "', '结算单审批', '21', '0', '" + nowTimestr + "', '" + nowTimestr + "', '2')," + + " ( '" + idWorker.nextId() + "', '" + id3 + "', '" + tenantId + "', '收付款单红冲审批', '40', '0', '" + nowTimestr + "', '" + nowTimestr + "', '1');"; wxFlowConfigMapper.wxFlowConfigInit(initSql); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 7012de191..faccd7ce1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1545,15 +1545,15 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (null == wxRentContract) { return new ResultData(Result.ERROR,"id查询不到合同"); } - // 保存调整金额(预账单调整) - if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ - wxRentContract.setPreviewBillRentList(record.getPreviewBillRentList()); - savePreviewBill(wxRentContract,user); - //保存商业管理费账单 - savePreviewManageFeeBill(wxRentContract,user,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE); - //保存营业管理费账单 - savePreviewManageFeeBill(wxRentContract,user,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE); - } +// // 保存调整金额(预账单调整) +// if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ +// wxRentContract.setPreviewBillRentList(record.getPreviewBillRentList()); +// savePreviewBill(wxRentContract,user); +// //保存商业管理费账单 +// savePreviewManageFeeBill(wxRentContract,user,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE); +// //保存营业管理费账单 +// savePreviewManageFeeBill(wxRentContract,user,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE); +// } WxRentContract rc = new WxRentContract(); rc.setId(record.getId()); rc.setRentalStartDate(oldRentStartDate);