productDev/funingyunwei.git

			@@ -89,7 +89,6 @@
			}else{
			model.setStatus(Constants.TWO);
			}
			model.setStatus(Constants.ZERO);//待执行
			model.setRemark(getRemarlByParam(model));
			ywContractMapper.insert(model);
			dealDetailListBiz(model);//处理条款信息
			@@ -316,16 +315,19 @@
			.replace("{param3}",DateUtil.getDateLongSlash(model.getBtDate()))
			.replace("{param4}",fee.compareTo(new BigDecimal(0)) >=0?"收":"付")
			.replace("{param5}",(fee.compareTo(new BigDecimal(0)) >=0?
			Constants.formatBigdecimal2Float(model.getBtFee()).intValue()
			:(Constants.formatBigdecimal2Float(model.getBtFee()).intValue() * -1))+"" );
			Constants.formatBigdecimal2Float(model.getBtFee())
			:(Constants.formatBigdecimal2Float(model.getBtFee()).multiply(new BigDecimal(-1)))).toString());
			return str;
			}
			private String getbackRentLogByParam(YwContract model) {
			BigDecimal fee = Constants.formatBigdecimal(model.getBtFee());
			String str = "【退租日{param1}，退租原因：{param2},退租协议中统计的费用总计{param3}元。】";
			String str = "【退租日{param1}，退租原因：{param2},退租协议中统计的费用总计需{param4}{param5}元。】";
			str = str.replace("{param1}",DateUtil.getDateLongSlash(model.getBtDate()))
			.replace("{param2}",StringUtils.defaultString(model.getBtInfo(),""))
			.replace("{param3}",Constants.formatBigdecimal2Float(model.getBtFee()).doubleValue()+"");
			.replace("{param4}",fee.compareTo(new BigDecimal(0)) >=0?"收":"付")
			.replace("{param5}",(fee.compareTo(new BigDecimal(0)) >=0?
			Constants.formatBigdecimal2Float(model.getBtFee())
			:(Constants.formatBigdecimal2Float(model.getBtFee()).multiply(new BigDecimal(-1)))).toString());
			return str;
			}

			@@ -397,6 +399,7 @@
			List<YwContractBill> noBills = new ArrayList<>();//不需要结算的账单
			List<YwContractBill> yjBills = new ArrayList<>();//押金账单
			List<YwContractBill> canBills = new ArrayList<>();//可退租修改数据
			Integer canBillCount = Constants.ZERO;
			List<YwContractBill> allBills = ywContractBillMapper.selectList(new QueryWrapper<YwContractBill>().
			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 = yw_contract_bill.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee " )
			@@ -418,6 +421,7 @@
			\|\|Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
			if(bill.getStartDate().getTime()<=param.getBtDate().getTime()){
			canBills.add(bill);
			canBillCount = canBillCount ++;
			}else{
			//如果还没开始，账单直接关闭
			closeBills.add(bill);
			@@ -429,9 +433,11 @@
			noBills.add(bill);
			}else{
			canBills.add(bill);
			canBillCount = canBillCount ++;
			}
			}else if(Constants.equalsInteger(bill.getPayStatus(),Constants.TWO) ){
			canBills.add(bill);
			canBillCount = canBillCount ++;
			}
			}
			}
			@@ -459,14 +465,15 @@
			if(fee.compareTo(new BigDecimal(0))== 0){
			//如果费用正好，则修改账单信息为已结清
			b.setPayStatus(Constants.ONE);
			canBillCount = canBillCount --;
			}else if(fee.compareTo(new BigDecimal(0))> 0){
			//如果需要进行退款，更新账单信息为待退款
			b.setPayStatus(Constants.FOUR);
			}else if(fee.compareTo(new BigDecimal(0)) < 0){
			//如果账单还有款待收，则保持状态不变
			}
			b.setReceivableFee(editBill.getReceivableFee());
			}
			b.setReceivableFee(editBill.getReceivableFee());
			b.setEditDate(param.getEditDate());
			b.setEditor(param.getEditor());
			b.setBtActDate(param.getBtActDate());
			@@ -485,7 +492,9 @@
			for(YwContractBill addBill : param.getAddBillList()){
			addBill.setIsdeleted(Constants.ZERO);
			addBill.setContractId(param.getId());
			addBill.setType(Constants.ONE);
			addBill.setCreateDate(new Date());
			addBill.setCreator(param.getEditor());
			addBill.setType(Constants.TWO);
			addBill.setStatus(Constants.ZERO);
			addBill.setTotleFee(addBill.getReceivableFee());
			addBill.setCompanyId(param.getCompanyId());
			@@ -546,7 +555,7 @@
			}
			}
			}
			param.setBtWaitBill(canBills.size() + newBills.size()+yjNoBills);//未清算的账单数量
			param.setBtWaitBill(canBillCount + newBills.size()+yjNoBills);//未清算的账单数量
			param.setBtCLoseBill(closeBills.size());
			param.setBtFee(totalBackFee);
			}
			@@ -698,13 +707,19 @@
			}
			int num =1;
			for(int i=0;i<billList1.size();i++){
			if(Constants.formatBigdecimal(billList1.get(i).getReceivableFee()).compareTo(new BigDecimal(0)) == 0){
			billList1.get(i).setPayStatus(Constants.ONE);
			}
			if(Constants.equalsInteger(billList1.get(i).getCostType(),Constants.ZERO)){
			billList1.get(i).setSortnum(num);
			num++;
			}
			}
			for(int i=0;i<billList2.size();i++){
			if(Constants.equalsInteger(billList1.get(i).getCostType(),Constants.ONE)) {
			if(Constants.formatBigdecimal(billList2.get(i).getReceivableFee()).compareTo(new BigDecimal(0)) == 0){
			billList2.get(i).setPayStatus(Constants.ONE);
			}
			if(Constants.equalsInteger(billList2.get(i).getCostType(),Constants.ONE)) {
			billList2.get(i).setSortnum(num);
			num++;
			}
			@@ -1326,9 +1341,13 @@
			if(model.getBillList()!=null && model.getBillList().size()>0){
			for(YwContractBill bill: model.getBillList()){
			//付款状态：0=待收款；1=已结清；2=部分结清；3=待付款；4=待退款；5=已关闭
			if( Constants.formatBigdecimal(bill.getReceivableFee()).compareTo(new BigDecimal(0)) ==0){
			//如果还没开始，账单直接关闭
			continue;
			}
			if(Constants.equalsInteger(bill.getPayStatus(),Constants.ZERO)
			\|\|Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
			if(bill.getStartDate().getTime()>nowEnd){
			if(bill.getStartDate().getTime()>nowEnd ){
			//如果还没开始，账单直接关闭
			continue;
			}