Merge branch 'feature/mall_product' into test

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

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));
     }

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;
+
 }

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;
 }

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>