From db5061a6708ae018bf8bf86e7146534c468f5c48 Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Fri, 5 Jul 2024 09:57:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=AF=BC=E5=85=A5excel?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=8F=91=E8=B4=A7=E6=97=B6=EF=BC=8C=E5=90=91?=
 =?UTF-8?q?redis=E4=B8=AD=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA15=E5=A4=A9?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E7=9A=84key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 24 +++----------------
 .../service/impl/OrderServiceImpl.java        |  5 +++-
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fba78e4..3568357 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,10 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="bdad98b9-7a5e-48f7-b79e-ed6a34d55dab" name="Default Changelist" comment="第一次提交">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/code/com/wisdo/mmining/util/excel/ExcelUntils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/code/com/wisdo/mmining/util/excel/ExcelUntils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/UserApi.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/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -654,7 +651,8 @@
       <workItem from="1719296864680" duration="33000" />
       <workItem from="1719564748404" duration="2015000" />
       <workItem from="1719795551124" duration="6472000" />
-      <workItem from="1720079374607" duration="5264000" />
+      <workItem from="1720079374607" duration="5784000" />
+      <workItem from="1720140599554" duration="3146000" />
     </task>
     <task id="LOCAL-00001" summary="第一次提交">
       <created>1623736948713</created>
@@ -788,22 +786,6 @@
     <MESSAGE value="测试提交" />
     <option name="LAST_COMMIT_MESSAGE" value="测试提交" />
   </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java</url>
-          <line>397</line>
-          <option name="timeStamp" value="16" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java</url>
-          <line>400</line>
-          <option name="timeStamp" value="17" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
     <select />
diff --git a/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java b/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java
index 6a9801a..842cd1d 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java
@@ -371,7 +371,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
         try {
             List<List<Object>> list = ExcelUntils.importExcel(inputStream, file.getOriginalFilename());
             inputStream.close();
-            System.out.println(list);
             List<WisdOeder> orderList = new ArrayList<>();
             for (int i = 0; i < list.size(); i++) {
                 if (list.get(i).get(2).toString() != null && !"".equals(list.get(i).get(2).toString())) {
@@ -393,6 +392,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
             }
             Boolean flags = updateBatchById(orderList);
             if (flags) {
+                for (WisdOeder order : orderList) {
+                    // TODO: 向Redis中添加一个十四天后过期的key
+                    redisService.set("{'orderNumber':" + order.getOrderNumber() + ",'status':'4'}", "{'orderNumber':" + order.getOrderNumber() + ",'status':'4'}", 1296000000);//1296000000
+                }
                 return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
             } else {
                 return new Result(ResultUtil.ERROR, "添加失败");