From acfb370c7350192782c4c872a38c2270d93a8407 Mon Sep 17 00:00:00 2001 From: menxipeng Date: Sat, 23 Aug 2025 12:49:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=E6=8E=A5=E5=8F=A31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/back/ShopUserController.java | 4 ++-- .../client/ClientOrderInfoController.java | 4 ++-- .../controller/client/ClientShopUserController.java | 13 +++++++++---- .../web/controller/client/IndexController.java | 1 + .../ruoyi/common/core/domain/entity/ShopUser.java | 2 +- .../system/service/impl/OrderInfoServiceImpl.java | 2 +- .../main/resources/mapper/system/ShopUserMapper.xml | 3 ++- 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/ShopUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/ShopUserController.java index 2afe3a3..9af748e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/ShopUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/ShopUserController.java @@ -113,7 +113,7 @@ public class ShopUserController extends BaseController // 获取当前登录用户 LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser == null || loginUser.getUserId() == null) { - return AjaxResult.error("用户未登录或用户ID为空"); + return AjaxResult.error(401,"用户未登录或用户ID为空"); } ShopUser shopUser = loginUser.getShopUser(); @@ -206,7 +206,7 @@ public class ShopUserController extends BaseController // 获取当前登录用户 LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser == null || loginUser.getUserId() == null) { - return AjaxResult.error("用户未登录或用户ID为空"); + return AjaxResult.error(401,"用户未登录或用户ID为空"); } ShopUser shopUser = loginUser.getShopUser(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/ClientOrderInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/ClientOrderInfoController.java index 0f2b3ae..5b391c7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/ClientOrderInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/ClientOrderInfoController.java @@ -108,7 +108,7 @@ public class ClientOrderInfoController extends BaseController try { LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser == null) { - return AjaxResult.error("用户未登录"); + return AjaxResult.error(401,"用户未登录"); } List orders = orderInfoService.selectUserOrders(loginUser.getUserId()); @@ -132,7 +132,7 @@ public class ClientOrderInfoController extends BaseController // 检查用户权限 LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser == null || !loginUser.getUserId().equals(orderInfo.getUserId())) { - return AjaxResult.error("无权限查看此订单"); + return AjaxResult.error(401,"无权限查看此订单"); } return AjaxResult.success("查询成功", orderInfo); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/ClientShopUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/ClientShopUserController.java index fc1ff36..d98c484 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/ClientShopUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/ClientShopUserController.java @@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; @RequestMapping("/client") @RestController @@ -71,7 +73,7 @@ public class ClientShopUserController { public AjaxResult modifyUserInfo(@RequestBody ShopUser shopUser){ Long userId = SecurityUtils.getUserId(); if (userId == null) { - return AjaxResult.error("用户未登录"); + return AjaxResult.error(401,"用户未登录"); } shopUser.setUserId(userId); return AjaxResult.success(shopUserService.modifyUser(shopUser)); @@ -86,7 +88,7 @@ public class ClientShopUserController { // 获取当前登录用户名 Long userId = SecurityUtils.getUserId(); if (userId == null) { - return AjaxResult.error("用户未登录"); + return AjaxResult.error(401,"用户未登录"); } // 根据用户ID查询完整的用户信息 @@ -132,12 +134,15 @@ public class ClientShopUserController { // 检查是否已经登录 Long userId = SecurityUtils.getUserId(); if (userId == null) { - return AjaxResult.error("用户未登录"); + return AjaxResult.error(401,"用户未登录"); } // 1. 处理文件上传 if (file != null && !file.isEmpty()) { // 保存文件逻辑 - return AjaxResult.success("请求成功", AliConfig.ossUp("user/", file.getOriginalFilename(), file.getInputStream())); + String url = AliConfig.ossUp("user/", file.getOriginalFilename(), file.getInputStream()); + Map head = new HashMap<>(); + head.put("headImg",url); + return AjaxResult.success("请求成功", head); } return AjaxResult.error("文件不能为空"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/IndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/IndexController.java index 08b869e..0fdc612 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/IndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/IndexController.java @@ -75,5 +75,6 @@ public class IndexController extends BaseController { return getDataTableData(list); } + } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ShopUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ShopUser.java index f434eab..444fc6b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ShopUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ShopUser.java @@ -51,7 +51,7 @@ public class ShopUser { private Long sex; /** 生日 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd") private Date birthday; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderInfoServiceImpl.java index 74d6ffa..007abdb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderInfoServiceImpl.java @@ -121,7 +121,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService // 获取当前用户 LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser == null) { - return AjaxResult.error("用户未登录"); + return AjaxResult.error(401,"用户未登录"); } // 创建订单 diff --git a/ruoyi-system/src/main/resources/mapper/system/ShopUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ShopUserMapper.xml index 0688cc5..4528c4f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/ShopUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/ShopUserMapper.xml @@ -167,6 +167,7 @@ phone = #{phone}, nickname = #{nickname}, sex = #{sex}, + head_img = #{headImg}, birthday = #{birthday}, addr = #{addr}, register_time = #{registerTime}, @@ -178,7 +179,7 @@ is_del = #{isDel}, vip_start_time = #{vipStartTime}, vip_end_time = #{vipEndTime}, - vip_end_time = #{descinfo}, + descinfo = #{descinfo}, where shop_user.user_id = #{userId}