From 1147614053efae0314a36c15293a6a5ed4e6d737 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 二月 2025 11:28:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java |   46 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java b/server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java
index 05fd57f..c794c14 100644
--- a/server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java
@@ -6,7 +6,12 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.DateUtil;
 import com.doumee.dao.business.model.MemberRides;
+import com.doumee.dao.business.vo.GoodsorderExportVO;
+import com.doumee.dao.business.web.request.MemberRidesQuery;
+import com.doumee.dao.business.web.response.BikeLogDTO;
+import com.doumee.dao.business.web.response.MemberRidesDTO;
 import com.doumee.service.business.MemberRidesService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -66,19 +71,52 @@
         memberRidesService.updateById(memberRides);
         return ApiResponse.success(null);
     }
+    @ApiOperation("寮哄埗杩樿溅")
+    @PostMapping("/forceBack")
+    @RequiresPermissions("business:memberrides:forceBack")
+    public ApiResponse forceBack(@RequestBody MemberRides memberRides) {
+        memberRidesService.forceBack(memberRides);
+        return ApiResponse.success(null);
+    }
+    @ApiOperation("淇敼楠戣鏃堕暱")
+    @PostMapping("/updateDuration")
+    @RequiresPermissions("business:memberrides:updateDuration")
+    public ApiResponse updateDuration(@RequestBody MemberRides memberRides) {
+        memberRidesService.updateDuration(memberRides);
+        return ApiResponse.success(null);
+    }
 
-    @ApiOperation("鍒嗛〉鏌ヨ")
+    @ApiOperation("鐢ㄦ埛楠戣璁板綍_鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @RequiresPermissions("business:memberrides:query")
-    public ApiResponse<PageData<MemberRides>> findPage (@RequestBody PageWrap<MemberRides> pageWrap) {
+    public ApiResponse<PageData<MemberRidesDTO>> findPage (@RequestBody PageWrap<MemberRidesQuery> pageWrap) {
         return ApiResponse.success(memberRidesService.findPage(pageWrap));
+    }
+    @ApiOperation("杞﹁締鍙栬繕璁板綍_鍒嗛〉鏌ヨ")
+    @PostMapping("/pageBikeLog")
+    @RequiresPermissions("business:memberrides:query")
+    public ApiResponse<PageData<BikeLogDTO>> findPageBikeLog (@RequestBody PageWrap<MemberRidesQuery> pageWrap) {
+        return ApiResponse.success(memberRidesService.findBikeLog(pageWrap));
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:memberrides:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<MemberRides> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(MemberRides.class).export(memberRidesService.findPage(pageWrap).getRecords(), "鐢ㄦ埛楠戣璁板綍琛�", response);
+    public void exportExcel (@RequestBody PageWrap<MemberRidesQuery> pageWrap, HttpServletResponse response) {
+        ExcelExporter.build(MemberRidesDTO.class).export(memberRidesService.findPage(pageWrap).getRecords(), "鐢ㄦ埛楠戣璁板綍琛�", response);
+    }
+
+    @ApiOperation("鐢ㄦ埛楠戣璁板綍_瀵煎嚭excel")
+    @PostMapping("/exportMemberRidesExcel")
+    @RequiresPermissions("business:memberrides:exportExcel")
+    public void exportMemberRidesExcel (@RequestBody PageWrap<MemberRidesQuery> pageWrap, HttpServletResponse response) {
+        ExcelExporter.build(MemberRidesDTO.class).exportWithFirstAndEnd(memberRidesService.findPage(pageWrap).getRecords(),"鐢ㄦ埛楠戣璁板綍_"+System.currentTimeMillis(),"鐢ㄦ埛楠戣璁板綍_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+    }
+    @ApiOperation("杞﹁締鍙栬繕璁板綍_瀵煎嚭excel")
+    @PostMapping("/exportBikeLogExcel")
+    @RequiresPermissions("business:memberrides:exportExcel")
+    public void exportBikeLogExcel (@RequestBody PageWrap<MemberRidesQuery> pageWrap, HttpServletResponse response) {
+        ExcelExporter.build(BikeLogDTO.class).exportWithFirstAndEnd(memberRidesService.findBikeLog(pageWrap).getRecords(),"杞﹁締鍙栬繕璁板綍_"+System.currentTimeMillis(),"杞﹁締鍙栬繕璁板綍_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")

--
Gitblit v1.9.3