diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index e488b3c49..867517dca 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -150,23 +150,11 @@ public class WxMerchant extends BaseEntity { } public String getBusinessName() { - if (businessId != null) { - EnumBusiness e = EnumBusiness.getEnum(businessId); - if (e != null) return e.getMessage(); - else return null; - } else { - return null; - } + return EnumBusiness.getEnumMessage(businessId); } public String getSubBusinessName() { - if (subBusinessId != null) { - EnumSubBusiness e = EnumSubBusiness.getEnum(subBusinessId); - if (e != null) return e.getMessage(); - else return null; - } else { - return null; - } + return EnumSubBusiness.getEnumMessage(subBusinessId); } @Transient diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java index bdf93e847..5da52d0ea 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java @@ -130,23 +130,11 @@ public class WxMerchantTradeDailyVo extends BaseEntity { } public String getBusinessName() { - if (businessId != null) { - EnumBusiness e = EnumBusiness.getEnum(businessId); - if (e != null) return e.getMessage(); - else return null; - } else { - return null; - } + return EnumBusiness.getEnumMessage(businessId); } public String getSubBusinessName() { - if (subBusinessId != null) { - EnumSubBusiness e = EnumSubBusiness.getEnum(subBusinessId); - if (e != null) return e.getMessage(); - else return null; - } else { - return null; - } + return EnumSubBusiness.getEnumMessage(subBusinessId); } } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java b/mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java index 0e52ff16b..c03e2e0b5 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java @@ -1,5 +1,8 @@ package com.iformall.enums; +import java.util.HashMap; +import java.util.Map; + /** * Created by Stormeye on 2018/08/09. */ @@ -21,16 +24,27 @@ public enum EnumBusiness { ; public static EnumBusiness getEnum(Integer code) { - for (EnumBusiness value : values()) { - if (value.getCode().equals(code)) { - return value; - } - } - return null; + if (code == null) return null; + return map.get(code); + } + + public static String getEnumMessage(Integer code) { + if (code == null) return null; + if (map.get(code) == null) + return null; + return map.get(code).getMessage(); } private Integer code; private String message; + private static Map map + = new HashMap(){ + { + for (EnumBusiness value : values()) { + map.put(value.code, value); + } + } + }; EnumBusiness(Integer code, String message) { this.code = code; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumSubBusiness.java b/mallinkService/src/main/java/com/iformall/enums/EnumSubBusiness.java index 69e5af42d..72cdd33ab 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumSubBusiness.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumSubBusiness.java @@ -1,5 +1,8 @@ package com.iformall.enums; +import java.util.HashMap; +import java.util.Map; + /** * Created by Stormeye on 2018/08/09. */ @@ -31,17 +34,29 @@ public enum EnumSubBusiness { public static EnumSubBusiness getEnum(Integer code) { - for (EnumSubBusiness value : values()) { - if (value.getCode().equals(code)) { - return value; - } - } - return null; + if (code == null) return null; + return map.get(code); + } + + public static String getEnumMessage(Integer code) { + if (code == null) return null; + if (map.get(code) == null) + return null; + return map.get(code).getMessage(); } private Integer code; private String message; + private static Map map + = new HashMap(){ + { + for (EnumSubBusiness value : values()) { + map.put(value.code, value); + } + } + }; + EnumSubBusiness(Integer code, String message) { this.code = code; this.message = message; diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml index 9c8968cf6..8b575598e 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml @@ -139,7 +139,8 @@ - and mtd.report_date between #{startTime} and #{endTime} + and mtd.report_date >= date_format(#{startTime},'%Y-%m-%d') + and mtd.report_date <= date_format(#{endTime},'%Y-%m-%d') order by ${sortColumns}