From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 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 9f48591..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,9 +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.dao.business.web.response.MemberRidesQuery;
import com.doumee.service.business.MemberRidesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -68,12 +71,32 @@
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<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")
@@ -83,6 +106,19 @@
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鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:memberrides:query")
--
Gitblit v1.9.3