From 3ea0c7c77d648a2461670a50390933e515c365b4 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 20 May 2019 17:04:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C=E4=BC=98=E5=8C=96][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=AE=8C=E5=96=84=E5=90=88=E5=90=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/WxBillAll.java | 18 ++++++++ .../impl/WxRentContractServiceImpl.java | 45 ++++++++++++++----- 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index c98104372..3012d792f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -104,6 +104,24 @@ public class WxBillAll extends BaseEntity { @Transient @SortColumn(column = "shopNumber") private String shopNumber; + @Transient + @SortColumn(column = "receivePay") + private Integer receivePay; + @Transient + @SortColumn(column = "pay") + private Integer pay; + @Transient + @SortColumn(column = "owe") + private Integer owe; + @Transient + @SortColumn(column = "receiveDate") + private String receiveDate; + @Transient + @SortColumn(column = "payDate") + private String payDate; + + + @Transient @io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay") 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 37ddf267a..01ab10361 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -156,6 +156,25 @@ public class WxRentContractServiceImpl implements WxRentContractService { } } + //m: init 租赁单价 + String rentInfo = wxRentContract.getRentInfo(); + if(StringUtils.isNotBlank(rentInfo)){ + JSONArray rentInfoArray = JSONArray.parseArray(rentInfo); + int size = rentInfoArray.size(); + //查询rent_info 包括shopId + for (int i = 0; i < size; i++) { + JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); + Double rentPrice = rentInfoObject.getDouble("rentPrice"); + Long price = wxRentContract.getPrice()/100; + if(rentPrice == null){ + Double rentArea = Double.parseDouble(wxRentContract.getRentArea()); + rentPrice = new BigDecimal((float)price/rentArea).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + rentInfoObject.put("rentPrice",rentPrice); + } + } + wxRentContract.setRentInfo(rentInfoArray.toJSONString()); + } + result.put("wxRentContract", wxRentContract); //关联的商户 if (wxRentContract.getMerchantId() != null) { @@ -222,7 +241,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { instance.setTime(record.getRentalStartDate()); instance.add(dayType, record.getLease()); instance.add(Calendar.DAY_OF_MONTH, -1); - record.setRentalEndDate(instance.getTime()); +// record.setRentalEndDate(instance.getTime()); //起租结束时间 if (!record.getStartDate().equals(record.getRentalStartDate())) { instance.clear(); @@ -407,17 +426,17 @@ public class WxRentContractServiceImpl implements WxRentContractService { instance.setTime(record.getRentalStartDate()); instance.add(dayType, record.getLease()); instance.add(Calendar.DAY_OF_MONTH, -1); - record.setRentalEndDate(instance.getTime()); + //record.setRentalEndDate(instance.getTime()); //起租结束时间 - if (!record.getStartDate().equals(record.getRentalStartDate())) { - instance.clear(); - instance.setTime(record.getRentalStartDate()); - instance.add(Calendar.DAY_OF_MONTH, -1); - record.setEndDate(instance.getTime()); - } else { - record.setEndDate(record.getStartDate()); - } +// if (!record.getStartDate().equals(record.getRentalStartDate())) { +// instance.clear(); +// instance.setTime(record.getRentalStartDate()); +// instance.add(Calendar.DAY_OF_MONTH, -1); +// record.setEndDate(instance.getTime()); +// } else { +// record.setEndDate(record.getStartDate()); +// } if (record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { BigDecimal hundred = new BigDecimal(100); @@ -709,6 +728,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (wxRentContract != null) { int receivePeriod = wxRentContract.getReceivePeriod().intValue(); Integer lease = wxRentContract.getLease(); +// int[] array = DateUtils.getDiff(wxRentContract.getRentalStartDate(),wxRentContract.getRentalEndDate()); +// Integer lease = array[0]; +// if(array[1] >0){ +// lease = array[0] +1; +// } + Date rentalStartDate = wxRentContract.getRentalStartDate(); Long price = wxRentContract.getPrice(); //按月计租