From 6856d168c8bc64928ee3a00e900f8fb581103fb2 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 21 May 2019 19:18:05 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C=E4=BC=98=E5=8C=96][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=99=9A=E4=B8=8A=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 --- .../contract/WxRentContractController.java | 3 - .../service/impl/WxMerchantServiceImpl.java | 1 + .../impl/WxRentContractServiceImpl.java | 7 +-- .../main/resources/mapper/WxBillAllMapper.xml | 61 ++++++++----------- 4 files changed, 26 insertions(+), 46 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 7711ce3a3..63656bf29 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -53,12 +53,9 @@ public class WxRentContractController extends BaseController { @ApiImplicitParam(name = "endtDate", value = "结束时间", dataType = "string", paramType = "query", required = true)}) @SystemControllerLog(description = "获取两个时间相差,返回n月零n天") public ResultData getDateDiff(String startDate, String endDate) throws Exception{ - logger.debug("[" + getIpAddr() + "] WxRentContractController::getTimeDiff"); SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); Map map = new HashMap<>(); - int[] array = DateUtils.getDiff(sd.parse(startDate),sd.parse(endDate)); - map.put("month",array[0]); map.put("day",array[1]); return new ResultData(map); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 8da62d1cc..300f3e680 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -410,6 +410,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { } return new ResultData(Result.SUCCESS, "商户创建成功", merchantId); } catch (Exception e) { + e.printStackTrace(); logger.error("db failed: 商户创建失败, e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } 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 c834a656d..93bf26bbb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -743,11 +743,6 @@ 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(); @@ -1097,7 +1092,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //最后一期截止到结束日期 if(i == paycount - 1){ - if(wxRentContract.getRentalEndDate().after(wxBillRent.getEndtime())) { + if(wxBillRent.getEndtime().after(wxRentContract.getRentalEndDate())) { wxBillRent.setEndtime(wxRentContract.getRentalEndDate()); } diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 8561be3ec..aefea34a1 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -492,6 +492,22 @@ where m.status=1 + + and status !=6 + + and status = #{status} + + + and date_format(receive_date,'%Y-%m')=#{month} + + + and receive_date >= #{starttime} + + + and receive_date <= #{endtime} + + + +