From dadf3208de99b46ecd8fa6a318c52821f45a5150 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sun, 27 Jan 2019 18:32:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[BUG][ID1000921][=E4=BA=91=E7=AB=AFversion:?= =?UTF-8?q?.554.721=EF=BC=9A=E8=A1=A5=E5=BD=95=E6=8F=90=E4=BA=A4=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E7=82=B9=E5=87=BB=E5=90=8C=E6=84=8F=E6=8A=A5500]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f27cb9afe..ff2d44b2d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -422,7 +422,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } } - public void buildRent(int lease, int receivePeriod, int price, Date startdate, int dayType, WxRentContract wxRentContract, long userId, WxMerchant wxMerchant) { + public void buildRent(int lease, int receivePeriod, int price, Date startdate, int dayType, WxRentContract wxRentContract, Long userId, WxMerchant wxMerchant) { int extralease = lease % receivePeriod; int extracount = extralease > 0 ? 1 : 0; From 5ba020fdc264faa4aaf7d27fd2d17894a68585d8 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sun, 27 Jan 2019 21:02:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[BUG][ID1000906][=E4=BA=91=E7=AB=AF?= =?UTF-8?q?=E6=B5=8B=E8=AF=95-version:.538.707=EF=BC=9A=E5=90=88=E5=90=8C?= =?UTF-8?q?=E4=B8=8B-=E7=A7=9F=E8=B5=81=E7=AD=BE=E7=BA=A6=E6=84=8F?= =?UTF-8?q?=E5=90=91=E5=90=88=E5=90=8C=E6=B2=A1=E6=9C=89=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=88=90=E5=8A=9F=EF=BC=8C=E5=9C=A8=E7=89=A9=E4=B8=9A=E5=8F=AF?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=87=BA=E6=9D=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxPropertyContractMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 1944d8556..4f18c2521 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -175,9 +175,9 @@ From 887b58ed015da2b533079675685269d08588639d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sun, 27 Jan 2019 22:17:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=88=A4=E6=96=AD=E8=AE=A1=E7=A7=9F?= =?UTF-8?q?=E5=91=A8=E6=9C=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxRentContractServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 ff2d44b2d..55e334614 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -143,10 +143,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (record.getStartDate().after(record.getRentalStartDate())) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR, "起租开始时间不能大于计租开始时间"); } + int dayType = record.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; + //计租开始时间 Calendar instance = Calendar.getInstance(); instance.setTime(record.getRentalStartDate()); - instance.add(Calendar.MONTH, record.getLease()); + instance.add(dayType, record.getLease()); instance.add(Calendar.DAY_OF_MONTH, -1); record.setRentalEndDate(instance.getTime()); //起租结束时间 @@ -248,9 +250,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (wxRentContract == null) { return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); } + int dayType = wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; + Calendar instance = Calendar.getInstance(); instance.setTime(record.getRentalStartDate()); - instance.add(Calendar.MONTH, record.getLease()); + instance.add(dayType, record.getLease()); instance.add(Calendar.DAY_OF_MONTH, -1); record.setRentalEndDate(instance.getTime()); @@ -316,7 +320,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillDeposit.setNeedPay(needpay); wxBillDeposit.setOwe(needpay); //找到计租方式 - int dayType = wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; + int dayType = wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; Date date = new Date(); Calendar instance = Calendar.getInstance(); From 20031fdd98affacbb4368f95dce7b927f1b36edb Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sun, 27 Jan 2019 22:18:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=88=A4=E6=96=AD=E8=AE=A1=E7=A7=9F?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=E5=8F=8A=E7=94=9F=E6=88=90=E8=B4=A6=E5=8D=95?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxPropertyContractServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 91adec163..8762b74da 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -104,7 +104,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService public ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName) { if (null == record.getShopId()) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "shopId不能为空"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "shopId不能为空"); } WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(record.getRentContractId()); @@ -117,7 +117,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } } if (null == record.getMerchantId()) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "merchantId不能为空"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "merchantId不能为空"); } WxMerchant merchant = wxMerchantMapper.selectByPrimaryKey(record.getMerchantId()); if (merchant == null) { @@ -152,7 +152,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (count > 0) { return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND); } - + int dayType = record.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; //保存物业合同信息 String message = ""; if (record.getId() == null) { @@ -161,7 +161,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService //计租开始时间 Calendar instance = Calendar.getInstance(); instance.setTime(record.getRentalStartDate()); - instance.add(Calendar.MONTH, record.getLease()); + instance.add(dayType, record.getLease()); instance.add(Calendar.DAY_OF_MONTH, -1); record.setRentalEndDate(instance.getTime()); //起租结束时间 @@ -191,7 +191,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } Calendar instance = Calendar.getInstance(); instance.setTime(record.getRentalStartDate()); - instance.add(Calendar.MONTH, record.getLease()); + instance.add(dayType, record.getLease()); instance.add(Calendar.DAY_OF_MONTH, -1); record.setRentalEndDate(instance.getTime()); //起租结束时间 @@ -247,10 +247,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService WxPropertyContract record = wxPropertyContractMapper.selectByPrimaryKey(id); if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) { - WxBillProperty wxBillProperty = new WxBillProperty(); - wxBillProperty.setMerchantId(record.getMerchantId()); - List> billPropertyList = wxBillPropertyMapper.queryBillPropertyList(wxBillProperty); - if (billPropertyList.size() == 0) { + //WxBillProperty wxBillProperty = new WxBillProperty(); + //wxBillProperty.setMerchantId(record.getMerchantId()); + //List> billPropertyList = wxBillPropertyMapper.queryBillPropertyList(wxBillProperty); + //if (billPropertyList.size() == 0) { WxMerchant wxMerchant = new WxMerchant(); wxMerchant.setId(record.getMerchantId()); wxMerchant.setTenantId(record.getTenantId()); @@ -258,7 +258,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService buildProperty(wxMerchant); //物业押金账单 buildDeposit(wxMerchant); - } + //} } return new ResultData(Result.SUCCESS, "操作成功"); }