From 83a08e579d6d9241aa448d17264d8b31960dbc2e Mon Sep 17 00:00:00 2001
From: Xubx <1827135378@qq.com>
Date: Wed, 4 Sep 2024 23:17:57 +0800
Subject: [PATCH] =?UTF-8?q?User=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bigdata/wxappserver/service/OrderService.java | 11 +++++++++--
 .../com/bigdata/wxappserver/service/UserService.java  |  9 +++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/bigdata/wxappserver/service/OrderService.java b/src/main/java/com/bigdata/wxappserver/service/OrderService.java
index 12a1534..f1c22f5 100644
--- a/src/main/java/com/bigdata/wxappserver/service/OrderService.java
+++ b/src/main/java/com/bigdata/wxappserver/service/OrderService.java
@@ -46,14 +46,21 @@ public class OrderService extends ServiceImpl<OrderMapper, Order> {
         if (order == null) {
             return new JSONObject().fluentPut("success", false).fluentPut("message", "参数错误");
         }
+        List<User> userList = userService.list();
+        User userTemp = userList.stream().filter(e -> Objects.equals(e.getOpenId(), jsonObject.get("openId"))).findFirst().orElse(null);
+        order.setUserId(userTemp.getId());
         if (!StringUtils.hasLength(order.getAddress())) {
             User user = userService.getById(order.getUserId());
             order.setAddress(user.getAddress());
         }
         // TODO 判空
         boolean success = saveOrUpdate(order);
-        return new JSONObject().fluentPut("message", "success").fluentPut("success", success);
-    }
+
+        if (success) {
+            return new JSONObject().fluentPut("message", "success").fluentPut("success", success).fluentPut("id", order.getId().toString());
+        } else {
+            return new JSONObject().fluentPut("message", "failure").fluentPut("success", success);
+        }    }
 
     public JSONObject list(JSONObject jsonObject) {
         String openId = jsonObject.getString("openId");
diff --git a/src/main/java/com/bigdata/wxappserver/service/UserService.java b/src/main/java/com/bigdata/wxappserver/service/UserService.java
index 0921ce9..23aa867 100644
--- a/src/main/java/com/bigdata/wxappserver/service/UserService.java
+++ b/src/main/java/com/bigdata/wxappserver/service/UserService.java
@@ -26,7 +26,8 @@ import java.util.stream.Collectors;
 
 @Service
 public class UserService extends ServiceImpl<UserMapper, User> {
-    private static final String UPLOAD_DIR = "uploads/";
+    private static final String UPLOAD_DIR = "static/uploads/";
+    private static final String GET_URL = "uploads/";
 
     @Transactional(rollbackFor = Exception.class)
     public JSONObject addOrUpdate(JSONObject jsonObject) {
@@ -88,6 +89,9 @@ public class UserService extends ServiceImpl<UserMapper, User> {
 
         List<User> userList = list();
         User user = userList.stream().filter(e -> Objects.equals(e.getOpenId(), openId)).findFirst().orElse(null);
+        if (user == null) {
+            return new JSONObject().fluentPut("success", false).fluentPut("message", "用户不存在");
+        }
         return new JSONObject().fluentPut("data", user);
     }
 
@@ -105,10 +109,11 @@ public class UserService extends ServiceImpl<UserMapper, User> {
             // 保存文件到服务器
             String fileName = System.currentTimeMillis() + "_" + file.getOriginalFilename();
             Path path = Paths.get(UPLOAD_DIR + fileName);
+            Files.createDirectories(path.getParent());
             Files.write(path, file.getBytes());
             // 构建文件的访问URL
             String fileDownloadUri = ServletUriComponentsBuilder.fromCurrentContextPath()
-                    .path("/" + UPLOAD_DIR)
+                    .path("/" + GET_URL)
                     .path(fileName)
                     .toUriString();
             return new JSONObject().fluentPut("success", true).fluentPut("fileDownloadUri", fileDownloadUri);