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 |   65 +++++++++++++++++++++++++++-----
 1 files changed, 54 insertions(+), 11 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 d1e8e29..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,9 @@
 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;
 import io.swagger.annotations.Api;
@@ -20,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;
 
@@ -74,7 +79,7 @@
         return ApiResponse.success(null);
     }
 
-    @ApiOperation("鍒嗛〉鏌ヨ")
+    @ApiOperation("璁㈠崟鍒楄〃-鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @RequiresPermissions("business:goodsorder:query")
     public ApiResponse<PageData<Goodsorder>> findPage (@RequestBody PageWrap<Goodsorder> pageWrap) {
@@ -84,26 +89,64 @@
     @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));
     }
 
-    @ApiOperation("瀵煎嚭Excel")
+    @ApiOperation("璁㈠崟鍒楄〃-瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:goodsorder:exportExcel")
     public void exportExcel (@RequestBody PageWrap<Goodsorder> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Goodsorder.class).export(goodsorderService.findPage(pageWrap).getRecords(), "鑷杞︿俊鎭〃", response);
-    }
+        ExcelExporter.build(Goodsorder.class).exportWithFirstAndEnd(goodsorderService.findPage(pageWrap).getRecords(), "璁㈠崟鍒楄〃_"+System.currentTimeMillis(),"璁㈠崟鍒楄〃_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
 
-    @ApiOperation("璐﹀崟鏀舵鏄庣粏_瀵煎嚭Excel")
-    @PostMapping("/exportNotBikeExcel")
-    @RequiresPermissions("business:wxbilldetail:exportExcel")
-    public void exportNotBikeExcel (@RequestBody PageWrap<Goodsorder> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(GoodsorderExportVO.class).exportWithFirstAndEnd(goodsorderService.findExportNotBikPage(pageWrap.getModel()), "璐﹀崟鏀舵鏄庣粏_"+System.currentTimeMillis(),"璐﹀崟鏀舵鏄庣粏_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+    }
+    @ApiOperation("鏀舵鏄庣粏锛堝井淇″璐︽槑缁嗭級_鍒嗛〉鏌ヨ")
+    @PostMapping("/pageAccountDetail")
+    @RequiresPermissions("business:goodsorder:query")
+    public ApiResponse<PageData<GoodsorderExportVO>> findPageAccountDetail(@RequestBody PageWrap<Goodsorder> pageWrap) {
+        return ApiResponse.success(goodsorderService.findAccountDetailPage(pageWrap));
+    }
+    @ApiOperation("鏀舵鏄庣粏锛堝井淇″璐︽槑缁嗭級_瀵煎嚭Excel")
+    @PostMapping("/exportAccountDetailExcel")
+    @RequiresPermissions("business:goodsorder:exportExcel")
+    public void exportAccountDetailExcel (@RequestBody PageWrap<Goodsorder> pageWrap, HttpServletResponse response) {
+        ExcelExporter.build(GoodsorderExportVO.class).exportWithFirstAndEnd(goodsorderService.findExportAccountDetailPage(pageWrap.getModel()), "璐﹀崟鏀舵鏄庣粏_"+System.currentTimeMillis(),"璐﹀崟鏀舵鏄庣粏_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
     }
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
     @RequiresPermissions("business:goodsorder:query")
-    public ApiResponse findById(@PathVariable String id) {
-        return ApiResponse.success(goodsorderService.findById(id));
+    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