Browse Source

[合并修复][新增]

release_toaliyun_real
Stormeye Wu 7 years ago
parent
commit
5b1491ef72
2 changed files with 2 additions and 13 deletions
  1. +1
    -12
      mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java

+ 1
- 12
mallinkService/src/main/java/com/iformall/enums/EnumBusiness.java View File

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


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java View File

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


Loading…
Cancel
Save