From 5b1491ef72a6350ec5dce7e62bd935a3a1814d99 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 6 Dec 2018 11:42:15 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=B9=B6=E4=BF=AE=E5=A4=8D][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/enums/EnumBusiness.java | 13 +------------ .../service/impl/WxScoreRulesServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java b/mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java index aab2208ef..29cbcb08e 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java @@ -5,8 +5,7 @@ package com.iformall.enums; */ public enum EnumBusiness { -<<<<<<< HEAD - // 1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券 + // 0:无, 1:餐饮, 2:娱乐, 3:服饰, 4:亲子, 5:超市, 6:其他 BUSINESS_NULL(0, "无"), BUSINESS_ID1(1, "餐饮"), BUSINESS_ID2(2, "娱乐"), @@ -14,16 +13,6 @@ public enum EnumBusiness { BUSINESS_ID4(4, "亲子"), BUSINESS_ID5(5, "超市"), BUSINESS_ID6(6, "其他"), -======= - // 0:全部, 1:餐饮, 2:娱乐, 3:服饰, 4:亲子, 5:超市, 6:其他 - ALL(0, "全部"), - CATERING(1, "餐饮"), - ENTERTAINMENT(2, "娱乐"), - ATTIRE(3, "服饰"), - CHILD(4,"亲子"), - SUPERMARKET(5, "超市"), - OTHER(6, "其他") ->>>>>>> [成长值/消费][新增]:成长值/消费支持业态配置 ; public static EnumBusiness getEnum(Integer code) { 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 2501dbd89..8b9862bdb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -190,7 +190,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { if (businessId.equals(businessId1)) { busRule = bus; } - if (businessId1.equals(EnumBusiness.OTHER.getCode())) { + if (businessId1.equals(EnumBusiness.BUSINESS_ID6.getCode())) { busRuleOther = bus; } }