门店用户
This commit is contained in:
@ -1,6 +1,9 @@
|
||||
package com.ruoyi.baseUser.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.ruoyi.common.constant.UserConstants;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
@ -124,4 +127,21 @@ public class ZcBaseUserController extends BaseController
|
||||
{
|
||||
return toAjax(zcBaseUserService.deleteZcBaseUserByIds(ids));
|
||||
}
|
||||
|
||||
@PostMapping("/removeStore")
|
||||
@ResponseBody
|
||||
public AjaxResult removeStore(Long id) {
|
||||
try {
|
||||
// 验证参数
|
||||
if (id == null) {
|
||||
return AjaxResult.error("参数错误");
|
||||
}
|
||||
// 调用Service删除关联记录
|
||||
zcBaseUserService.deleteZcBaseUserStoreById(id);
|
||||
return AjaxResult.success("删除成功");
|
||||
} catch (Exception e) {
|
||||
logger.error("删除用户门店关联记录失败", e);
|
||||
return AjaxResult.error("删除失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -24,11 +24,9 @@ public class ZcBaseUser extends BaseEntity
|
||||
private String userName;
|
||||
|
||||
/** 头像 */
|
||||
@Excel(name = "头像")
|
||||
private String avatarUrl;
|
||||
|
||||
/** 密码 */
|
||||
@Excel(name = "密码")
|
||||
private String password;
|
||||
|
||||
/** 手机号 */
|
||||
|
||||
@ -28,6 +28,9 @@ public interface ZcBaseUserMapper
|
||||
*/
|
||||
public List<ZcBaseUser> selectZcBaseUserList(ZcBaseUser zcBaseUser);
|
||||
|
||||
public List<ZcBaseUser> selectZcBaseUserByStoreId(Long storeId);
|
||||
|
||||
public ZcBaseUser selectZcBaseUserByPhone(String phone);
|
||||
/**
|
||||
* 新增租车用户信息
|
||||
*
|
||||
@ -84,4 +87,6 @@ public interface ZcBaseUserMapper
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteZcBaseUserStoreByUserId(Long id);
|
||||
|
||||
public int deleteZcBaseUserStoreById(Long id);
|
||||
}
|
||||
|
||||
@ -27,6 +27,9 @@ public interface IZcBaseUserService
|
||||
*/
|
||||
public List<ZcBaseUser> selectZcBaseUserList(ZcBaseUser zcBaseUser);
|
||||
|
||||
|
||||
public List<ZcBaseUser> selectZcBaseUserByStoreId(Long storeId);
|
||||
|
||||
/**
|
||||
* 新增租车用户信息
|
||||
*
|
||||
@ -58,4 +61,6 @@ public interface IZcBaseUserService
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteZcBaseUserById(Long id);
|
||||
|
||||
public int deleteZcBaseUserStoreById(Long id);
|
||||
}
|
||||
|
||||
@ -52,6 +52,11 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService
|
||||
return zcBaseUserMapper.selectZcBaseUserList(zcBaseUser);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ZcBaseUser> selectZcBaseUserByStoreId(Long storeId){
|
||||
return zcBaseUserMapper.selectZcBaseUserByStoreId(storeId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增租车用户信息
|
||||
*
|
||||
@ -62,13 +67,28 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService
|
||||
@Override
|
||||
public int insertZcBaseUser(ZcBaseUser zcBaseUser)
|
||||
{
|
||||
String md5Hexpwd = DigestUtils.md5Hex(zcBaseUser.getPassword());
|
||||
zcBaseUser.setPassword(md5Hexpwd);
|
||||
zcBaseUser.setIsStore(1L);
|
||||
zcBaseUser.setCreateTime(DateUtils.getNowDate());
|
||||
int rows = zcBaseUserMapper.insertZcBaseUser(zcBaseUser);
|
||||
insertZcBaseUserStore(zcBaseUser);
|
||||
return rows;
|
||||
|
||||
ZcBaseUser oldUser = zcBaseUserMapper.selectZcBaseUserByPhone(zcBaseUser.getPhoneNumber());
|
||||
if(oldUser != null) {
|
||||
// 如果用户存在,只修改门店用户标识
|
||||
ZcBaseUser a = new ZcBaseUser();
|
||||
a.setId(oldUser.getId());
|
||||
a.setIsStore(1L);
|
||||
a.setUpdateTime(DateUtils.getNowDate());
|
||||
int rows = zcBaseUserMapper.updateZcBaseUser(a);
|
||||
// 然后绑定与门店的关联
|
||||
oldUser.setZcBaseUserStoreList(zcBaseUser.getZcBaseUserStoreList());
|
||||
insertZcBaseUserStore(oldUser);
|
||||
return rows;
|
||||
}else{
|
||||
String md5Hexpwd = DigestUtils.md5Hex(zcBaseUser.getPassword());
|
||||
zcBaseUser.setPassword(md5Hexpwd);
|
||||
zcBaseUser.setIsStore(1L);
|
||||
zcBaseUser.setCreateTime(DateUtils.getNowDate());
|
||||
int rows = zcBaseUserMapper.insertZcBaseUser(zcBaseUser);
|
||||
insertZcBaseUserStore(zcBaseUser);
|
||||
return rows;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -139,4 +159,9 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int deleteZcBaseUserStoreById(Long id) {
|
||||
return zcBaseUserMapper.deleteZcBaseUserStoreById(id);
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,6 +2,8 @@ package com.ruoyi.operation.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.ruoyi.baseUser.domain.ZcBaseUser;
|
||||
import com.ruoyi.baseUser.service.IZcBaseUserService;
|
||||
import com.ruoyi.common.constant.CompanyConstants;
|
||||
import com.ruoyi.common.constant.UserConstants;
|
||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||
@ -37,6 +39,9 @@ public class CompanyStoreController extends BaseController
|
||||
private ICompanyStoreService companyStoreService;
|
||||
@Autowired
|
||||
private ICompanyService companyService;
|
||||
@Autowired
|
||||
private IZcBaseUserService zcBaseUserService;
|
||||
|
||||
|
||||
@RequiresPermissions("operation:store:view")
|
||||
@GetMapping()
|
||||
@ -152,6 +157,8 @@ public class CompanyStoreController extends BaseController
|
||||
CompanyStore companyStore = companyStoreService.selectCompanyStoreById(id);
|
||||
mmap.put("companyStore", companyStore);
|
||||
|
||||
List<ZcBaseUser> zcBaseUserList = zcBaseUserService.selectZcBaseUserByStoreId(id);
|
||||
mmap.put("zcBaseUserList", zcBaseUserList);
|
||||
return prefix + "/addStoreUser";
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user