Browse Source

[业态][修复]:业态转文字优化

release_toaliyun_real
hupeng 6 years ago
parent
commit
06c38ebfac
5 changed files with 47 additions and 41 deletions
  1. +2
    -14
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  2. +2
    -14
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java
  3. +20
    -6
      mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java
  4. +21
    -6
      mallinkService/src/main/java/com/iformall/enums/EnumSubBusiness.java
  5. +2
    -1
      mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml

+ 2
- 14
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java View File

@@ -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


+ 2
- 14
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java View File

@@ -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);
}

}

+ 20
- 6
mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java View File

@@ -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<Integer,EnumBusiness> map
= new HashMap<Integer,EnumBusiness>(){
{
for (EnumBusiness value : values()) {
map.put(value.code, value);
}
}
};

EnumBusiness(Integer code, String message) {
this.code = code;


+ 21
- 6
mallinkService/src/main/java/com/iformall/enums/EnumSubBusiness.java View File

@@ -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<Integer,EnumSubBusiness> map
= new HashMap<Integer,EnumSubBusiness>(){
{
for (EnumSubBusiness value : values()) {
map.put(value.code, value);
}
}
};

EnumSubBusiness(Integer code, String message) {
this.code = code;
this.message = message;


+ 2
- 1
mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml View File

@@ -139,7 +139,8 @@
</if>
<if test=" null != startTime and null != endTime">
and mtd.report_date between #{startTime} and #{endTime}
and mtd.report_date &gt;= date_format(#{startTime},'%Y-%m-%d')
and mtd.report_date &lt;= date_format(#{endTime},'%Y-%m-%d')
</if>

<if test=" null != sortColumns"> order by ${sortColumns} </if>


Loading…
Cancel
Save