| @@ -579,19 +579,19 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| wxBillRentMapper.deletePreviewBill(record); | 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 | //do nothing | ||||
| saveBill = false; | |||||
| }else { | |||||
| // saveBill = false; | |||||
| //}else { | |||||
| resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true); | resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true); | ||||
| } | |||||
| //} | |||||
| } | } | ||||
| } | } | ||||
| //保存调整金额(预账单调整) | //保存调整金额(预账单调整) | ||||
| if (saveBill) { | |||||
| //if (saveBill) { | |||||
| savePreviewBill(record); | savePreviewBill(record); | ||||
| } | |||||
| //} | |||||
| WxRentContract wxRentContract = (WxRentContract)resultData.data; | WxRentContract wxRentContract = (WxRentContract)resultData.data; | ||||
| wxRentContract.setPreviewBillRentList(resultList); | wxRentContract.setPreviewBillRentList(resultList); | ||||