升级会员优化

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/SystemSettingController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 平台参数设置
  */
 @RestController
-@RequestMapping("/system/setting")
+@RequestMapping("/setting")
 public class SystemSettingController extends BaseController {
 
     @Autowired

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java

@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/wx/user")
+@RequestMapping("/user")
 public class UserMemberController extends BaseController {
 
     @Autowired
@@ -22,8 +22,7 @@ public class UserMemberController extends BaseController {
      * @throws Exception
      */
     @PostMapping("/login")
-    public AjaxResult login(
+    public AjaxResult login(@RequestParam(value = "code") String code) throws Exception {
-            @RequestParam(value = "code") String code) throws Exception {
         return AjaxResult.success(wxUserMemberService.login(code));
     }
 
@@ -37,7 +36,8 @@ public class UserMemberController extends BaseController {
      */
     @PostMapping("/upgradeMember")
     public AjaxResult upgradeMember(@RequestParam(value = "code") String code) throws Exception {
-        return wxUserMemberService.upgradeMember(code);
+        wxUserMemberService.upgradeMember(code);
+        return AjaxResult.success();
     }
 
     /**

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserMemberService.java

@@ -8,7 +8,7 @@ public interface IWxUserMemberService {
 
     LoginUserVo login(String code) throws Exception;
 
-    AjaxResult upgradeMember(String code) throws Exception;
+    void upgradeMember(String code) throws Exception;
 
     void updateUser(UserMemberUpdateVo userMemberUpdateVo);
 }

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java

@@ -43,9 +43,6 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
     @Autowired
     private RemoteAuthService remoteAuthService;
 
-    @Autowired
-    private RemoteUserService remoteUserService;
-
     @Autowired
     private RedisService redisService;
 
@@ -97,19 +94,13 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
     }
 
     @Override
-    public AjaxResult upgradeMember(String code) throws Exception {
+    public void upgradeMember(String code) throws Exception {
         WxCode2PhoneRet wxCode2PhoneRet = JSON.parseObject(MiniProgramUtils.getPhone(code), WxCode2PhoneRet.class);
         if (wxCode2PhoneRet.getErrcode() != 200) {
-            logger.error("用户手机号码获取失败");
+            logger.error("获取用户手机号码失败: ", wxCode2PhoneRet.getErrmsg());
-            return AjaxResult.error("手机号获取失败");
+            throw new ServiceException("获取用户手机号码失败");
-        }
-        String username = SecurityUtils.getLoginUser().getUsername();
-        if (StringUtils.isBlank(username)) {
-            logger.error("获取用户信息失败");
-            return AjaxResult.error("获取用户信息失败");
         }
         wxUserMemberMapper.upgradeMember(wxCode2PhoneRet.getPhoneInfo().getPhoneNumber(), SecurityUtils.getWxUserId().intValue());
-        return AjaxResult.success();
     }
 
     @Override