sczx_group/sczx_web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

门店用户

Browse Source
This commit is contained in:
19173159168
2025-07-29 00:25:02 +08:00
parent 826973265e
commit 5c99499084
14 changed files with 629 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseUserController.java
View File

@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
* 租车用户信息Controller
*
* @author ruoyi
* @date 2025-07-27
* @date 2025-07-28
*/
@Controller
@RequestMapping("/baseUser/user")

37
ruoyi-admin/src/main/java/com/ruoyi/baseUser/domain/ZcBaseUser.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.baseUser.domain;
import java.util.List;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@ -9,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* 租车用户信息对象 zc_base_user
*
* @author ruoyi
* @date 2025-07-27
* @date 2025-07-28
*/
public class ZcBaseUser extends BaseEntity
{
@ -23,9 +24,11 @@ public class ZcBaseUser extends BaseEntity
private String userName;
/** 头像 */
@Excel(name = "头像")
private String avatarUrl;
/** 密码 */
@Excel(name = "密码")
private String password;
/** 手机号 */
@ -33,23 +36,29 @@ public class ZcBaseUser extends BaseEntity
private String phoneNumber;
/** 角色id */
@Excel(name = "租车用户",dictType = "sys_yes_no")
private Long roleId;
@Excel(name = "门店用户",dictType = "sys_yes_no")
private Long isStore;
/** 昵称 */
@Excel(name = "昵称")
private String nickName;
/** 微信小程序 openid */
@Excel(name = "微信小程序openid")
@Excel(name = "微信小程序 openid")
private String wechatOpenid;
/** 支付宝小程序 userid */
@Excel(name = "支付宝小程序userid")
@Excel(name = "支付宝小程序 userid")
private String alipayUserid;
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
/** 用户与门店信息信息 */
private List<ZcBaseUserStore> zcBaseUserStoreList;
public void setId(Long id)
{
this.id = id;
@ -100,7 +109,15 @@ public class ZcBaseUser extends BaseEntity
this.roleId = roleId;
}
public Long getRoleId()
public Long getIsStore() {
return isStore;
}
public void setIsStore(Long isStore) {
this.isStore = isStore;
}
public Long getRoleId()
{
return roleId;
}
@ -141,6 +158,16 @@ public class ZcBaseUser extends BaseEntity
return delFlag;
}
public List<ZcBaseUserStore> getZcBaseUserStoreList()
{
return zcBaseUserStoreList;
}
public void setZcBaseUserStoreList(List<ZcBaseUserStore> zcBaseUserStoreList)
{
this.zcBaseUserStoreList = zcBaseUserStoreList;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -150,12 +177,14 @@ public class ZcBaseUser extends BaseEntity
.append("password", getPassword())
.append("phoneNumber", getPhoneNumber())
.append("roleId", getRoleId())
.append("isStore", getIsStore())
.append("nickName", getNickName())
.append("wechatOpenid", getWechatOpenid())
.append("alipayUserid", getAlipayUserid())
.append("delFlag", getDelFlag())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("zcBaseUserStoreList", getZcBaseUserStoreList())
.toString();
}
}

114
ruoyi-admin/src/main/java/com/ruoyi/baseUser/domain/ZcBaseUserStore.java Normal file
View File

@ -0,0 +1,114 @@
package com.ruoyi.baseUser.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 用户与门店信息对象 zc_base_user_store
*
* @author ruoyi
* @date 2025-07-28
*/
public class ZcBaseUserStore extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id主键 */
private Long id;
/** 用户名 */
@Excel(name = "用户名")
private Long userId;
private Long operatorId;
@Excel(name = "所属运营商")
private String operatorName;
@Excel(name = "所属门店")
private String storeName;
private Long storeId;
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getUserId()
{
return userId;
}
public void setOperatorId(Long operatorId)
{
this.operatorId = operatorId;
}
public Long getOperatorId()
{
return operatorId;
}
public void setStoreId(Long storeId)
{
this.storeId = storeId;
}
public Long getStoreId()
{
return storeId;
}
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
}
public String getDelFlag()
{
return delFlag;
}
public String getOperatorName() {
return operatorName;
}
public void setOperatorName(String operatorName) {
this.operatorName = operatorName;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("userId", getUserId())
.append("operatorId", getOperatorId())
.append("storeId", getStoreId())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

28
ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseUserMapper.java
View File

@ -2,12 +2,13 @@ package com.ruoyi.baseUser.mapper;
import java.util.List;
import com.ruoyi.baseUser.domain.ZcBaseUser;
import com.ruoyi.baseUser.domain.ZcBaseUserStore;
/**
* 租车用户信息Mapper接口
*
* @author ruoyi
* @date 2025-07-27
* @date 2025-07-28
*/
public interface ZcBaseUserMapper
{
@ -58,4 +59,29 @@ public interface ZcBaseUserMapper
* @return 结果
*/
public int deleteZcBaseUserByIds(String[] ids);
/**
* 批量删除用户与门店信息
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteZcBaseUserStoreByUserIds(String[] ids);
/**
* 批量新增用户与门店信息
*
* @param zcBaseUserStoreList 用户与门店信息列表
* @return 结果
*/
public int batchZcBaseUserStore(List<ZcBaseUserStore> zcBaseUserStoreList);
/**
* 通过租车用户信息主键删除用户与门店信息信息
*
* @param id 租车用户信息ID
* @return 结果
*/
public int deleteZcBaseUserStoreByUserId(Long id);
}

2
ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseUserService.java
View File

@ -7,7 +7,7 @@ import com.ruoyi.baseUser.domain.ZcBaseUser;
* 租车用户信息Service接口
*
* @author ruoyi
* @date 2025-07-27
* @date 2025-07-28
*/
public interface IZcBaseUserService
{

49
ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java
View File

@ -1,9 +1,16 @@
package com.ruoyi.baseUser.service.impl;
import java.nio.charset.StandardCharsets;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.tomcat.util.security.MD5Encoder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.baseUser.domain.ZcBaseUserStore;
import com.ruoyi.baseUser.mapper.ZcBaseUserMapper;
import com.ruoyi.baseUser.domain.ZcBaseUser;
import com.ruoyi.baseUser.service.IZcBaseUserService;
@ -13,7 +20,7 @@ import com.ruoyi.common.core.text.Convert;
* 租车用户信息Service业务层处理
*
* @author ruoyi
* @date 2025-07-27
* @date 2025-07-28
*/
@Service
public class ZcBaseUserServiceImpl implements IZcBaseUserService
@ -51,11 +58,17 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService
* @param zcBaseUser 租车用户信息
* @return 结果
*/
@Transactional
@Override
public int insertZcBaseUser(ZcBaseUser zcBaseUser)
{
String md5Hexpwd = DigestUtils.md5Hex(zcBaseUser.getPassword());
zcBaseUser.setPassword(md5Hexpwd);
zcBaseUser.setIsStore(1L);
zcBaseUser.setCreateTime(DateUtils.getNowDate());
return zcBaseUserMapper.insertZcBaseUser(zcBaseUser);
int rows = zcBaseUserMapper.insertZcBaseUser(zcBaseUser);
insertZcBaseUserStore(zcBaseUser);
return rows;
}
/**
@ -64,10 +77,13 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService
* @param zcBaseUser 租车用户信息
* @return 结果
*/
@Transactional
@Override
public int updateZcBaseUser(ZcBaseUser zcBaseUser)
{
zcBaseUser.setUpdateTime(DateUtils.getNowDate());
zcBaseUserMapper.deleteZcBaseUserStoreByUserId(zcBaseUser.getId());
insertZcBaseUserStore(zcBaseUser);
return zcBaseUserMapper.updateZcBaseUser(zcBaseUser);
}
@ -77,9 +93,11 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService
* @param ids 需要删除的租车用户信息主键
* @return 结果
*/
@Transactional
@Override
public int deleteZcBaseUserByIds(String ids)
{
zcBaseUserMapper.deleteZcBaseUserStoreByUserIds(Convert.toStrArray(ids));
return zcBaseUserMapper.deleteZcBaseUserByIds(Convert.toStrArray(ids));
}
@ -89,9 +107,36 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService
* @param id 租车用户信息主键
* @return 结果
*/
@Transactional
@Override
public int deleteZcBaseUserById(Long id)
{
zcBaseUserMapper.deleteZcBaseUserStoreByUserId(id);
return zcBaseUserMapper.deleteZcBaseUserById(id);
}
/**
* 新增用户与门店信息信息
*
* @param zcBaseUser 租车用户信息对象
*/
public void insertZcBaseUserStore(ZcBaseUser zcBaseUser)
{
List<ZcBaseUserStore> zcBaseUserStoreList = zcBaseUser.getZcBaseUserStoreList();
Long id = zcBaseUser.getId();
if (StringUtils.isNotNull(zcBaseUserStoreList))
{
List<ZcBaseUserStore> list = new ArrayList<ZcBaseUserStore>();
for (ZcBaseUserStore zcBaseUserStore : zcBaseUserStoreList)
{
zcBaseUserStore.setUserId(id);
zcBaseUserStore.setCreateTime(DateUtils.getNowDate());
list.add(zcBaseUserStore);
}
if (list.size() > 0)
{
zcBaseUserMapper.batchZcBaseUserStore(list);
}
}
}
}

14
ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyStoreController.java
View File

@ -141,6 +141,20 @@ public class CompanyStoreController extends BaseController
return toAjax(companyStoreService.updateCompanyStore(companyStore));
}
/**
* 修改门店
*/
@RequiresPermissions("operation:store:edit")
@GetMapping("/addStoreUser/{id}")
public String addStoreUser(@PathVariable("id") Long id, ModelMap mmap)
{
CompanyStore companyStore = companyStoreService.selectCompanyStoreById(id);
mmap.put("companyStore", companyStore);
return prefix + "/addStoreUser";
}
/**
* 删除门店
*/