From d5a601e64c30e366134abfe9c6611ff98c7e6d35 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 28 Dec 2022 12:20:08 +0800 Subject: [PATCH 1/2] fix rentcontact --- .../service/impl/WxRentContractServiceImpl.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) 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 05606cf75..661b52dc9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -571,17 +571,27 @@ public class WxRentContractServiceImpl implements WxRentContractService { return resultData; } + boolean saveBill = true; if(CollectionUtils.isEmpty(record.getPreviewBillRentList())) { if (record.getReceivePeriod() != null && record.getLease() != null - && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getRevenueRatio().equals(0)) { + && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0)) { //删除预账单,重新生成 wxBillRentMapper.deletePreviewBill(record); - resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true); + + //联营扣点,不设置保底营业额,不生成账单 + if (EnumRentContractType.RENT_BY_JOINT.getCode().equals(record.getType()) && record.getRevenueRatio().equals(0)) { + //do nothing + saveBill = false; + }else { + resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true); + } } } //保存调整金额(预账单调整) - savePreviewBill(record); + if (saveBill) { + savePreviewBill(record); + } WxRentContract wxRentContract = (WxRentContract)resultData.data; wxRentContract.setPreviewBillRentList(resultList); From 1b677aaa4ca216fa28d6dd944e2381feb8be5f74 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 28 Dec 2022 12:32:24 +0800 Subject: [PATCH 2/2] fix bug --- .../service/impl/WxRentContractServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 661b52dc9..cd9af600b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -579,19 +579,19 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillRentMapper.deletePreviewBill(record); //联营扣点,不设置保底营业额,不生成账单 - if (EnumRentContractType.RENT_BY_JOINT.getCode().equals(record.getType()) && record.getRevenueRatio().equals(0)) { + //if (EnumRentContractType.RENT_BY_JOINT.getCode().equals(record.getType()) && record.getRevenueRatio().equals(0)) { //do nothing - saveBill = false; - }else { + // saveBill = false; + //}else { resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true); - } + //} } } //保存调整金额(预账单调整) - if (saveBill) { + //if (saveBill) { savePreviewBill(record); - } + //} WxRentContract wxRentContract = (WxRentContract)resultData.data; wxRentContract.setPreviewBillRentList(resultList);