| @@ -26,9 +26,6 @@ import java.io.Serializable; | |||||
| public class WxScoreRules implements Serializable { | public class WxScoreRules implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| public static void main(String[] args) { | |||||
| System.out.println(defaultRules); | |||||
| } | |||||
| @Transient | @Transient | ||||
| private static final String defaultRules = | private static final String defaultRules = | ||||
| "[" + | "[" + | ||||
| @@ -241,4 +238,5 @@ public class WxScoreRules implements Serializable { | |||||
| this.setSortColumns(Field.valueOf(sortColumns)); | this.setSortColumns(Field.valueOf(sortColumns)); | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -12,11 +12,11 @@ public enum EnumBusiness { | |||||
| BUSINESS_ID3(3, "服饰"), | BUSINESS_ID3(3, "服饰"), | ||||
| BUSINESS_ID4(4, "亲子"), | BUSINESS_ID4(4, "亲子"), | ||||
| BUSINESS_ID5(5, "超市"), | BUSINESS_ID5(5, "超市"), | ||||
| BUSINESS_ID6(6, "家居"), | |||||
| BUSINESS_ID6(6, "其它"), | |||||
| BUSINESS_ID7(7, "美妆"), | BUSINESS_ID7(7, "美妆"), | ||||
| BUSINESS_ID8(8, "珠宝"), | BUSINESS_ID8(8, "珠宝"), | ||||
| BUSINESS_ID9(9, "服务"), | BUSINESS_ID9(9, "服务"), | ||||
| BUSINESS_ID10(10, "其他") | |||||
| BUSINESS_ID10(10, "家居") | |||||
| ; | ; | ||||
| @@ -285,7 +285,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { | |||||
| if (record.getBusinessId().equals(businessId1)) { | if (record.getBusinessId().equals(businessId1)) { | ||||
| busRule = bus; | busRule = bus; | ||||
| } | } | ||||
| if (businessId1.equals(EnumBusiness.BUSINESS_ID10.getCode())) { | |||||
| if (businessId1.equals(EnumBusiness.BUSINESS_ID6.getCode())) { | |||||
| busRuleOther = bus; | busRuleOther = bus; | ||||
| } | } | ||||
| } | } | ||||
| @@ -265,7 +265,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { | |||||
| if (businessId.equals(businessId1)) { | if (businessId.equals(businessId1)) { | ||||
| busRule = bus; | busRule = bus; | ||||
| } | } | ||||
| if (businessId1.equals(EnumBusiness.BUSINESS_ID10.getCode())) { | |||||
| if (businessId1.equals(EnumBusiness.BUSINESS_ID6.getCode())) { | |||||
| busRuleOther = bus; | busRuleOther = bus; | ||||
| } | } | ||||
| } | } | ||||