diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/CompetitorBusinessCapacityEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/CompeteBusinessCapacityEnum.java similarity index 81% rename from coolstore-partner-common/src/main/java/com/cool/store/enums/point/CompetitorBusinessCapacityEnum.java rename to coolstore-partner-common/src/main/java/com/cool/store/enums/point/CompeteBusinessCapacityEnum.java index 59e76b45b..bb1212f8d 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/CompetitorBusinessCapacityEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/CompeteBusinessCapacityEnum.java @@ -2,11 +2,11 @@ package com.cool.store.enums.point; /** * @author zhangchenbiao - * @FileName: CompetitorBusinessCapacityEnum + * @FileName: CompeteBusinessCapacityEnum * @Description:竞争对手经营能力 * @date 2024-03-26 16:08 */ -public enum CompetitorBusinessCapacityEnum { +public enum CompeteBusinessCapacityEnum { // 1:非常好 2:好 3:一般 4:差 COMPETITOR_BUSINESS_CAPACITY_1(1, "非常好", 0), @@ -21,7 +21,7 @@ public enum CompetitorBusinessCapacityEnum { private Integer score; - CompetitorBusinessCapacityEnum(Integer code, String desc, Integer score) { + CompeteBusinessCapacityEnum(Integer code, String desc, Integer score) { this.code = code; this.desc = desc; this.score = score; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/CompetitorTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/CompeteTypeEnum.java similarity index 84% rename from coolstore-partner-common/src/main/java/com/cool/store/enums/point/CompetitorTypeEnum.java rename to coolstore-partner-common/src/main/java/com/cool/store/enums/point/CompeteTypeEnum.java index 040a1bff3..3beb01365 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/CompetitorTypeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/CompeteTypeEnum.java @@ -2,11 +2,11 @@ package com.cool.store.enums.point; /** * @author zhangchenbiao - * @FileName: CompetitorTypeEnum + * @FileName: CompeteTypeEnum * @Description:竞争对手性质 * @date 2024-03-26 16:08 */ -public enum CompetitorTypeEnum { +public enum CompeteTypeEnum { // 1:连锁店 2:强势单店 3:经营散户 4:小型摊贩 WANT_SHOP_SIZE_1(1, "连锁店", 1), @@ -21,7 +21,7 @@ public enum CompetitorTypeEnum { private Integer score; - CompetitorTypeEnum(Integer code, String desc, Integer score) { + CompeteTypeEnum(Integer code, String desc, Integer score) { this.code = code; this.desc = desc; this.score = score; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/NearCompetitorEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/NearCompeteEnum.java similarity index 86% rename from coolstore-partner-common/src/main/java/com/cool/store/enums/point/NearCompetitorEnum.java rename to coolstore-partner-common/src/main/java/com/cool/store/enums/point/NearCompeteEnum.java index 3c32aada0..49066ee7a 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/NearCompetitorEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/NearCompeteEnum.java @@ -2,11 +2,11 @@ package com.cool.store.enums.point; /** * @author zhangchenbiao - * @FileName: NearCompetitorEnum + * @FileName: NearCompeteEnum * @Description:周边(100m内)餐饮店 * @date 2024-03-26 16:08 */ -public enum NearCompetitorEnum { +public enum NearCompeteEnum { //1.品牌水果店2家以上 2.品牌水果店1家及以上 3.夫妻水果店1家及以上 4.无水果店 NEAR_COMPETITOR_1(1, "品牌水果店2家以上", 1), @@ -21,7 +21,7 @@ public enum NearCompetitorEnum { private Integer score; - NearCompetitorEnum(Integer code, String desc, Integer score) { + NearCompeteEnum(Integer code, String desc, Integer score) { this.code = code; this.desc = desc; this.score = score; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java index 64cfd239a..1d6354ec3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java @@ -30,6 +30,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.text.MessageFormat; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -69,7 +70,7 @@ public class CommonService { */ public String getUserIdByAreaAndUserRole(Long areaId, UserRoleEnum userRole){ //随机一个 - return enterpriseUserDAO.getUserInfoByUserIds(null).stream().findAny().get().getUserId(); + return enterpriseUserDAO.getUserInfoByUserIds(Arrays.asList("02012524481349484395", "123836131931284423")).stream().findAny().get().getUserId(); } public void sendMessage(List userIds, Long lineId, MessageEnum message, String... param){