美甲师登陆流程修改 线程变量保存登陆Seesion

src/main/java/com/gogirl/domain/store/store/StoreTechnician.java

@@ -33,6 +33,8 @@ public class StoreTechnician {
     @TableId(type = IdType.AUTO)
     private Integer id;
 
+    //兼容旧版本字段
+    @Deprecated
     @TableField(exist = false)
     private Integer technicianId;
 

src/main/java/com/gogirl/domain/store/store/StoreUser.java

 package com.gogirl.domain.store.store;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -15,9 +17,9 @@ import java.util.Date;
 @ApiModel("店铺员工")
 @Data
 @TableName("store_user")
-
 public class StoreUser {
 
+    @TableId(type = IdType.AUTO)
     private Integer id;
 
     @ApiModelProperty("员工编号")

src/main/java/com/gogirl/infrastructure/interceptor/SessionHandlerInterceptor.java

@@ -3,11 +3,15 @@ package com.gogirl.infrastructure.interceptor;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gogirl.application.user.customer.CustomerService;
 import com.gogirl.application.xcx.GogirlTokenService;
+import com.gogirl.domain.store.store.StoreManage;
 import com.gogirl.domain.store.store.StoreTechnician;
+import com.gogirl.domain.store.store.StoreUser;
 import com.gogirl.domain.user.Customer;
 import com.gogirl.domain.xcx.GogirlToken;
+import com.gogirl.infrastructure.common.util.StringUtils;
 import com.gogirl.infrastructure.mapper.store.StoreManageMapper;
 import com.gogirl.infrastructure.mapper.store.StoreTechnicianMapper;
+import com.gogirl.infrastructure.mapper.user.StoreUserMapper;
 import com.gogirl.infrastructure.util.SessionUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -27,6 +31,7 @@ public class SessionHandlerInterceptor implements HandlerInterceptor {
 
     private final StoreTechnicianMapper storeTechnicianMapper;
     private final StoreManageMapper storeManageMapper;
+    private final StoreUserMapper storeUserMapper;
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -44,12 +49,22 @@ public class SessionHandlerInterceptor implements HandlerInterceptor {
                 SessionUtils.putCustomer(customer);
             }
         }
+
         if (sourceFrom.equals("technician")) {
             GogirlToken gogirlToken = gogirlTokenService.getByToken(token);
             if (gogirlToken != null) {
                 StoreTechnician storeTechnician = storeTechnicianMapper.selectById(gogirlToken.getTechnicianId());
                 storeTechnician.setTechnicianId(storeTechnician.getId());
-                storeTechnician.setDepartmentId(gogirlToken.getDepartmentId());
+                StoreManage storeManage = storeManageMapper.selectById(gogirlToken.getDepartmentId());
+                if (StringUtils.isEmpty(storeTechnician.getJobs())) {
+                    StoreUser storeUser = storeUserMapper.selectById(storeTechnician.getId());
+                    storeTechnician.setJobs(storeUser.getJobs());
+                    storeTechnicianMapper.updateById(storeTechnician);
+                }
+                if (storeManage != null) {
+                    storeTechnician.setDepartmentId(gogirlToken.getDepartmentId());
+                    storeTechnician.setDepartmentName(storeManage.getName());
+                }
                 SessionUtils.putStoreTechnician(storeTechnician);
             }
         }

src/main/java/com/gogirl/infrastructure/mapper/user/StoreUserMapper.java

+package com.gogirl.infrastructure.mapper.user;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gogirl.domain.store.store.StoreUser;
+
+public interface StoreUserMapper extends BaseMapper<StoreUser> {
+}

src/main/java/com/gogirl/interfaces/xcx/XcxController.java

@@ -155,7 +155,11 @@ public class XcxController {
 
     @ApiOperation(value = "获取美甲师绑定的店铺")
     @GetMapping("/technician/xcx/getTechnicianShopList")
-    public JsonResult<List<StoreManage>> getTechnicianShopList() {
+    public JsonResult<List<StoreManage>> getTechnicianShopList(@RequestHeader String token) {
+        GogirlToken gogirlToken = gogirlTokenService.getByToken(token);
+        if (gogirlToken == null) {
+            throw new RRException(2000, "token失效，请重新登陆");
+        }
         List<StoreManage> storeManageList = storeManageService.getTechnicianShopList();
         return JsonResult.success(storeManageList);
     }