From cde49794973557adda93091606a9820e7fddb46f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十月 2023 17:03:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
index 221c6ed..238304a 100644
--- a/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
@@ -11,6 +11,7 @@
import com.doumee.dao.business.model.WxBillDetail;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
+import com.doumee.dao.business.web.request.GoodsorderBackDTO;
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.GoodsorderService;
@@ -21,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -113,4 +115,27 @@
public ApiResponse<GoodsorderDetailDTO> findById(@PathVariable String id) {
return ApiResponse.success(goodsorderService.getGoodsorderDetailDTO(id));
}
+
+
+ /**
+ * 寮哄埗缁撶畻璁㈠崟
+ * @param id
+ * @return
+ */
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @PostMapping("/closerGoodsorder")
+ @RequiresPermissions("business:goodsorder:query")
+ public ApiResponse closerGoodsorder(@RequestParam String id){
+ goodsorderService.closerGoodsorder(id);
+ return ApiResponse.success(null);
+ }
+
+
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @PostMapping("/backGoodsorder")
+ @RequiresPermissions("business:goodsorder:query")
+ public ApiResponse backGoodsorder(@RequestBody GoodsorderBackDTO goodsorderBackDTO){
+ goodsorderService.backGoodsorder(goodsorderBackDTO.getOrderId(),goodsorderBackDTO.getMoney());
+ return ApiResponse.success(null);
+ }
}
--
Gitblit v1.9.3