diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java index dcc37d055..ff0060e53 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java @@ -20,7 +20,7 @@ public interface WxBillDepositMapper extends CommonMapper { Map queryOweInfoAll(Map params); - Map queryPayInfoAll(Map params); + Map queryPayInfoAllTotal(Map params); void updateNotPaidStatus(Map params); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java index 4779434c1..f8fb1f900 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java @@ -19,7 +19,7 @@ public interface WxBillOtherMapper extends CommonMapper { List> queryBillList(WxBillOther record); - Map queryPayInfo(Map params); + Map queryPayInfoTotal(Map params); Map queryOweInfo(Map params); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java index 9d824f204..a26dd95cd 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java @@ -20,6 +20,8 @@ public interface WxBillPropertyMapper extends CommonMapper Map queryPayInfo(Map params); + Map queryPayInfoTotal(Map params); + Map queryOweInfo(Map params); void updateNotPaidStatus(Map params); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index 91f11f8ec..27dfd7120 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -18,6 +18,8 @@ public interface WxBillRentMapper extends CommonMapper { Map queryPayInfo(Map params); + Map queryPayInfoTotal(Map params); + Map queryOweInfo(Map params); void updateNotPaidStatus(Map params); 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 c813c3327..6a981b1a5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2294,6 +2294,12 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } + public static void main(String[] args) { + double a = 0.0; + System.out.println(a==0.0); + System.out.println(); + } + /** * 费用收缴数据 * @param tenantId @@ -2305,12 +2311,12 @@ public class WxChartServiceImpl implements WxChartDataService { startDate = DateUtils.getFirstDayForCurrMonth(startDate); Date endDate = DateUtils.getLastDayForMonth(startDate); - //租金收缴率 + //租金收缴率 ysje 应收金额 ssje 实收金额 zjsjl收缴率 Map params = new HashMap<>(); params.put("tenantId", tenantId); params.put("startdate", DateUtils.date2String(startDate,"yyyy-MM-dd") + " 00:00:00"); params.put("enddate", DateUtils.date2String(endDate,"yyyy-MM-dd") + " 23:59:59"); - Map payinfo = wxBillRentMapper.queryPayInfo(params); + Map payinfo = wxBillRentMapper.queryPayInfoTotal(params); if (payinfo != null) { BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); BigDecimal pay = (BigDecimal) payinfo.get("pay"); @@ -2332,7 +2338,7 @@ public class WxChartServiceImpl implements WxChartDataService { } //物业费收缴率 - payinfo = wxBillPropertyMapper.queryPayInfo(params); + payinfo = wxBillPropertyMapper.queryPayInfoTotal(params); if (payinfo != null) { BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); BigDecimal pay = (BigDecimal) payinfo.get("pay"); @@ -2354,7 +2360,7 @@ public class WxChartServiceImpl implements WxChartDataService { } //押金收缴率 - payinfo = wxBillDepositMapper.queryPayInfoAll(params); + payinfo = wxBillDepositMapper.queryPayInfoAllTotal(params); if (payinfo != null) { BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); BigDecimal pay = (BigDecimal) payinfo.get("pay"); @@ -2376,7 +2382,7 @@ public class WxChartServiceImpl implements WxChartDataService { } //其他费用收缴率 - payinfo = wxBillOtherMapper.queryPayInfo(params); + payinfo = wxBillOtherMapper.queryPayInfoTotal(params); if (payinfo != null) { BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); BigDecimal pay = (BigDecimal) payinfo.get("pay"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index db90f5fe7..c04c61451 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -114,6 +114,8 @@ public class WxTopicServiceImpl implements WxTopicService { String[] couponArray = couponId.split("-"); //保存coupon_channel WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(Long.parseLong(couponArray[1])); + if(wxCoupon == null) + System.out.println("------------"+couponArray[1]); WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setId(idWorker.nextId()); wxCouponChannel.setBeginTime(record.getBeginTime()); diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index cad85747a..36852a571 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -546,5 +546,6 @@ left join wx_merchant_shop ms on ms.`merchant_id` = m.id left join wx_shop ws on ms.`shop_id` = ws.id where m.status=1 and m.tenant_id = #{tenantId} + order by totalOwe desc diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index f94dd012a..e89f25808 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -97,19 +97,18 @@ group by tenant_id - select sum(res.receivepay) receivepay,sum(res.pay) pay,res.tenant_id from ( select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_rent_deposit - where tenant_id=#{tenantId} and date_format(receive_date,'%Y-%m')=#{receiveDate} + where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} union all select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_property_deposit - where tenant_id=#{tenantId} and date_format(receive_date,'%Y-%m')=#{receiveDate} + where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} union all select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_other_deposit - where tenant_id=#{tenantId} and date_format(receive_date,'%Y-%m')=#{receiveDate} + where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} ) res - group by res.tenant_id - select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_other - where tenant_id=#{tenantId} and date_format(receive_date,'%Y-%m')=#{receiveDate} + diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 11a3a555a..cdc4932fa 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -116,10 +116,17 @@ + + + + + + +