From c977f0e2fd86ca3e9e3ad3961f702206c41d2767 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 二月 2025 10:41:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
index ec79bef..e1fd075 100644
--- a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
@@ -12,6 +12,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.web.request.BackElecBikeRequest;
import com.doumee.dao.business.web.request.RepairRequest;
+import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
import com.doumee.dao.business.web.response.RidesDetailResponse;
import com.doumee.dao.system.model.SystemDictData;
@@ -67,6 +68,9 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private DiscountService discountService;
+
@PreventRepeat
@LoginRequired
@ApiOperation(value = "鎶奸噾鏀粯", notes = "灏忕▼搴忕")
@@ -77,6 +81,20 @@
public ApiResponse<Object> createGoodsOrderPay() {
return ApiResponse.success("鎿嶄綔鎴愬姛",goodsorderService.createGoodsOrderPay(getMemberId()));
}
+
+ @PreventRepeat
+ @LoginRequired
+ @ApiOperation(value = "濂楅璐拱", notes = "灏忕▼搴忕")
+ @GetMapping("/createDiscountOrderPay")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "discountId", value = "濂楅涓婚敭", required = true)
+ })
+ public ApiResponse<Object> createDiscountOrderPay(@RequestParam String discountId) {
+ return ApiResponse.success("鎿嶄綔鎴愬姛",goodsorderService.createDiscountOrderPay(discountId,getMemberId()));
+ }
+
+
@LoginRequired
@ApiOperation(value = "楠戣鏄庣粏", notes = "灏忕▼搴忕")
@@ -112,6 +130,24 @@
return ApiResponse.success(transactionsService.findPageForMini(pageWrap,getMemberId()));
}
+
+
+ @LoginRequired
+ @ApiOperation(value = "鐑攢濂楅", notes = "鐑攢濂楅")
+ @GetMapping("/discountPage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<PageData<Discount>> discountPage (@RequestBody PageWrap<Discount> pageWrap) {
+ Discount discount = new Discount();
+ discount.setStatus(Constants.ZERO);
+ pageWrap.setModel(discount);
+ return ApiResponse.success(discountService.findPage(pageWrap));
+ }
+
+
+
+
@LoginRequired
@ApiOperation("鍩虹閰嶇疆鏁版嵁")
@GetMapping("/baseParamList")
--
Gitblit v1.9.3