From f73e9c5419c82b9ff685b8e67d839fd942100073 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 22 十月 2025 18:05:10 +0800
Subject: [PATCH] 修改bug
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmWarehouseServiceImpl.java | 70 +++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmWarehouseServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmWarehouseServiceImpl.java
index d2a93e9..48650f3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmWarehouseServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmWarehouseServiceImpl.java
@@ -1,10 +1,24 @@
package com.ruoyi.system.service.impl;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.dto.TCrmWarehouseDTO;
import com.ruoyi.system.model.TCrmWarehouse;
import com.ruoyi.system.mapper.TCrmWarehouseMapper;
+import com.ruoyi.system.query.TCrmWarehouseQuery;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TCrmWarehouseService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.vo.TCrmSupplierVO;
+import com.ruoyi.system.vo.TCrmWarehouseVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -17,4 +31,60 @@
@Service
public class TCrmWarehouseServiceImpl extends ServiceImpl<TCrmWarehouseMapper, TCrmWarehouse> implements TCrmWarehouseService {
+ @Autowired
+ private ISysUserService sysUserService;
+
+ @Override
+ public PageInfo<TCrmWarehouseVO> pageList(TCrmWarehouseQuery query) {
+ PageInfo<TCrmWarehouseVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TCrmWarehouseVO> list = this.baseMapper.pageList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public R<Boolean> addWarehouse(TCrmWarehouseDTO dto) {
+ // 判断账号是否已存在
+ SysUser sysUser = sysUserService.selectUserByUserName(dto.getAccount());
+ if(Objects.nonNull(sysUser)){
+ return R.fail(dto.getAccount()+"-账号已存在");
+ }
+ this.save(dto);
+ // 添加账号
+ SysUser user = new SysUser();
+ user.setUserName(dto.getAccount());
+ user.setPhonenumber(dto.getWarehousePhone());
+ user.setNickName(dto.getWarehouseName());
+ user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ user.setStatus("0");
+ user.setDelFlag("0");
+ user.setRoleType(6);
+ user.setRoleId(6L);
+ sysUserService.insertUser(user);
+ dto.setUserId(user.getUserId());
+ this.updateById(dto);
+ return R.ok();
+ }
+
+ @Override
+ public R<Boolean> updateWarehouse(TCrmWarehouseDTO dto) {
+ // 判断账号是否已存在
+ SysUser sysUser1 = sysUserService.selectUserByUserName(dto.getAccount());
+ if(Objects.nonNull(sysUser1) && !sysUser1.getUserId().equals(dto.getUserId())){
+ return R.fail(dto.getAccount()+"-账号已存在");
+ }
+ SysUser user = sysUserService.selectUserById(dto.getUserId());
+ this.updateById(dto);
+ if(Objects.nonNull(user)){
+ // 修改账号
+ user.setPhonenumber(dto.getWarehousePhone());
+ user.setUserName(dto.getAccount());
+ user.setNickName(dto.getWarehouseName());
+ if(StringUtils.isNotEmpty(dto.getPassword())){
+ user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ }
+ sysUserService.updateUser(user);
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1