From db5fdfbfe157b6b45389fadffa8831f8a3ad955d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 25 十月 2023 11:57:57 +0800
Subject: [PATCH] # 时间设置
---
server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 a74c621..bd350df 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
@@ -89,6 +89,8 @@
@PostMapping("/getTotalData")
@RequiresPermissions("business:goodsorder:query")
public ApiResponse<GoodsorderTotalDataVO> getTotalData (@RequestBody Goodsorder pageWrap) {
+
+ pageWrap.setEndDate(pageWrap.getEndDate() != null ? pageWrap.getEndDate():pageWrap.getStartDate());
return ApiResponse.success(goodsorderService.getTotalData(pageWrap));
}
@@ -127,8 +129,8 @@
@ApiOperation("寮哄埗缁撶畻璁㈠崟")
@PostMapping("/closerGoodsorder")
@RequiresPermissions("business:goodsorder:query")
- public ApiResponse closerGoodsorder(@RequestParam String id){
- goodsorderService.forceCloseGoodsorder(id);
+ public ApiResponse closerGoodsorder(@RequestBody Goodsorder goodsorder){
+ goodsorderService.forceCloseGoodsorder(goodsorder.getId());
return ApiResponse.success(null);
}
@@ -142,7 +144,7 @@
}
@ApiOperation("鑾峰彇鍙��娆句俊鎭�")
- @PostMapping("/getGoodsorderCanBanlanceDTO")
+ @GetMapping("/getGoodsorderCanBanlanceDTO")
@RequiresPermissions("business:goodsorder:query")
public ApiResponse<GoodsorderCanBanlanceDTO> getGoodsorderCanBanlanceDTO(@RequestParam String orderId){
return ApiResponse.success(goodsorderService.getGoodsorderCanBanlanceDTO(orderId));
--
Gitblit v1.9.3