From 5f87395938fe7580e2db15ae246e79c6089a9585 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 24 Oct 2018 15:35:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E7=89=A9=E4=B8=9A=E8=B4=A6=E5=8D=95][=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E6=8A=BC=E9=87=91]:[=E4=BF=AE=E6=94=B9][=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/mapper/WxBillPropertyMapper.java | 2 +- .../mapper/WxPropertyContractMapper.java | 3 ++- .../WxBillPropertyDepositServiceImpl.java | 4 ++-- .../impl/WxBillPropertyServiceImpl.java | 6 +++--- .../mapper/WxBillPropertyDepositMapper.xml | 2 +- .../resources/mapper/WxBillPropertyMapper.xml | 2 +- .../mapper/WxPropertyContractMapper.xml | 20 +++++++++---------- 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java index ab450aecb..8302c7a91 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java @@ -13,7 +13,7 @@ public interface WxBillPropertyMapper extends CommonMapper findList(WxBillProperty wxBillProperty); - List> queryBillRentList(WxBillProperty record); + List> queryBillPropertyList(WxBillProperty record); Map queryPayInfo(Map params); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java index 009bced9d..d4c6b5ea3 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java @@ -2,6 +2,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxPropertyContract; +import com.iformall.domain.po.WxRentContract; import java.util.List; import java.util.Map; @@ -33,7 +34,7 @@ public interface WxPropertyContractMapper extends CommonMapper getRentContractList(String tenantId); + List getRentContractList(String tenantId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index c70e5b526..aa6cb289a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -54,7 +54,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe try { wxBillPropertyDepositMapper.updateWaitPayStatus(params); } catch (Exception e) { - logger.error("更新物业待缴账单状态失败,e:" + e.getMessage()); + logger.error("更新物业押金待缴账单状态失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } } @@ -69,7 +69,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe try { wxBillPropertyDepositMapper.updateNotPaidStatus(params); } catch (Exception e) { - logger.error("更新物业欠缴账单状态失败,e:" + e.getMessage()); + logger.error("更新物业押金欠缴账单状态失败,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/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 1505366d0..b3ceb4c73 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -38,7 +38,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { //更新待缴的状态 updateWaidPayStatus(record); PageHelper.startPage(pageIndex, pageSize); - List> billRentList = wxBillPropertyMapper.queryBillRentList(record); + List> billRentList = wxBillPropertyMapper.queryBillPropertyList(record); PageInfo> pageInfo = new PageInfo<>(billRentList); return pageInfo; } @@ -77,7 +77,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { public Map getById(Long id) { WxBillProperty record = new WxBillProperty(); record.setId(id); - return wxBillPropertyMapper.queryBillRentList(record).get(0); + return wxBillPropertyMapper.queryBillPropertyList(record).get(0); } @Override @@ -124,7 +124,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { public Object findByMerchantId(Long id) { WxBillProperty record = new WxBillProperty(); record.setMerchantId(id); - return wxBillPropertyMapper.queryBillRentList(record); + return wxBillPropertyMapper.queryBillPropertyList(record); } @Transactional(rollbackFor = {Exception.class}) diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index b703f532f..db8c02a0c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -58,7 +58,7 @@ - select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 402f55359..167e099f9 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -58,7 +58,7 @@ - select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 6d81edffa..a6a756849 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -97,46 +97,46 @@ order by rc.id desc - select count(id) from wx_property_contract where tenant_id=#{tenantId} and status=#{status} - select count(id) from wx_property_contract where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 - select count(id) from wx_property_contract where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and rental_start_date <= now() and rental_end_date >= now() - select count(id) from wx_property_contract where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and rental_end_date <now() - + update wx_property_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 - + update wx_property_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and rental_start_date <= now() and rental_end_date >= now() - + update wx_property_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and rental_end_date <now() - + update wx_property_contract set status=#{status} where tenant_id=#{tenantId} and status!=7 and merchant_id is null - + update wx_property_contract set status=#{status} where shop_id in ( select s.shop_id from (SELECT shop_id FROM wx_property_contract WHERE tenant_id = #{tenantId} and merchant_id is not null and status!=6 )s) and merchant_id is null and tenant_id=#{tenantId}