productDev/funingyunwei.git

			@@ -33,6 +33,7 @@
			import java.math.BigDecimal;
			import java.time.temporal.ChronoUnit;
			import java.util.*;
			import java.util.stream.Collectors;

			/**
			* 运维合同信息表Service实现
			@@ -311,6 +312,9 @@
			update.setBtFee(param.getBtFee());
			update.setBtRemark(getbackRentRemarkByParam(param));
			ywContractMapper.updateById(update);
			// if(1==1){
			// throw new BusinessException(ResponseStatus.NOT_ALLOWED);
			// }
			dealLogBiz(param,Constants.YwLogType.CONTRACT_BACK, param.getLoginUserInfo().getRealname(),getbackRentLogByParam(param));
			return param.getId();
			}
			@@ -348,7 +352,7 @@
			List<YwContractBill> canBills = new ArrayList<>();//可退租修改数据
			List<YwContractBill> allBills = ywContractBillMapper.selectList(new QueryWrapper<YwContractBill>().
			select("*," +
			"( select ifnull(sum(yw.ACT_RECEIVABLE_FEE),0) from yw_contract_revenue yw where yw.bill_id = yw_contract_bill.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee " )
			"( select ifnull(sum(case when yw.REVENUE_TYPE = 0 then yw.ACT_RECEIVABLE_FEE else -yw.ACT_RECEIVABLE_FEE end),0) from yw_contract_revenue yw where yw.bill_id = yw_contract_bill.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee " )
			.lambda().
			eq(YwContractBill::getIsdeleted,Constants.ZERO)
			.eq(YwContractBill::getContractId,param.getId()));
			@@ -365,15 +369,23 @@
			}
			if(Constants.equalsInteger(bill.getPayStatus(),Constants.ZERO)
			\|\|Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
			if(bill.getStartDate().getTime()>param.getEditDate().getTime()){
			if(bill.getStartDate().getTime()<param.getBtDate().getTime()){
			canBills.add(bill);
			}else{
			//如果还没开始，账单直接关闭
			closeBills.add(bill);
			noBills.add(bill);
			}else{
			canBills.add(bill);
			}
			// if(bill.getStartDate().getTime()>param.getEditDate().getTime()){
			// //如果还没开始，账单直接关闭
			// closeBills.add(bill);
			// noBills.add(bill);
			// }else{
			// canBills.add(bill);
			// }
			}else if(Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
			if(bill.getEndDate().getTime()<param.getEditDate().getTime()){
			if(bill.getStartDate().getTime()>param.getBtDate().getTime()){
			// if(bill.getEndDate().getTime()<param.getEditDate().getTime()){
			//如果已结清，账单直接关闭
			noBills.add(bill);
			}else{
			@@ -415,6 +427,7 @@
			//如果账单还有款待收，则保持状态不变
			}
			}
			b.setReceivableFee(editBill.getReceivableFee());
			b.setEditDate(param.getEditDate());
			b.setEditor(param.getEditor());
			b.setBtActDate(param.getBtActDate());
			@@ -467,26 +480,21 @@
			if(yjBills.size()>0){
			// 如果是押金或者保证金，不支持退款，保持原来的状态， 0=租赁费；1=物业费；2=租赁押金；3=物业押金；4=水电费；5=杂项费；6=其他;7=保证金
			for(YwContractBill bill : yjBills){
			if(!Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
			// YwContractBill b = new YwContractBill();
			// //付款状态：0=待收款；1=已结清；2=部分结清；3=待付款；4=待退款；5=已关闭
			// //如果账单信息做了编辑，金额计算实收金额和修改后应收金额作对比，判断是否应该退款
			// BigDecimal fee = Constants.formatBigdecimal(bill.getActReceivableFee()).subtract(bill.getReceivableFee());
			// if(fee.compareTo(new BigDecimal(0))== 0){
			// //如果费用正好，则修改账单信息为已结清
			// b.setPayStatus(Constants.ONE);
			// }else if(fee.compareTo(new BigDecimal(0))> 0){
			// //如果需要进行退款，更新账单信息为待退款
			// b.setPayStatus(Constants.FOUR);
			// }
			// b.setId(bill.getId());
			// b.setEditDate(param.getEditDate());
			// b.setEditor(param.getEditor());
			// b.setReceivableFee(BigDecimal.ZERO);
			// ywContractBillMapper.updateById(b);
			//如果是未结清押金
			yjNoBills ++;
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(param.getCanBackRentBills())){
			List<YwContractBill> optional = param.getCanBackRentBills().stream().filter(i->Constants.equalsInteger(bill.getId(),i.getId())).collect(Collectors.toList());
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(optional)){
			YwContractBill canBill = optional.get(Constants.ZERO);
			YwContractBill yjBill = new YwContractBill();
			yjBill.setId(bill.getId());
			yjBill.setEditDate(param.getEditDate());
			yjBill.setEditor(param.getEditor());
			yjBill.setReceivableFee(BigDecimal.ZERO);
			yjBill.setPayStatus(Constants.FOUR);
			yjBill.setPlanPayDate(canBill.getPlanPayDate());
			ywContractBillMapper.updateById(yjBill);
			}
			}
			yjNoBills ++;
			}
			}
			param.setBtWaitBill(canBills.size() + newBills.size()+yjNoBills);//未清算的账单数量
			@@ -1227,9 +1235,15 @@
			//查询账单集合
			model.setBillList(ywContractBillMapper.selectJoinList(YwContractBill.class,new MPJLambdaWrapper<YwContractBill>()
			.selectAll(YwContractBill.class )
			.select(" ( select ifnull(sum(case when yw.REVENUE_TYPE = 0 then yw.ACT_RECEIVABLE_FEE else -yw.ACT_RECEIVABLE_FEE end),0) from yw_contract_revenue yw where yw.bill_id = t.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee ")
			.eq( YwContractBill::getContractId,model.getId())
			.eq(YwContractBill::getIsdeleted,Constants.ZERO)
			.orderByAsc(YwContractBill::getSortnum,YwContractBill::getCreateDate)));

			for (YwContractBill ywContractBill:model.getBillList()) {
			ywContractBill.setNeedReceivableFee(ywContractBill.getReceivableFee().subtract(ywContractBill.getActReceivableFee()));
			}

			model.setCanBackRentBills(new ArrayList<>());
			long nowStart = Utils.Date.getStart(new Date()).getTime();
			long nowEnd = Utils.Date.getEnd(new Date()).getTime();