From 1686b84d99b135de847a5d20363c234725c100c1 Mon Sep 17 00:00:00 2001
From: gongbiao <gongbiao>
Date: Mon, 15 Oct 2018 14:11:32 +0800
Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86][?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E6=9F=A5=E8=AF=A2=E6=97=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=BE=85=E7=BC=B4=E7=8A=B6=E6=80=81]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/iformall/mapper/WxBillRentMapper.java |  2 ++
 .../service/impl/WxBillRentServiceImpl.java   | 34 ++++++++++++++-----
 .../resources/mapper/WxBillRentMapper.xml     |  8 +++++
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java
index f6ad75bdc..2294cb2d7 100644
--- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java
+++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java
@@ -19,4 +19,6 @@ public interface WxBillRentMapper extends CommonMapper<WxBillRent, String> {
 
     void updateNotPaidStatus(Map<String,Object> params);
 
+    void updateWaitPayStatus(Map<String,Object> params);
+
 }
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
index ba95187bc..cfab2842e 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
@@ -38,6 +38,8 @@ public class WxBillRentServiceImpl implements WxBillRentService {
     public PageInfo<Map<String, Object>> listAsPage(WxBillRent record, Integer pageIndex, Integer pageSize) {
         //更新逾期天数及状态
         updateNotPaidStatus(record);
+        //更新待缴的状态
+        updateWaidPayStatus(record);
         PageHelper.startPage(pageIndex, pageSize);
         List<Map<String, Object>> billRentList = wxBillRentMapper.queryBillRentList(record);
         PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(billRentList);
@@ -45,18 +47,34 @@ public class WxBillRentServiceImpl implements WxBillRentService {
         //return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillRentMapper.findList(record));
     }
 
+    @Transactional(rollbackFor = {Exception.class})
+    public void updateWaidPayStatus(WxBillRent record) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("tenantId", record.getTenantId());
+        params.put("waitPay", EnumBillRentStatus.WAIT_PAY.getCode());
+        params.put("paid", EnumBillRentStatus.PAID.getCode());
+
+        try {
+            wxBillRentMapper.updateWaitPayStatus(params);
+        } catch (Exception e) {
+            logger.error("更新租赁待缴账单状态失败,e:" + e.getMessage());
+            throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
+        }
+    }
+
+
     @Transactional(rollbackFor = {Exception.class})
     public void updateNotPaidStatus(WxBillRent record) {
-        Map<String,Object> params=new HashMap<>();
-        params.put("tenantId",record.getTenantId());
-        params.put("notPaid",EnumBillRentStatus.NOT_PAID);
-        params.put("paid",EnumBillRentStatus.PAID);
-        try{
+        Map<String, Object> params = new HashMap<>();
+        params.put("tenantId", record.getTenantId());
+        params.put("notPaid", EnumBillRentStatus.NOT_PAID.getCode());
+        params.put("paid", EnumBillRentStatus.PAID.getCode());
+        try {
             wxBillRentMapper.updateNotPaidStatus(params);
         } catch (Exception e) {
-        logger.error("更新租赁账单失败,e:" + e.getMessage());
-        throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
-    }
+            logger.error("更新租赁欠缴账单状态失败,e:" + e.getMessage());
+            throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
+        }
     }
 
     @Override
diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
index 7125e5257..af213ec50 100644
--- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
@@ -94,5 +94,13 @@
 		where tenant_id=#{tenantId} and status!=#{paid} and DATEDIFF(now(),receive_date)>0
 	</update>
 
+	<update id="updateWaitPayStatus" parameterType="hashmap">
+		update wx_bill_rent set STATUS=#{waitPay} where id in(
+		select br.id from (select br.id from wx_bill_rent br
+		left join wx_rent_contract rc on br.rent_contract_id=rc.id
+		where br.tenant_id=#{tenantId} and br.status!=#{notPaid} and now() &lt; br.receive_date
+		and DATE_ADD(now(),INTERVAL rc.receive_period MONTH)>receive_date) br)
+	</update>
+	
 
 </mapper>