From f813e77806384f0ee663f2f00f5755b633b74546 Mon Sep 17 00:00:00 2001 From: hanxueda Date: Thu, 4 Apr 2019 13:51:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E6=80=81=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxScoreRules.java | 4 +--- .../src/main/java/com/iformall/enums/EnumBusiness.java | 4 ++-- .../com/iformall/service/impl/WxCreditHistoryServiceImpl.java | 2 +- .../com/iformall/service/impl/WxScoreRulesServiceImpl.java | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java index cabb7517c..ff91974f6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java @@ -26,9 +26,6 @@ import java.io.Serializable; public class WxScoreRules implements Serializable { private static final long serialVersionUID = 1L; - public static void main(String[] args) { - System.out.println(defaultRules); - } @Transient private static final String defaultRules = "[" + @@ -241,4 +238,5 @@ public class WxScoreRules implements Serializable { this.setSortColumns(Field.valueOf(sortColumns)); } } + } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java b/mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java index 72a87a441..0e52ff16b 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java @@ -12,11 +12,11 @@ public enum EnumBusiness { BUSINESS_ID3(3, "服饰"), BUSINESS_ID4(4, "亲子"), BUSINESS_ID5(5, "超市"), - BUSINESS_ID6(6, "家居"), + BUSINESS_ID6(6, "其它"), BUSINESS_ID7(7, "美妆"), BUSINESS_ID8(8, "珠宝"), BUSINESS_ID9(9, "服务"), - BUSINESS_ID10(10, "其他") + BUSINESS_ID10(10, "家居") ; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 654d21d49..60397caea 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -285,7 +285,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { if (record.getBusinessId().equals(businessId1)) { busRule = bus; } - if (businessId1.equals(EnumBusiness.BUSINESS_ID10.getCode())) { + if (businessId1.equals(EnumBusiness.BUSINESS_ID6.getCode())) { busRuleOther = bus; } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 20c841a46..1a7629783 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -265,7 +265,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { if (businessId.equals(businessId1)) { busRule = bus; } - if (businessId1.equals(EnumBusiness.BUSINESS_ID10.getCode())) { + if (businessId1.equals(EnumBusiness.BUSINESS_ID6.getCode())) { busRuleOther = bus; } }