From d7c8dd21fd7f7b593abb77e8b95188e4dfe88f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 9 Dec 2025 03:12:33 +0000 Subject: [PATCH] Merge #6 into master from cc_20251203_bugfix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat:getPosToken * cc_20251203_bugfix: (1 commits squashed) - feat:getPosToken Signed-off-by: 苏竹红 Merged-by: 苏竹红 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/6 --- .../src/main/java/com/cool/store/enums/ErrorCodeEnum.java | 1 + .../java/com/cool/store/service/impl/PushServiceImpl.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 9cb364f57..426cd5a8a 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -277,6 +277,7 @@ public enum ErrorCodeEnum { USER_ACCOUNT_WAIT_AUDIT(151015, "账号信息等待审核",null), SHOP_HAVE_NOT_OVER_ACCORDING(1511014,"该加盟商下有未结束跟进的门店，请先结束门店",null), MOBILE_NOT_EXIST(151016,"手机号不存在，请先维护手机号！",null), + STORE_MOBILE_NOT_EXIST(151016,"门店营业手机号/电话不存在，请先维护手机号！",null), IS_EXIST_CLAIM(1511018,"存在已认领的账单，不能删除门店",null), API_CALL_ERROR(1511020,"接口调用错误",null), diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java index 5a8f2e806..3600b5acb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java @@ -213,8 +213,10 @@ public class PushServiceImpl implements PushService { userRoleIds.contains(UserRoleEnum.SERVICE_PACKAGE_DEDICATED.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_MANAGER.getCode())) { StoreDO store = storeDao.getByStoreNum(dto.getShopCode()); - if (store != null&&store.getTelephone()!=null){ + if (store != null&&StringUtils.isNotEmpty(store.getTelephone())){ dto.setMobile(store.getTelephone()); + }else { + throw new ServiceException(ErrorCodeEnum.STORE_MOBILE_NOT_EXIST); } } }