From 8e75bb4e451d6d3f33e2146335bad0f85d27d99f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 02 十一月 2023 17:06:46 +0800
Subject: [PATCH] 硬件协议对接
---
server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 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..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
@@ -3,6 +3,7 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.constants.Constants;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -11,6 +12,8 @@
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.request.GoodsorderCanBanlanceDTO;
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.GoodsorderService;
@@ -21,6 +24,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -85,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));
}
@@ -113,4 +119,34 @@
public ApiResponse<GoodsorderDetailDTO> findById(@PathVariable String id) {
return ApiResponse.success(goodsorderService.getGoodsorderDetailDTO(id));
}
+
+
+ /**
+ * 寮哄埗缁撶畻璁㈠崟
+ * @param id
+ * @return
+ */
+ @ApiOperation("寮哄埗缁撶畻璁㈠崟")
+ @PostMapping("/closerGoodsorder")
+ @RequiresPermissions("business:goodsorder:query")
+ public ApiResponse closerGoodsorder(@RequestBody Goodsorder goodsorder){
+ goodsorderService.forceCloseGoodsorder(goodsorder.getId());
+ return ApiResponse.success(null);
+ }
+
+
+ @ApiOperation("閫�娆�")
+ @PostMapping("/backGoodsorder")
+ @RequiresPermissions("business:goodsorder:query")
+ public ApiResponse backGoodsorder(@RequestBody GoodsorderBackDTO goodsorderBackDTO){
+ goodsorderService.backGoodsorder(goodsorderBackDTO.getOrderId(),goodsorderBackDTO.getMoney(),goodsorderBackDTO.getReason());
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鑾峰彇鍙��娆句俊鎭�")
+ @GetMapping("/getGoodsorderCanBanlanceDTO")
+ @RequiresPermissions("business:goodsorder:query")
+ public ApiResponse<GoodsorderCanBanlanceDTO> getGoodsorderCanBanlanceDTO(@RequestParam String orderId){
+ return ApiResponse.success(goodsorderService.getGoodsorderCanBanlanceDTO(orderId));
+ }
}
--
Gitblit v1.9.3