| @@ -311,8 +311,8 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),EnumBillRentStatus.PAID.getCode()); | wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),EnumBillRentStatus.PAID.getCode()); | ||||
| }else if(EnumRentContractAppStatus.SETBACK.getCode().intValue() == applyStatus.intValue() || EnumRentContractAppStatus.REJECT.getCode().intValue() == applyStatus.intValue()) { | }else if(EnumRentContractAppStatus.SETBACK.getCode().intValue() == applyStatus.intValue() || EnumRentContractAppStatus.REJECT.getCode().intValue() == applyStatus.intValue()) { | ||||
| //解冻 | //解冻 | ||||
| wxBillSettleService.updateFreezeOrStatus(settle.getReceiveBillIds(), EnumFreezeType.DEF.getCode(),EnumBillRentStatus.PAID.getCode()); | |||||
| wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),EnumBillRentStatus.PAID.getCode()); | |||||
| wxBillSettleService.updateFreezeOrStatus(settle.getReceiveBillIds(), EnumFreezeType.DEF.getCode(),null); | |||||
| wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),null); | |||||
| } | } | ||||
| wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); | wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); | ||||
| } | } | ||||
| @@ -283,7 +283,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| ratioVo.setUseRatio("["); | ratioVo.setUseRatio("["); | ||||
| for (int i = 0; i < ratioList.size(); i++) { | for (int i = 0; i < ratioList.size(); i++) { | ||||
| BigDecimal revenue = new BigDecimal(revenueLong).divide(new BigDecimal(1000000)).setScale(4, RoundingMode.HALF_EVEN); | |||||
| BigDecimal revenue = new BigDecimal(revenueLong).divide(new BigDecimal(1000000)).setScale(8, RoundingMode.HALF_EVEN); | |||||
| String e = ratioList.get(i); | String e = ratioList.get(i); | ||||
| String[] array = e.split(":"); | String[] array = e.split(":"); | ||||
| Integer ratio = Integer.parseInt(array[1]); | Integer ratio = Integer.parseInt(array[1]); | ||||
| @@ -316,7 +316,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| if (revenue.compareTo(start) >= 0 && revenue.compareTo(end)<= 0){ | if (revenue.compareTo(start) >= 0 && revenue.compareTo(end)<= 0){ | ||||
| ratioVo.setRatio(ratio); | ratioVo.setRatio(ratio); | ||||
| ratioVo.setPrice(countPrice(ratioVo.getRatio(),revenueLong,timeType,period,from)); | ratioVo.setPrice(countPrice(ratioVo.getRatio(),revenueLong,timeType,period,from)); | ||||
| ratioVo.setUseRatio(ratioVo.getUseRatio()+e+","); | |||||
| ratioVo.setUseRatio(ratioVo.getUseRatio()+"'"+e+"',"); | |||||
| break; | break; | ||||
| } | } | ||||
| }else if(e.indexOf(">") >= 0){ | }else if(e.indexOf(">") >= 0){ | ||||
| @@ -343,7 +343,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| if (revenue.compareTo(end) >= 0){ | if (revenue.compareTo(end) >= 0){ | ||||
| ratioVo.setRatio(ratio); | ratioVo.setRatio(ratio); | ||||
| ratioVo.setUseRatio(ratioVo.getUseRatio()+e+","); | |||||
| ratioVo.setUseRatio(ratioVo.getUseRatio()+"'"+e+"',"); | |||||
| //计算超出部分 | //计算超出部分 | ||||
| BigDecimal payRatio = new BigDecimal(ratio).divide(new BigDecimal(10000)); | BigDecimal payRatio = new BigDecimal(ratio).divide(new BigDecimal(10000)); | ||||
| @@ -354,12 +354,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| Integer frontatio = Integer.parseInt(array[1]); | Integer frontatio = Integer.parseInt(array[1]); | ||||
| revenueArray = array[0].split("-"); | revenueArray = array[0].split("-"); | ||||
| BigDecimal frontEnd = new BigDecimal(0); | |||||
| BigDecimal frontEnd; | |||||
| if(EnumGetRatioFrom.BILL.getCode().equals(from)){ | if(EnumGetRatioFrom.BILL.getCode().equals(from)){ | ||||
| if(EnumMissTimeType.YEAR.getCode().equals(timeType)){ | if(EnumMissTimeType.YEAR.getCode().equals(timeType)){ | ||||
| frontEnd = new BigDecimal(revenueArray[1]).divide(new BigDecimal(365), 10, BigDecimal.ROUND_HALF_DOWN).multiply(new BigDecimal(dayCount)); | frontEnd = new BigDecimal(revenueArray[1]).divide(new BigDecimal(365), 10, BigDecimal.ROUND_HALF_DOWN).multiply(new BigDecimal(dayCount)); | ||||
| }else if(EnumMissTimeType.MONTH.getCode().equals(timeType)){ | }else if(EnumMissTimeType.MONTH.getCode().equals(timeType)){ | ||||
| frontEnd = new BigDecimal(revenueArray[1]).divide(new BigDecimal(30), 10, BigDecimal.ROUND_HALF_DOWN).multiply(new BigDecimal(dayCount)); | frontEnd = new BigDecimal(revenueArray[1]).divide(new BigDecimal(30), 10, BigDecimal.ROUND_HALF_DOWN).multiply(new BigDecimal(dayCount)); | ||||
| }else{ | |||||
| frontEnd = new BigDecimal(revenueArray[1]); | |||||
| } | } | ||||
| }else{ | }else{ | ||||
| frontEnd = new BigDecimal(revenueArray[1]); | frontEnd = new BigDecimal(revenueArray[1]); | ||||
| @@ -826,21 +826,22 @@ | |||||
| from ( | from ( | ||||
| select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金' | select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金' | ||||
| bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' | bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' | ||||
| endtime,rent_shop_type,shop_info,NULL comments,'' price_detail,updatetime from wx_bill_rent_deposit where | |||||
| endtime,rent_shop_type,shop_info,NULL comments,'' price_detail,updatetime,freeze from wx_bill_rent_deposit where | |||||
| tenant_id=#{tenantId} | tenant_id=#{tenantId} | ||||
| union all | union all | ||||
| select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 bill_type_value,'物业押金' | select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 bill_type_value,'物业押金' | ||||
| bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' | bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' | ||||
| endtime,rent_shop_type,shop_info,NULL comments,'' price_detail,updatetime from wx_bill_property_deposit where | |||||
| endtime,rent_shop_type,shop_info,NULL comments,'' price_detail,updatetime,freeze from wx_bill_property_deposit where | |||||
| tenant_id=#{tenantId} | tenant_id=#{tenantId} | ||||
| union all | union all | ||||
| select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,concat('其他押金-',comments) as | select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,concat('其他押金-',comments) as | ||||
| bill_type,0 as | bill_type,0 as | ||||
| need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime, | need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime, | ||||
| rent_shop_type,'[]' shop_info,comments,'' price_detail,updatetime | |||||
| rent_shop_type,'[]' shop_info,comments,'' price_detail,updatetime,freeze | |||||
| from wx_bill_other_deposit where tenant_id=#{tenantId} | from wx_bill_other_deposit where tenant_id=#{tenantId} | ||||
| ) bill | ) bill | ||||
| where 1=1 | where 1=1 | ||||
| <if test=" null != freeze"> and bill.freeze = #{freeze} </if> | |||||
| <if test=" null != status"> and bill.status = #{status} </if> | <if test=" null != status"> and bill.status = #{status} </if> | ||||
| <if test=" null != merchantId">and bill.merchant_id=#{merchantId}</if> | <if test=" null != merchantId">and bill.merchant_id=#{merchantId}</if> | ||||
| </select> | </select> | ||||