From ab4ea7b8f10c9b66aed9c2ea161a08b25c3851a7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 30 四月 2024 19:11:37 +0800
Subject: [PATCH] 2024.04新增内容

---
 meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java b/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java
index cc9fc5b..a03ce6f 100644
--- a/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java
+++ b/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java
@@ -1,6 +1,7 @@
 package com.sinata.rest.modular.member.controller;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -14,6 +15,7 @@
 import com.sinata.rest.modular.auth.util.AccountCheckUtil;
 import com.sinata.rest.modular.auth.util.JwtTokenUtil;
 import com.sinata.rest.modular.auth.util.ThreadPoolUtil;
+import com.sinata.rest.modular.mall.job.UserV3UpDownWork;
 import com.sinata.rest.modular.member.controller.common.body.BodyPwd;
 import com.sinata.rest.modular.member.controller.common.body.BodyRegister;
 import com.sinata.rest.modular.member.controller.common.body.BodyUser;
@@ -254,6 +256,7 @@
     @PostMapping(value = "/edit")
     @ApiOperation(value = "修改用户信息", notes = "字段有就传,没有就不传", response = RegisterVo.class)
     public Object editUser(@RequestBody BodyUser info, HttpServletRequest request) {
+        log.info("修改用户信息---------->:{}", info);
         /************************   拦截Token校验-begin   ******************************/
         // 验证用户ID
         int authCode = authUserId(request, info.userId);
@@ -270,6 +273,16 @@
         user.setNickName(info.nickname);
         user.setSex(info.gender);
         user.setBirthday(info.birthday);
+        if (StrUtil.isNotBlank(info.getCityCode())) {
+            String province = StrUtil.sub(info.getCityCode(), 0, 2) + "0000";
+            String city = StrUtil.sub(info.getCityCode(), 0, 4) + "00";
+            String county = info.getCityCode();
+
+            user.setCityCode(info.getCityCode());
+            user.setAgentProvinceCode(province);
+            user.setAgentCityCode(city);
+            user.setAgentCountyCode(county);
+        }
         //  user.setSignature(info.signature);
         // user.setAddress(info.address);
         userService.saveOrUpdate(user);

--
Gitblit v1.7.1