From 6aa659f6cb7d3c86c87c4ab58be4220820c7326b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 25 十月 2024 19:37:07 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java
index 516e1c0..3acfe2d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.TBoard;
import com.ruoyi.system.domain.TShop;
@@ -22,6 +23,8 @@
import java.util.List;
import java.util.Objects;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
/**
* <p>
@@ -64,9 +67,18 @@
@ApiOperation( value = "添加店铺信息")
@PostMapping(value = "/add")
public AjaxResult<String> add(@RequestBody TShopDTO dto) {
+ SysUser user = new SysUser();
+ user.setUserName(dto.getAccount());
+ user.setPhonenumber(dto.getAccount());
+ if (!userService.checkUserNameUnique(user))
+ {
+ return error("添加用户'" + user.getUserName() + "'失败，登录账号已存在");
+ }
shopService.save(dto);
// 添加账号
- userService.addAccount(dto);
+ Long userId = userService.addAccount(dto);
+ dto.setUserId(userId);
+ shopService.updateById(dto);
return AjaxResult.success();
}
@@ -76,6 +88,14 @@
@ApiOperation( value = "编辑店铺信息")
@PostMapping(value = "/edit")
public AjaxResult<String> edit(@RequestBody TShopDTO dto) {
+ SysUser user = new SysUser();
+ user.setUserName(dto.getAccount());
+ user.setPhonenumber(dto.getAccount());
+ user.setUserId(dto.getUserId());
+ if (!userService.checkUserNameUnique(user))
+ {
+ return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
+ }
shopService.updateById(dto);
userService.updateAccount(dto);
return AjaxResult.success();
@@ -104,7 +124,7 @@
public AjaxResult<TShop> getDetailByUserId() {
Integer roleType = tokenService.getLoginUser().getRoleType();
if(roleType == 1){
- return AjaxResult.error("该用户不是商家账号");
+ return error("该用户不是商家账号");
}
return AjaxResult.success(shopService.getOne(Wrappers.<TShop>lambdaQuery().eq(TShop::getUserId, tokenService.getLoginUser().getUserId())
.last("LIMIT 1")));
--
Gitblit v1.7.1