From 9088209cdd7e3158d2a04caae05e6726ba3b3ad6 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 12 十二月 2023 18:26:17 +0800
Subject: [PATCH] Merge branch 'devPartner' of http://139.186.142.91:10010/r/productDev/parkBike into devPartner

---
 server/web/src/main/java/com/doumee/api/web/BusinessApi.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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 2766dad..957bc40 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
@@ -1,7 +1,9 @@
 package com.doumee.api.web;
 
+//import com.doumee.api.Repeat.RepeatSubmit;
 import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.core.annotation.LoginRequired;
+import com.doumee.core.annotation.pr.PreventRepeat;
 import com.doumee.core.annotation.trace.Trace;
 import com.doumee.core.constants.Constants;
 import com.doumee.core.model.ApiResponse;
@@ -58,6 +60,7 @@
     @Autowired
     private SystemDictDataBiz systemDictDataBiz;
 
+    @PreventRepeat
     @LoginRequired
     @ApiOperation(value = "鎶奸噾鏀粯", notes = "灏忕▼搴忕")
     @GetMapping("/createGoodsOrderPay")
@@ -144,6 +147,7 @@
     }
 
 
+    @PreventRepeat
     @LoginRequired
     @ApiOperation(value = "鎵爜瑙i攣", notes = "灏忕▼搴忕")
     @GetMapping("/openLock")
@@ -169,14 +173,14 @@
 
 
     @LoginRequired
+    @PreventRepeat
     @ApiOperation(value = "璁㈠崟缁撶畻", notes = "灏忕▼搴忕")
     @GetMapping("/goodsOrderSettlement")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "orderId", value = "璁㈠崟涓婚敭", required = true)
     })
-    public ApiResponse goodsOrderSettlement(@RequestParam String orderId) {
-        goodsorderService.goodsOrderSettlement(orderId);
+    public ApiResponse goodsOrderSettlement() {
+        goodsorderService.goodsOrderSettlement(getMemberId());
         return  ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 

--
Gitblit v1.9.3