From 07294d51610400eea11c25448d106280ded4ffac Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Fri, 7 Jun 2024 16:43:30 +0800
Subject: [PATCH] bug fix

---
 .idea/workspace.xml                           | 12 ++++++-----
 .../java/com/wisdo/mmining/api/OrderApi.java  | 20 ++++++++++++++++---
 .../java/com/wisdo/mmining/api/UserApi.java   |  4 ++--
 .../com/wisdo/mmining/entity/WisdOeder.java   |  2 +-
 .../service/impl/OrderServiceImpl.java        |  4 ++--
 src/main/resources/application-db.yml         | 12 +++++------
 src/main/resources/application.yml            | 12 +++++------
 .../view/pages/order/order_refund_list.jsp    | 10 +++++++---
 8 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4883056..6c2d291 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,13 +6,13 @@
   <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/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_find.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_find.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_logistics.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_logistics.jsp" 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" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/package/package_list.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/package/package_list.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/welfare/welfare_list.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/welfare/welfare_list.jsp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -643,7 +643,9 @@
       <workItem from="1716887246099" duration="1175000" />
       <workItem from="1717378949557" duration="4511000" />
       <workItem from="1717463046217" duration="13312000" />
-      <workItem from="1717548903642" duration="12582000" />
+      <workItem from="1717548903642" duration="13189000" />
+      <workItem from="1717635858346" duration="3501000" />
+      <workItem from="1717722174072" duration="8229000" />
     </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 e979338..5c3be31 100644
--- a/src/main/java/com/wisdo/mmining/api/OrderApi.java
+++ b/src/main/java/com/wisdo/mmining/api/OrderApi.java
@@ -364,8 +364,22 @@ public class OrderApi {
     @ResponseBody
     public Result cancelRefund(Long orderId) {
         WisdOeder order = orderService.getById(orderId);
-        order.setAfterSalesStatus(null);
+        order.setAfterSalesStatus(67);
         // TODO: 将退换货相关字段设为null
+        order.setOrderRefund(null);
+        order.setOrderRefundImg(null);
+        order.setOrderRefundTime(null);
+        order.setOrderRefundName(null);
+        order.setOrderRefundNumber(null);
+        order.setOrderRefundRemarke(null);
+        order.setOrderRefundRemarkeTime(null);
+        order.setOrderRefundInstructions(null);
+        order.setOrderRefundNum(null);
+        order.setOrderRefundType(null);
+        order.setOrderRefundImage(null);
+        order.setOrderRefundMerchantsName(null);
+        order.setOrderRefundMerchantsNum(null);
+        order.setOrderRefundMerchantsTime(null);
         orderService.updateById(order);
         return ResultUtil.success("已撤销售后申请");
     }
@@ -379,10 +393,10 @@ public class OrderApi {
         queryWrapper.eq("is_deleted", 0);
         if (status != 0) {
             if (status == 6) {
-                queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", status).or().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));
+                queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", status).or().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).or().eq("after_sales_status", 67));
                 queryWrapper.orderByDesc("create_time");
             } else {
-                queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", 66).or().isNull("after_sales_status")).and(wrapper -> wrapper.eq("status", status));
+                queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", 66).or().eq("after_sales_status", 67).or().isNull("after_sales_status")).and(wrapper -> wrapper.eq("status", status));
                 queryWrapper.orderByDesc("create_time");
             }
         } else {
diff --git a/src/main/java/com/wisdo/mmining/api/UserApi.java b/src/main/java/com/wisdo/mmining/api/UserApi.java
index a5d92b6..6463e70 100644
--- a/src/main/java/com/wisdo/mmining/api/UserApi.java
+++ b/src/main/java/com/wisdo/mmining/api/UserApi.java
@@ -110,10 +110,10 @@ public class UserApi {
         QueryWrapper<WisdOeder> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", userId);
         if (status == 6) {
-            queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", status).or().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));
+            queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", status).or().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).or().eq("after_sales_status", 67));
         } else {
             queryWrapper.eq("status", status).and(wrapper -> wrapper
-                    .isNull("after_sales_status").or().eq("after_sales_status", 66)
+                    .isNull("after_sales_status").or().eq("after_sales_status", 66).or().eq("after_sales_status", 67)
             );
         }
         queryWrapper.eq("is_deleted", 0);
diff --git a/src/main/java/com/wisdo/mmining/entity/WisdOeder.java b/src/main/java/com/wisdo/mmining/entity/WisdOeder.java
index 7a11724..34dd815 100644
--- a/src/main/java/com/wisdo/mmining/entity/WisdOeder.java
+++ b/src/main/java/com/wisdo/mmining/entity/WisdOeder.java
@@ -126,7 +126,7 @@ public class WisdOeder implements Serializable {
     private String orderPickTime;
 
     /**
-     * 状态（1待支付 2代发货/待核销 3待收货 4已完成/已核销 5已取消 61申请换货 62 申请退款 63退换货确认 64退换货物流信息提交 65退换货完成 66 退换货失败 ）
+     * 状态（1待支付 2代发货/待核销 3待收货 4已完成/已核销 5已取消 61申请换货 62 申请退款 63退换货确认 64退换货物流信息提交 65退换货完成 66 退换货失败 67 撤销售后）
      */
     private Integer status;
 
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 21a4c43..6a9801a 100644
--- a/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java
@@ -66,7 +66,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
     @Override
     public IPage<WisdOeder> selectPage(String pickTimeStart, String pickTimeEnd, String createTimeStart, String createTimeEnd, Long companyId, Long addressId, Integer orderPick, String orderNumber, String userName, String userPhone, Integer status, Integer orderPayWay, int page, int num) {
         QueryWrapper<WisdOeder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.and(wrap -> wrap.eq("after_sales_status", 66).or().isNull("after_sales_status"));
+        queryWrapper.and(wrap -> wrap.eq("after_sales_status", 66).or().eq("after_sales_status", 67).or().isNull("after_sales_status"));
         if (orderNumber != null && !"".equals(orderNumber)) {
             queryWrapper.like("order_number", orderNumber);
         }
@@ -144,7 +144,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
             queryWrapper.eq("order_pick", 1);
         }
         if (status != null && status != 0) {
-            queryWrapper.eq("after_sales_status", status);
+            queryWrapper.eq("after_sales_status", status).ne("after_sales_status", 67);
         } else {
             queryWrapper.and(wrapper -> wrapper.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));
         }
diff --git a/src/main/resources/application-db.yml b/src/main/resources/application-db.yml
index 36712a6..0e4e5bf 100644
--- a/src/main/resources/application-db.yml
+++ b/src/main/resources/application-db.yml
@@ -1,12 +1,12 @@
 #开发环境
 spring:
   datasource:
-    url: jdbc:mysql://192.168.0.142: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
-    password: Qwer1234.
-#    password: Sphc666888!
+#    url: jdbc:mysql://192.168.0.142: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
+#    password: Qwer1234.
+    password: Sphc666888!
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
   druid:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 700c540..51b5e61 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 server:
-  port: 9000
-#  port: 9090
+#  port: 9000
+  port: 9090
   servlet:
     context-path: /wisdommining
 spring:
@@ -39,8 +39,8 @@ spring:
 #    port: 6379
   redis:
     database: 10
-    host: localhost
-#    host: 146.56.198.32
+#    host: localhost
+    host: 146.56.198.32
     timeout: 100000
     jedis:
       pool:
@@ -49,8 +49,8 @@ spring:
         max-idle: 8
         min-idle: 0
     port: 6379
-#    password: Zsd@2021!
-    password:
+    password: Zsd@2021!
+#    password:
 
 
 mybatis-plus:
diff --git a/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp b/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp
index b9afb70..fd346e2 100644
--- a/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp
+++ b/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp
@@ -286,9 +286,13 @@
                             return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="delivery">同意退款</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodeliverys">拒绝退款</button>';
                         } else if (item.afterSalesStatus == 62 && item.orderRefundType == 3) {
                             return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="deliveryStatus">同意退款</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodeliveryStatus">拒绝退款</button>';
-                        } else if (item.afterSalesStatus == 64 && (item.orderRefundType == 1 || item.orderRefundType == 2)) {
-                            return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="deliveryMoney">${item.orderRefundType == 1 ? "退换货发货": '退款'}</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodelivery">拒绝退换货</button>';
-                        } else {
+                        } else if (item.afterSalesStatus == 64 && item.orderRefundType == 1 ) {
+                            return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="deliveryMoney">退换货发货</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodelivery">拒绝退换货</button>';
+                        }
+                        else if(item.afterSalesStatus == 64 &&  item.orderRefundType == 2){
+                            return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="deliveryMoney">退款</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodelivery">拒绝退换货</button>';
+                        }
+                        else {
                             return '<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>';
                         }
                     }