From a9a5b61352ea2b6f62c93cd0f5c3d5b49227bdb3 Mon Sep 17 00:00:00 2001
From: luozukai <luozukai@okjiaoyu.cn>
Date: Sat, 27 Apr 2019 09:59:04 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E6=94=B6=E7=BC=B4?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iformall/service/impl/WxChartServiceImpl.java  | 14 +++++++-------
 .../main/resources/mapper/WxBillDepositMapper.xml  |  4 +---
 .../main/resources/mapper/WxBillOtherMapper.xml    |  7 ++-----
 .../main/resources/mapper/WxBillPropertyMapper.xml |  3 +--
 .../src/main/resources/mapper/WxBillRentMapper.xml |  3 +--
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
index e4bc84f64..df5b63a83 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
@@ -2399,7 +2399,7 @@ public class WxChartServiceImpl implements WxChartDataService {
             }
         } else {
             datamap.put("otherysje", 0);
-            datamap.put("otheryssje", 0);
+            datamap.put("otherssje", 0);
             datamap.put("otherzjsjl", 0);
         }
 
@@ -2408,7 +2408,7 @@ public class WxChartServiceImpl implements WxChartDataService {
         payinfo = wxBillRentMapper.queryOweInfo(params);
         if (payinfo != null) {
             BigDecimal owe = (BigDecimal) payinfo.get("owe");
-            totalOwe.add(owe);
+            totalOwe = totalOwe.add(owe);
             datamap.put("rentOwe", owe);
         } else {
             datamap.put("rentOwe", 0);
@@ -2417,7 +2417,7 @@ public class WxChartServiceImpl implements WxChartDataService {
         payinfo = wxBillPropertyMapper.queryOweInfo(params);
         if (payinfo != null) {
             BigDecimal owe = (BigDecimal) payinfo.get("owe");
-            totalOwe.add(owe);
+            totalOwe = totalOwe.add(owe);
             datamap.put("propertyOwe", owe);
         } else {
             datamap.put("propertyOwe", 0);
@@ -2426,7 +2426,7 @@ public class WxChartServiceImpl implements WxChartDataService {
         payinfo = wxBillOtherMapper.queryOweInfo(params);
         if (payinfo != null) {
             BigDecimal owe = (BigDecimal) payinfo.get("owe");
-            totalOwe.add(owe);
+            totalOwe = totalOwe.add(owe);
             datamap.put("otherOwe", owe);
         } else {
             datamap.put("otherOwe", 0);
@@ -2435,10 +2435,10 @@ public class WxChartServiceImpl implements WxChartDataService {
         payinfo = wxBillDepositMapper.queryOweInfoAll(params);
         if (payinfo != null) {
             BigDecimal owe = (BigDecimal) payinfo.get("owe");
-            totalOwe.add(owe);
-            datamap.put("depositOwe", owe);
+            totalOwe = totalOwe.add(owe);
+            datamap.put("totalOwe", owe);
         } else {
-            datamap.put("depositOwe", 0);
+            datamap.put("totalOwe", 0);
         }
         datamap.put("totalOwe", totalOwe);
 
diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
index e89f25808..88522578f 100644
--- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
@@ -112,7 +112,7 @@
 	</select>
 
 	<select id="queryOweInfoAll" resultType="hashmap" parameterType="hashmap">
-		select sum(res.owe) owe,res.tenant_id from
+		select IFNULL(round(sum(res.owe)/100,2),0) owe,res.tenant_id from
 		(
 		select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_rent_deposit
 		where tenant_id=#{tenantId} and date_format(receive_date,'%Y-%m')=#{receiveDate}
@@ -123,8 +123,6 @@
 		select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_other_deposit
 		where tenant_id=#{tenantId} and date_format(receive_date,'%Y-%m')=#{receiveDate}
 		) res
-		group by res.tenant_id
-
 	</select>
 
 	<update id="updateNotPaidStatus" parameterType="hashmap">
diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml
index 5b3e22327..10a7fa12d 100644
--- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml
@@ -99,23 +99,20 @@
 
 
 	<select id="queryPayInfoTotal" resultType="hashmap" parameterType="hashmap">
-		select sum(t.receivepay),receivepay,sum(t.pay) pay from
+		select round(sum(t.receivepay)/100,2) receivepay,round(sum(t.pay)/100,2) pay from
 	    (
 	    select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_other
 		where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate}
-		group by tenant_id
 		union
 		select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_daily
 		where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate}
-		group by tenant_id
 		) t
 	</select>
 
 
 	<select id="queryOweInfo" resultType="hashmap" parameterType="hashmap">
-		select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_other
+		select IFNULL(round(sum(owe)/100,2),0) owe,tenant_id from wx_bill_other
 		where status = 1 and tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate}
-		group by tenant_id
 	</select>
 	
 </mapper>
diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
index cdc4932fa..d2fb4c507 100644
--- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
@@ -128,9 +128,8 @@
 
 
 	<select id="queryOweInfo" resultType="hashmap" parameterType="hashmap">
-		select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_property
+		select IFNULL(round(sum(owe)/100,2),0) owe,tenant_id from wx_bill_property
 		where status = 1 and tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} and is_preview = 0
-		group by tenant_id
 	</select>
 	
 	<update id="updateNotPaidStatus" parameterType="hashmap">
diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
index 6eef85903..4ea0d0708 100644
--- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
@@ -131,9 +131,8 @@
 
 
 	<select id="queryOweInfo" resultType="hashmap" parameterType="hashmap">
-		select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_rent
+		select IFNULL(round(sum(owe)/100,2),0) owe,tenant_id from wx_bill_rent
 		where status = 1 and tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} and is_preview = 0
-		group by tenant_id
 	</select>
 	
 	<update id="updateNotPaidStatus" parameterType="hashmap">