From 48a67dc37446e752aba671ef2fbbbd63de4ebc5d Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Thu, 13 Jun 2024 16:35:38 +0800
Subject: [PATCH] bug fix

---
 .idea/workspace.xml                              | 16 +++++++---------
 .../mmining/controller/OrderController.java      | 11 +++++++++--
 src/main/resources/application-db.yml            |  2 +-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6c2d291..78e417f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,13 +6,8 @@
   <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/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/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/java/com/wisdo/mmining/entity/WisdOeder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdOeder.java" 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" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/OrderController.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/webapp/WEB-INF/view/pages/order/order_refund_list.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -472,7 +467,7 @@
     &quot;project.structure.last.edited&quot;: &quot;全局库&quot;,
     &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
     &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;project.propVCSSupport.DirectoryMappings&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
     &quot;show.migrate.to.gradle.popup&quot;: &quot;false&quot;,
     &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
@@ -526,8 +521,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.17011.79" />
-        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.17011.79" />
+        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.17890.1" />
+        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.17890.1" />
       </set>
     </attachedChunks>
   </component>
@@ -646,6 +641,9 @@
       <workItem from="1717548903642" duration="13189000" />
       <workItem from="1717635858346" duration="3501000" />
       <workItem from="1717722174072" duration="8229000" />
+      <workItem from="1718159326654" duration="105000" />
+      <workItem from="1718159470340" duration="5886000" />
+      <workItem from="1718241682223" duration="12310000" />
     </task>
     <task id="LOCAL-00001" summary="第一次提交">
       <created>1623736948713</created>
diff --git a/src/main/java/com/wisdo/mmining/controller/OrderController.java b/src/main/java/com/wisdo/mmining/controller/OrderController.java
index c726542..0ac9cd1 100644
--- a/src/main/java/com/wisdo/mmining/controller/OrderController.java
+++ b/src/main/java/com/wisdo/mmining/controller/OrderController.java
@@ -732,9 +732,16 @@ public class OrderController {
             queryWrapper.eq("order_number", orderNumber);
         }
         if (type == 1) {
-            queryWrapper.le("status", 6);
+            // 排除售后中
+            queryWrapper.and(wrapper -> wrapper.isNull("after_sales_status").or().eq("after_sales_status", 66).or().eq("after_sales_status", 67));
         } else if (type == 2) {
-            queryWrapper.ge("status", 5);
+            queryWrapper
+                    .eq("after_sales_status", 61).or()
+                    .eq("after_sales_status", 62).or()
+                    .eq("after_sales_status", 63).or()
+                    .eq("after_sales_status", 64).or()
+                    .eq("after_sales_status", 65).or()
+                    .eq("after_sales_status", 66);
         }
 
         if (userName != null && !"".equals(userName)) {
diff --git a/src/main/resources/application-db.yml b/src/main/resources/application-db.yml
index 0e4e5bf..871fdc7 100644
--- a/src/main/resources/application-db.yml
+++ b/src/main/resources/application-db.yml
@@ -1,7 +1,7 @@
 #开发环境
 spring:
   datasource:
-#    url: jdbc:mysql://192.168.0.142:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#    url: jdbc:mysql://192.168.0.137:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
     url: jdbc:mysql://146.56.198.32:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
 #    username: yshop
     username: root