From e3d06db3434eb975eab5fea33097ed2ad8f966e7 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Tue, 20 Jun 2023 14:27:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=92=8C=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/shop/request/member/RefundRequest.java     | 2 --
 .../controller/admin/recharge/RechargeOrderController.java  | 4 ++--
 .../admin/recharge/vo/RechargeOrderExportReqVO.java         | 3 +++
 .../admin/recharge/vo/RechargeOrderPageReqVO.java           | 6 ++++++
 .../main/resources/mapper/recharge/RechargeOrderMapper.xml  | 6 ++++++
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/request/member/RefundRequest.java b/yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/request/member/RefundRequest.java
index 15905979c..bc3aee194 100644
--- a/yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/request/member/RefundRequest.java
+++ b/yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/request/member/RefundRequest.java
@@ -5,10 +5,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Title:OrderContentRequest
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java
index 43d1fa607..525a294d6 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java
@@ -204,10 +204,10 @@ public class RechargeOrderController {
     }
 
     @TenantIgnore
-//    @PreAuthenticated
+    @PreAuthenticated
     @Operation(summary = "管理员填写备注")
     @RequestMapping(value = "/adminRemark", method = RequestMethod.POST)
-//    @PreAuthorize("@ss.hasPermission('shop:recharge-order:remark')")
+    @PreAuthorize("@ss.hasPermission('shop:recharge-order:remark')")
     public CommonResult<Boolean> adminRemark(@Valid @RequestBody RemarkRequest request) {
         return CommonResult.success(rechargeOrderService.updateRemark(request));
     }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExportReqVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExportReqVO.java
index 27f820a70..04b9856b6 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExportReqVO.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExportReqVO.java
@@ -135,4 +135,7 @@ public class RechargeOrderExportReqVO {
      */
     private Integer refundType;
 
+    private LocalDateTime startApplyTime;
+    private LocalDateTime endApplyTime;
+
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java
index c451a6a1b..d53bbd444 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java
@@ -138,4 +138,10 @@ public class RechargeOrderPageReqVO extends PageParam {
      */
     private Integer refundType;
 
+
+    /**
+     * 申请退款时间
+     */
+    private LocalDateTime startApplyTime;
+    private LocalDateTime endApplyTime;
 }
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
index 14b9a2e7c..c032d64f8 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
@@ -275,6 +275,12 @@
             <if test="data.status !=null ">
                 and a.status =#{data.status}
             </if>
+            <if test="data.startApplyTime !=null ">
+                and a.apply_time &gt;=#{data.startApplyTime}
+            </if>
+            <if test="data.endApplyTime !=null ">
+                and a.apply_time &lt;=#{data.endApplyTime}
+            </if>
         </where>
     </sql>
 </mapper>