diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java index 2f7318c..9f71158 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java @@ -1773,10 +1773,15 @@ public class UserAppController { * 申请 * @return */ - @PostMapping(value = "/applyMarker") - public Result applyMarker(){ + @GetMapping(value = "/applyMarker") + public Result applyMarker(@RequestParam("code") String code){ UserApp userApp = userAppService.checkApiToken(); - userAppService.applyMarker(userApp); - return ResultGenerator.genSuccessResult("申请成功"); + try { + userAppService.applyMarker(userApp,code); + return ResultGenerator.genSuccessResult(); + } catch (Exception e) { + e.printStackTrace(); + } + return ResultGenerator.genFailResult("申请失败"); } } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/UserAppService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/UserAppService.java index e13816a..61e6fb1 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/UserAppService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/UserAppService.java @@ -400,7 +400,7 @@ public interface UserAppService extends IService { UserApp getUserAppByPhone(String phone, UserApp userApp); - void applyMarker(UserApp userApp); + void applyMarker(UserApp userApp,String code) throws Exception; } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java index cb46967..66f5474 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java @@ -1923,8 +1923,43 @@ public class UserAppServiceImpl extends ServiceImpl impl @Autowired @Lazy UserPromotionMapper userPromotionMapper; + + @Autowired + @Lazy + MerchantBaseInfoService merchantBaseInfoService; + + @Transactional(rollbackFor = Exception.class) @Override - public void applyMarker(UserApp userApp) { + public void applyMarker(UserApp userApp,String code) throws Exception{ + UserInfo userInfo=new UserInfo(); + userInfo.setId(userApp.getUserId()); + UserInfo userInfos= userInfoService.queryUserInfo(userInfo); + if(ObjectUtil.isEmpty(userInfos)){ + MsgException.checkNull(null,"用户信息不存在"); + } + + PhoneValidateCode phoneValidateCode = new PhoneValidateCode(); + phoneValidateCode.setPhone(userInfos.getPhone()); + phoneValidateCode = phoneValidateCodeService.queryPhoneValidateCode(phoneValidateCode); + + if (phoneValidateCode == null) { + throw new MsgException("无效的验证码!"); + } + + if (!phoneValidateCode.getCode().equalsIgnoreCase(code)) { + throw new MsgException("无效的验证码!"); + } + + MerchantBaseInfo baseInfo= merchantBaseInfoService.getMerchantBaseInfoByUserId(userInfos.getId().toString()); + if(ObjectUtil.isEmpty(baseInfo)){ + MsgException.checkNull(null,"商户信息不存在"); + } + + if(!"1".equals(baseInfo.getMerchantType())){ + MsgException.checkNull(null,"非小微不允许升级创客"); + } + + UserMarker marker= userMarkerMapper.selectById(userApp.getUserId()); if(ObjectUtil.isNotEmpty(marker)){