后台-用户信息管理-手机区号

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java

@@ -29,6 +29,7 @@ import com.accompany.common.utils.BlankUtil;
 import com.accompany.common.utils.CommonUtil;
 import com.accompany.common.utils.StringUtils;
 import com.accompany.core.exception.AdminServiceException;
+import com.accompany.core.exception.ServiceException;
 import com.accompany.core.model.*;
 import com.accompany.core.mybatismapper.UsersMapper;
 import com.accompany.core.service.account.AccountService;
@@ -206,14 +207,22 @@ public class UserCheckAdminService {
         return null;
     }
     @Transactional(rollbackFor = Exception.class)
-    public BusiResult saveUser(String nick, int gender, String avatar, Long uid, String phone, String email,
+    public Users saveUser(String nick, int gender, String avatar, Long uid, String phoneAreaCode, String phone, String email,
                                String photoUrls,String userDesc, Integer partitionId, Integer regionId) {
         Account account = accountService.getById(uid);
         if(account == null){
             //用户不存在
-            return new BusiResult(BusiStatus.USERNOTEXISTS);
+            throw new ServiceException(BusiStatus.USERNOTEXISTS);
+        }
+        if (StringUtils.isNotBlank(phoneAreaCode)){
+            account.setPhoneAreaCode(phoneAreaCode);
+        }
+        if (StringUtils.isNotBlank(phone)){
+            account.setPhone(phone);
+        }
+        if (StringUtils.isNotBlank(email)){
+            account.setEmail(email);
         }
-        account.setPhone(phone);
         accountService.updateById(account);
 
         boolean needChangePartition = false;
@@ -233,10 +242,16 @@ public class UserCheckAdminService {
         if (StringUtils.isNotBlank(avatar)) {
             users.setAvatar(avatar);
         }
+        if (StringUtils.isNotBlank(phoneAreaCode)){
+            users.setPhoneAreaCode(phoneAreaCode);
+        }
         if (StringUtils.isNotBlank(phone)) {
             // 如果传入不为空，则更新
             users.setPhone(phone);
         }
+        if (StringUtils.isNotBlank(email)) {
+            users.setEmail(email);
+        }
         users.setUserDesc(userDesc);
         users.setUpdateTime(new Date());
         needChangePartition = partitionId != null && !partitionId.equals(users.getPartitionId());
@@ -313,7 +328,7 @@ public class UserCheckAdminService {
             applicationContext.publishEvent(new UsersChangePartitionEvent(users));
         }
 
-        return BusiResult.success(users);
+        return users;
     }
     public BusiResult removePhone(String phone,Long uid){
         BusiResult<Account> busiResult = new BusiResult<>(BusiStatus.SUCCESS);

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCheckAdminController.java

@@ -11,8 +11,10 @@ import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.tencent.cos.TencentCosUploadService;
 import com.accompany.core.model.RegionInfo;
+import com.accompany.core.model.Users;
 import com.accompany.core.service.SysConfService;
 import com.accompany.core.service.account.AccountService;
+import com.accompany.core.service.phone.AreaInfoService;
 import com.accompany.core.service.region.RegionInfoService;
 import com.accompany.core.vo.UserVo;
 import com.alibaba.fastjson.JSONObject;
@@ -41,8 +43,10 @@ public class UserCheckAdminController extends BaseController {
     private AccountService accountService;
     @Autowired
     private RegionInfoService regionInfoService;
+    @Autowired
+    private AreaInfoService areaInfoService;
 
-    @GetMapping("/getlist")
+    @GetMapping("/list")
     public BusiResult<List<UsersAdminVo>> getList(String erbanNoList, Integer type) {
         if (StrUtil.isEmpty(erbanNoList)) {
             return new BusiResult<>(BusiStatus.PARAMETERILLEGAL);
@@ -77,9 +81,10 @@ public class UserCheckAdminController extends BaseController {
 
     @RequestMapping("/saveUser")
     @ResponseBody
-    public BusiResult saveUser(String nick, Integer gender, String avatar, Long uid, String phone, String email,
-                               String photoUrls, String userDesc, String msg, Boolean sendMsg, Integer partitionId, Integer regionId) {
-        return userCheckAdminService.saveUser(nick, gender, avatar, uid, phone, email, photoUrls, userDesc, partitionId, regionId);
+    public BusiResult<Users> saveUser(String nick, Integer gender, String avatar, Long uid, String phoneAreaCode, String phone, String email,
+                                      String photoUrls, String userDesc, String msg, Boolean sendMsg, Integer partitionId, Integer regionId) {
+        Users u = userCheckAdminService.saveUser(nick, gender, avatar, uid, phoneAreaCode, phone, email, photoUrls, userDesc, partitionId, regionId);
+        return BusiResult.success(u);
     }
 
     @RequestMapping("/removePhone")
@@ -107,6 +112,12 @@ public class UserCheckAdminController extends BaseController {
         }
     }
 
+    @GetMapping("/listPhoneAreaCode")
+    public BusiResult<List<String>> listPhoneAreaCode() {
+        List<String> list = areaInfoService.listPhoneAreaCode();
+        return BusiResult.success(list);
+    }
+
     @RequestMapping("/getDefaultNick")
     @ResponseBody
     public BusiResult saveDefaultNick() {

accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/AreaInfoService.java

@@ -26,4 +26,6 @@ public interface AreaInfoService extends IService<AreaInfo> {
      * 根据id查询AreaInfo
      */
     AreaInfo getAreaInfoById(Long id);
+
+    List<String> listPhoneAreaCode();
 }

accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/phone/impl/AreaInfoServiceImpl.java

@@ -8,6 +8,7 @@ import com.accompany.core.mybatismapper.AreaInfoMapper;
 import com.accompany.core.service.common.JedisService;
 import com.accompany.core.service.phone.AreaInfoService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
@@ -74,4 +75,11 @@ public class AreaInfoServiceImpl extends ServiceImpl<AreaInfoMapper, AreaInfo> i
         queryWrapper.lambda().eq(AreaInfo::getId, id);
         return getOne(queryWrapper);
     }
+
+    @Override
+    public List<String> listPhoneAreaCode() {
+        return list(Wrappers.<AreaInfo>lambdaQuery().select(AreaInfo::getPhoneAreaCode).orderByAsc(AreaInfo::getSeq))
+                .stream().map(AreaInfo::getPhoneAreaCode)
+                .collect(Collectors.toList());
+    }
 }