diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index fde116d79..5c6400c49 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -1,5 +1,7 @@ package com.iformall.domain.vo; +import io.swagger.models.auth.In; + import java.util.List; /** @@ -65,13 +67,13 @@ public class WxBillAll { @io.swagger.annotations.ApiModelProperty(value = "欠缴总额", name = "totalOwe") private Integer totalOwe; - private List billTypeList; + private List billTypeList; - public List getBillTypeList() { + public List getBillTypeList() { return billTypeList; } - public void setBillTypeList(List billTypeList) { + public void setBillTypeList(List billTypeList) { this.billTypeList = billTypeList; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillType.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillType.java index 9cb32c36c..fc7874cc6 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBillType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillType.java @@ -13,7 +13,7 @@ public enum EnumBillType { WATER(4, "水费"), POWER(5, "电费"), ROUTINE(6, "其他"), - AIR_CONDITIONING(7, "空调费"), + AIR_CONDITIONING(7, "空调费") ; public static EnumBillType getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillTypeStr.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillTypeStr.java index 9ab2c0a78..8df95a417 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBillTypeStr.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillTypeStr.java @@ -1,22 +1,23 @@ package com.iformall.enums; + /** * Created by Stormeye on 2018/08/09. */ public enum EnumBillTypeStr { - RENT("租金", "租金"), - RENT_D("租赁押金", "租赁押金"), - PROPERTY("物业费","物业费"), - PROPERTY_D("物业押金", "物业押金"), - W("水费", "水费"), - D("电费", "电费"), - K("空调费", "空调费"), - O("其他", "其他"), - O_D("其他押金", "其他押金"), + RENT(1, "租金"), + RENT_D(2, "租赁押金"), + PROPERTY(3,"物业费"), + PROPERTY_D(4, "物业押金"), + W(5, "水费"), + D(6, "电费"), + K(9, "空调费"), + O(7, "其他"), + O_D(8, "其他押金"), ; - public static EnumBillTypeStr getEnum(String code) { + public static EnumBillTypeStr getEnum(Integer code) { for (EnumBillTypeStr value : values()) { if (value.getCode().equals(code)) { return value; @@ -25,15 +26,15 @@ public enum EnumBillTypeStr { return null; } - private String code; + private Integer code; private String message; - EnumBillTypeStr(String String, String message) { + EnumBillTypeStr(Integer code, String message) { this.code = code; this.message = message; } - public String getCode() { + public Integer getCode() { return code; } 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 c470a1f46..f5c20e9c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2404,12 +2404,13 @@ public class WxChartServiceImpl implements WxChartDataService { WxBillAll wxBillAll = new WxBillAll(); wxBillAll.setTenantId(tenantId); wxBillAll.setMonth(new SimpleDateFormat("yyyy-MM").format(startDate)); - List billTypeList = new ArrayList<>(); + wxBillAll.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); + List billTypeList = new ArrayList<>(); billTypeList.add(EnumBillTypeStr.RENT.getCode()); wxBillAll.setBillTypeList(billTypeList); payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); if (payinfo != null) { - BigDecimal owe = (BigDecimal) payinfo.get("owe"); + BigDecimal owe = ((BigDecimal) payinfo.get("owe")).divide(new BigDecimal(100)); totalOwe = totalOwe.add(owe); datamap.put("rentOwe", owe); } else { @@ -2421,7 +2422,7 @@ public class WxChartServiceImpl implements WxChartDataService { wxBillAll.setBillTypeList(billTypeList); payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); if (payinfo != null) { - BigDecimal owe = (BigDecimal) payinfo.get("owe"); + BigDecimal owe = ((BigDecimal) payinfo.get("owe")).divide(new BigDecimal(100)); totalOwe = totalOwe.add(owe); datamap.put("propertyOwe", owe); } else { @@ -2435,7 +2436,7 @@ public class WxChartServiceImpl implements WxChartDataService { wxBillAll.setBillTypeList(billTypeList); payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); if (payinfo != null) { - BigDecimal owe = (BigDecimal) payinfo.get("owe"); + BigDecimal owe = ((BigDecimal) payinfo.get("owe")).divide(new BigDecimal(100)); totalOwe = totalOwe.add(owe); datamap.put("depositOwe", owe); } else { @@ -2447,9 +2448,10 @@ public class WxChartServiceImpl implements WxChartDataService { billTypeList.add(EnumBillTypeStr.W.getCode()); billTypeList.add(EnumBillTypeStr.K.getCode()); billTypeList.add(EnumBillTypeStr.O.getCode()); + wxBillAll.setBillTypeList(billTypeList); payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); if (payinfo != null) { - BigDecimal owe = (BigDecimal) payinfo.get("owe"); + BigDecimal owe = ((BigDecimal) payinfo.get("owe")).divide(new BigDecimal(100)); totalOwe = totalOwe.add(owe); datamap.put("otherOwe", owe); } else { diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index de2568bd7..d7a5a8e56 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -153,6 +153,13 @@ and bill.rent_shop_type = #{rentShopType} + + and bill.bill_type_value in + + #{type} + + +