Merge remote-tracking branch 'origin/dev' into dev

pz-admin/src/main/java/com/pz/web/controller/system/StoreGoodsController.java

@@ -2,7 +2,11 @@ package com.pz.web.controller.system;
 
 import java.util.List;
 import java.util.Arrays;
+import java.util.Optional;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.system.domain.StoreInfo;
+import com.pz.system.mapper.StoreInfoMapper;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
@@ -37,12 +41,15 @@ public class StoreGoodsController extends BaseController {
 
     private final IStoreGoodsService iStoreGoodsService;
 
+    private final StoreInfoMapper storeInfoMapper;
     /**
      * 查询商品列表
      */
     @SaCheckPermission("system:goods:list")
     @GetMapping("/list")
     public TableDataInfo<StoreGoodsVo> list(StoreGoodsBo bo, PageQuery pageQuery) {
+        Optional.ofNullable(storeInfoMapper.selectOne(Wrappers.<StoreInfo>lambdaQuery().eq(StoreInfo::getUid, getUserId())))
+            .ifPresent(storeInfo -> bo.setStoreId(storeInfo.getId()));
         return iStoreGoodsService.queryPageList(bo, pageQuery);
     }
 

pz-applet/src/main/java/com/pz/applet/AppletEmployeesController.java

@@ -78,7 +78,7 @@ public class AppletEmployeesController extends BaseController {
     @PostMapping("/add")
     public R<Void> add(@Validated(AddGroup.class) @RequestBody EmployeesCompanyBo bo, HttpServletRequest reques) {
         bo.setCityId(CityIdUtils.setCityIdPasInteger(reques));
-        bo.setUid(LoginHelper.getLoginUser().getUserId().intValue());
+        bo.setUid(getUserId().intValue());
         return toAjax(iEmployeesService.insertByEmployeesCompanyBo(bo));
     }
 

pz-applet/src/main/java/com/pz/applet/AppletSysUserController.java

@@ -72,8 +72,7 @@ public class AppletSysUserController extends BaseController {
      */
     @GetMapping("/getIdentity")
     public R<UserIdentityVo> getIdentity() {
-        LoginUser loginUser = LoginHelper.getLoginUser();
-        return R.ok(userService.checkUserIdentity(loginUser.getUserId().intValue()));
+        return R.ok(userService.checkUserIdentity(getUserId()));
     }
 
     /**

pz-common/src/main/java/com/pz/common/enums/UserType.java

@@ -20,6 +20,11 @@ public enum UserType {
     SYS_USER("sys_user"),
 
     /**
+     * 小程序用户
+     */
+    XCX_USER("xcx_user"),
+
+    /**
      * 陪诊员
      */
     APP_USER("app_user"),

pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java

@@ -146,37 +146,28 @@ public class EmployeesServiceImpl implements IEmployeesService {
 
     @Override
     public Boolean insertByEmployeesCompanyBo(EmployeesCompanyBo bo) {
-        /**
-         * 陪诊员新增
-         */
         SysUser sysUser = new SysUser();
         sysUser.setUserId(bo.getUid().longValue());
-        // sysUser.setPhonenumber(bo.getPhone());
-        if (bo.getIdentity() == 2) {
-            Employees add = BeanUtil.toBean(bo, Employees.class);
-            add.setNowType(1);
-
-            boolean flag = baseMapper.insert(add) > 0;
-            if (flag) {
-                bo.setId(add.getId());
-                // 修改系统表角色
-                sysUser.setUserType(UserType.APP_USER.getUserType());
-                sysUserMapper.updateById(sysUser);
-            }
-            return flag;
-        } else if (bo.getIdentity() == 3) {// 商户新增
-            Company add = BeanUtil.toBean(bo, Company.class);
 
-            boolean flag = companyMapper.insert(add) > 0;
-            if (flag) {
-                bo.setId(add.getId());
-                // 修改系统表角色
-                sysUser.setUserType(UserType.AMERCHANT_USER.getUserType());
-                sysUserMapper.updateById(sysUser);
-            }
-            return flag;
-        }
-        return false;
+        int res = 0;
+        switch (bo.getIdentity()) {
+            case 2:
+                //陪诊员
+                Employees employees = BeanUtil.toBean(bo, Employees.class);
+                employees.setNowType(1);
+                res = baseMapper.insert(employees);
+                break;
+            case 3:
+                //商户
+                Company company = BeanUtil.toBean(bo, Company.class);
+                res = companyMapper.insert(company);
+                break;
+
+            default:
+                // 处理其他身份的情况
+                break;
+        }
+        return res > 0;
     }
 
     /**

pz-system/src/main/java/com/pz/system/service/ISysUserService.java

@@ -218,6 +218,6 @@ public interface ISysUserService {
      */
     int deleteUserByIds(Long[] userIds);
 
-    UserIdentityVo checkUserIdentity(Integer userId);
+    UserIdentityVo checkUserIdentity(Long userId);
 
 }

pz-system/src/main/java/com/pz/system/service/SysLoginService.java

@@ -171,7 +171,7 @@ public class SysLoginService {
                 sysUser.setUserName(loginBo.getMobilePhone());
                 String nikeName = StringUtils.isNoneBlank(loginBo.getNikeName()) ? loginBo.getNikeName() : "用户" + RandomUtil.randomString(8);
                 sysUser.setNickName(nikeName);
-                sysUser.setUserType(UserType.SYS_USER.getUserType());
+                sysUser.setUserType(UserType.XCX_USER.getUserType());
                 sysUser.setSex("2");
                 // 初始密码为123456
                 sysUser.setPassword(BCrypt.hashpw("123456"));
@@ -271,7 +271,10 @@ public class SysLoginService {
         SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
             .select(SysUser::getUserName, SysUser::getStatus)
             .eq(SysUser::getUserName, username)
-            .eq(SysUser::getUserType, UserType.SYS_USER.getUserType()).or().eq(SysUser::getUserType, UserType.STORE_AMERCHANT_USER.getUserType()));
+            .and(con -> {
+                con.eq(SysUser::getUserType, UserType.SYS_USER.getUserType()).or().eq(SysUser::getUserType, UserType.STORE_AMERCHANT_USER.getUserType());
+            })
+        );
         if (ObjectUtil.isNull(user)) {
             log.info("登录用户：{} 不存在.", username);
             throw new UserException("user.not.exists", username);

pz-system/src/main/java/com/pz/system/service/impl/StoreApplyServiceImpl.java

@@ -156,7 +156,6 @@ public class StoreApplyServiceImpl implements IStoreApplyService {
                             sysUserRoleMapper.insert(sysUserRole);
                         }
                     );
-
                 });
         }
         return baseMapper.updateById(update) > 0;

pz-system/src/main/java/com/pz/system/service/impl/SysUserServiceImpl.java

@@ -26,6 +26,8 @@ import com.pz.common.utils.StreamUtils;
 import com.pz.common.utils.StringUtils;
 import com.pz.merchant.domain.Company;
 import com.pz.merchant.domain.Employees;
+import com.pz.merchant.domain.vo.CompanyVo;
+import com.pz.merchant.domain.vo.EmployeesVo;
 import com.pz.merchant.mapper.CompanyMapper;
 import com.pz.merchant.mapper.EmployeesMapper;
 import com.pz.system.domain.SysPost;
@@ -504,26 +506,34 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     }
 
     @Override
-    public UserIdentityVo checkUserIdentity(Integer userId) {
+    public UserIdentityVo checkUserIdentity(Long userId) {
         UserIdentityVo userIdentityVo = new UserIdentityVo();
         SysUser sysUser = baseMapper.selectById(userId);
-        if (null == sysUser) {
-            return userIdentityVo;
-        }
-        if (sysUser.getUserType().equals(UserType.SYS_USER.getUserType())) {
+        return Optional.ofNullable(sysUser)
+            .map(user -> {
+                //普通用户
+                if (user.getUserType().equals(UserType.XCX_USER.getUserType()) || user.getUserType().equals(UserType.SYS_USER.getUserType())) {
+                    // TODO: 2023/9/19 user.getUserType().equals(UserType.SYS_USER.getUserType()用于目前测试，测试结束清数据时再修改 
                     userIdentityVo.setUserType(1);
-        } else if (sysUser.getUserType().equals(UserType.APP_USER.getUserType())) {
-            Employees employees = employeesMapper.selectOne(new LambdaQueryWrapper<Employees>().eq(Employees::getUid, sysUser.getUserId()));
+                } else {
+                    //陪诊员用户
+                    EmployeesVo employeesVo = employeesMapper.selectVoOne(Wrappers.<Employees>lambdaQuery().eq(Employees::getUid, userId));
+                    if (employeesVo != null) {
                         userIdentityVo.setUserType(2);
-            userIdentityVo.setEmCmId(employees.getId());
-            userIdentityVo.setEmCmStatus(employees.getStatus());
-        } else if (sysUser.getUserType().equals(UserType.AMERCHANT_USER.getUserType())) {
-            Company company = companyMapper.selectOne(new LambdaQueryWrapper<Company>().eq(Company::getUid, sysUser.getUserId()));
+                        userIdentityVo.setEmCmStatus(employeesVo.getStatus());
+                    } else {
+                        //商家用户
+                        CompanyVo companyVo = companyMapper.selectVoOne(Wrappers.<Company>lambdaQuery().eq(Company::getUid, userId));
+                        if (companyVo != null) {
                             userIdentityVo.setUserType(3);
-            userIdentityVo.setEmCmId(company.getId());
-            userIdentityVo.setEmCmStatus(company.getStatus());
+                            userIdentityVo.setEmCmId(companyVo.getId());
+                            userIdentityVo.setEmCmStatus(companyVo.getStatus());
+                        }
+                    }
                 }
                 return userIdentityVo;
+            })
+            .orElseGet(() -> userIdentityVo);
     }
 
     @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId")