diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 79c2f1dab..6ad6e15d4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2234,17 +2234,24 @@ public class WxRentContractServiceImpl implements WxRentContractService { JSONObject jsonObject = JSONObject.parseObject(wxRentContract.getCashtypeContentLsit()); result.put("fitmentPledge",jsonObject.getString("fitmentPledge")); result.put("honourPledge",jsonObject.getString("honourPledge")); - result.put("honourPledgeUpper",PriceUtil.digitUppercase(Double.valueOf(jsonObject.getString("honourPledge")))); + if(StringUtils.isNotBlank(jsonObject.getString("honourPledge"))){ + result.put("honourPledgeUpper",PriceUtil.digitUppercase(Double.valueOf(jsonObject.getString("honourPledge")))); + } result.put("honourDuration",jsonObject.getString("honourDuration")); result.put("qualityPledge",jsonObject.getString("qualityPledge")); - result.put("honourPledgeUpper",PriceUtil.digitUppercase(Double.valueOf(jsonObject.getString("qualityPledge")))); + if(StringUtils.isNotBlank(jsonObject.getString("qualityPledge"))){ + result.put("honourPledgeUpper",PriceUtil.digitUppercase(Double.valueOf(jsonObject.getString("qualityPledge")))); + } result.put("qualityDuration",jsonObject.getString("qualityDuration")); } - //incrementStartDate//租金递增起始日期 + //[{"progressivePay": "", "tempAdjustRatio": "2021-11-30 00:00:00", "incrementStartDate": "2021-11-29T16:00:00.000Z", "increasingProportion": "1.78"}] + //incrementStartDate + //tempAdjustRatio//租金递增起始日期 //increasingProportion//租金递增比例 //progressivePay//递增租赁单价 String incrementStartDate = ""; + String tempAdjustRatio = ""; String increasingProportion = ""; String progressivePay = ""; if(StringUtils.isNotBlank(wxRentContract.getAdjustRatio())){ @@ -2252,6 +2259,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { if(array != null && array.size() > 0){ JSONObject jsonObject = array.getJSONObject(0); incrementStartDate = jsonObject.getString("incrementStartDate"); + tempAdjustRatio = jsonObject.getString("tempAdjustRatio"); increasingProportion = jsonObject.getString("increasingProportion"); progressivePay = jsonObject.getString("progressivePay"); } @@ -2275,9 +2283,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { result.put("oneRentalEndDateDay1",incrementStartDate.substring(8,10)); - result.put("oneRentalStartDateYear2",incrementStartDate.substring(0,4)); - result.put("oneRentalStartDateMonth2",incrementStartDate.substring(5,7)); - result.put("oneRentalStartDateDay2",incrementStartDate.substring(8,10)); + result.put("oneRentalStartDateYear2",tempAdjustRatio.substring(0,4)); + result.put("oneRentalStartDateMonth2",tempAdjustRatio.substring(5,7)); + result.put("oneRentalStartDateDay2",tempAdjustRatio.substring(8,10)); result.put("oneRentIncreasing2",increasingProportion); double priceRent2 = new BigDecimal(priceRent) .multiply(new BigDecimal(1).add(new BigDecimal(increasingProportion).divide(new BigDecimal(100)))) @@ -2294,7 +2302,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { }else if(EnumRentContractType.RENT_BY_JOINT.getCode().equals(type)){ - result.put("twoPayRatio1",wxRentContract.getPayRatio()); + Integer twoPayRatio1 = new BigDecimal(wxRentContract.getPayRatio()) + .divide(new BigDecimal(100)).intValue(); + result.put("twoPayRatio1",twoPayRatio1); result.put("twoPayDate",wxRentContract.getPayDate()); if(StringUtils.isNotBlank(incrementStartDate)){ result.put("twoRentalEndDateYear1",incrementStartDate.substring(0,4)); @@ -2306,7 +2316,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { result.put("twoRentalStartDateMonth2",incrementStartDate.substring(5,7)); result.put("twoRentalStartDateDay2",incrementStartDate.substring(8,10)); result.put("twoRentIncreasing2",increasingProportion); - result.put("twoPayRatio2",wxRentContract.getPayRatio()+Integer.parseInt(increasingProportion)); + result.put("twoPayRatio2",twoPayRatio1+Integer.parseInt(increasingProportion)); }else{ String rentalEndDate = DateUtils.date2String(wxRentContract.getRentalEndDate(), "yyyy-MM-dd");