suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #6 into master from cc_20251203_bugfix

Browse Source 
feat:getPosToken

* cc_20251203_bugfix: (1 commits squashed)

  - feat:getPosToken

Signed-off-by: 苏竹红 <accounts_68551bf01395375227aee211@mail.teambition.com>
Merged-by: 苏竹红 <accounts_68551bf01395375227aee211@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/6
This commit is contained in:
苏竹红
2025-12-09 03:12:33 +00:00
parent 2237ed3f4a
commit d7c8dd21fd
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
View File

@@ -277,6 +277,7 @@ public enum ErrorCodeEnum {
USER_ACCOUNT_WAIT_AUDIT(151015, "账号信息等待审核",null), USER_ACCOUNT_WAIT_AUDIT(151015, "账号信息等待审核",null),
SHOP_HAVE_NOT_OVER_ACCORDING(1511014,"该加盟商下有未结束跟进的门店，请先结束门店",null), SHOP_HAVE_NOT_OVER_ACCORDING(1511014,"该加盟商下有未结束跟进的门店，请先结束门店",null),
MOBILE_NOT_EXIST(151016,"手机号不存在，请先维护手机号！",null), MOBILE_NOT_EXIST(151016,"手机号不存在，请先维护手机号！",null),
STORE_MOBILE_NOT_EXIST(151016,"门店营业手机号/电话不存在，请先维护手机号！",null),
IS_EXIST_CLAIM(1511018,"存在已认领的账单，不能删除门店",null), IS_EXIST_CLAIM(1511018,"存在已认领的账单，不能删除门店",null),
API_CALL_ERROR(1511020,"接口调用错误",null), API_CALL_ERROR(1511020,"接口调用错误",null),

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java
View File

@@ -213,8 +213,10 @@ public class PushServiceImpl implements PushService {
userRoleIds.contains(UserRoleEnum.SERVICE_PACKAGE_DEDICATED.getCode()) || userRoleIds.contains(UserRoleEnum.SERVICE_PACKAGE_DEDICATED.getCode()) ||
userRoleIds.contains(UserRoleEnum.REGION_MANAGER.getCode())) { userRoleIds.contains(UserRoleEnum.REGION_MANAGER.getCode())) {
StoreDO store = storeDao.getByStoreNum(dto.getShopCode()); StoreDO store = storeDao.getByStoreNum(dto.getShopCode());
if (store != null&&store.getTelephone()!=null){ if (store != null&&StringUtils.isNotEmpty(store.getTelephone())){
dto.setMobile(store.getTelephone()); dto.setMobile(store.getTelephone());
}else {
throw new ServiceException(ErrorCodeEnum.STORE_MOBILE_NOT_EXIST);
} }
} }
} }