| @@ -571,17 +571,27 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| return resultData; | return resultData; | ||||
| } | } | ||||
| boolean saveBill = true; | |||||
| if(CollectionUtils.isEmpty(record.getPreviewBillRentList())) { | if(CollectionUtils.isEmpty(record.getPreviewBillRentList())) { | ||||
| if (record.getReceivePeriod() != null && record.getLease() != null | 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); | 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 wxRentContract = (WxRentContract)resultData.data; | ||||
| wxRentContract.setPreviewBillRentList(resultList); | wxRentContract.setPreviewBillRentList(resultList); | ||||