From 1a293a85cc5c97b10ce4635f38acb6a4ec35aa03 Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Fri, 10 May 2024 16:40:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                    |  1 -
 .idea/workspace.xml                               | 15 +++++++++------
 src/main/java/com/wisdo/mmining/api/OrderApi.java |  1 +
 .../WEB-INF/view/pages/order/order_list.jsp       |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index d6eac2b..75e4e88 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration">
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e172d23..01ca351 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,10 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="bdad98b9-7a5e-48f7-b79e-ed6a34d55dab" name="Default Changelist" comment="第一次提交">
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/OrderApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/OrderApi.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-db.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-db.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_edit_address.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_edit_address.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_list.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_list.jsp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -453,6 +453,7 @@
     "RequestMappingsPanelWidth1": "75",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "Spring Boot.WisdoMminingApplication.executor": "Debug",
+    "dart.analysis.tool.window.visible": "false",
     "git-widget-placeholder": "master",
     "kotlin-language-version-configured": "true",
     "last_opened_file_path": "D:/Documents/IdeaProjects/wisdommining-serve/src/main/webapp/WEB-INF/view/pages/order",
@@ -461,7 +462,8 @@
     "node.js.selected.package.eslint": "(autodetect)",
     "node.js.selected.package.tslint": "(autodetect)",
     "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "editor.preferences.fonts.default",
+    "settings.editor.selected.configurable": "preferences.pluginManager",
+    "show.migrate.to.gradle.popup": "false",
     "vue.rearranger.settings.migration": "true"
   }
 }]]></component>
@@ -503,8 +505,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9f38398b9061-18abd8497189-intellij.indexing.shared.core-IU-241.14494.240" />
-        <option value="bundled-js-predefined-1d06a55b98c1-74d2a5396914-JavaScript-IU-241.14494.240" />
+        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.15989.150" />
+        <option value="bundled-js-predefined-1d06a55b98c1-91d5c284f522-JavaScript-IU-241.15989.150" />
       </set>
     </attachedChunks>
   </component>
@@ -598,7 +600,8 @@
       <workItem from="1715153690971" duration="5114000" />
       <workItem from="1715220865862" duration="17980000" />
       <workItem from="1715302389730" duration="350000" />
-      <workItem from="1715303161489" duration="2121000" />
+      <workItem from="1715303161489" duration="3672000" />
+      <workItem from="1715307843757" duration="4090000" />
     </task>
     <task id="LOCAL-00001" summary="第一次提交">
       <created>1623736948713</created>
diff --git a/src/main/java/com/wisdo/mmining/api/OrderApi.java b/src/main/java/com/wisdo/mmining/api/OrderApi.java
index 7b4aae9..4409616 100644
--- a/src/main/java/com/wisdo/mmining/api/OrderApi.java
+++ b/src/main/java/com/wisdo/mmining/api/OrderApi.java
@@ -327,6 +327,7 @@ public class OrderApi {
         if (order.getStatus().equals(1) || order.getStatus().equals(2)) {
             order.setAddressId(addressId);
             order.setOrderAddress(address.getAddressProvince() + address.getAddressCity() + address.getAddressArea() + address.getAddressDetailed());
+            orderService.updateById(order);
             return ResultUtil.success("地址修改成功");
         }
         order.setPendingApprovalAddressId(addressId);
diff --git a/src/main/webapp/WEB-INF/view/pages/order/order_list.jsp b/src/main/webapp/WEB-INF/view/pages/order/order_list.jsp
index cac6db2..1cbe742 100644
--- a/src/main/webapp/WEB-INF/view/pages/order/order_list.jsp
+++ b/src/main/webapp/WEB-INF/view/pages/order/order_list.jsp
@@ -294,7 +294,7 @@
                     sort: true
                 },
                 {
-                    fixed: 'right', align: 'center', width: 320, title: '操作', templet: function (item) {
+                    fixed: 'right', align: 'center', width: 360, title: '操作', templet: function (item) {
                         if (item.status != 4 && item.orderPick == 2 && item.pendingApprovalAddressId) {
                             return '<button class="layui-btn layui-btn-sm" lay-event="editAddress">修改地址</button><button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del">删除</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="updateAddress">处理地址修改申请</button>';
                         } else if (item.status == 2 && item.orderPick == 2) {