From 61190752c2edf563ebce2f7c94653b6a91cf8c5e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:43:36 +0800
Subject: [PATCH] ss

---
 server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java |   44 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 insertions(+), 2 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..dda97c7 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,16 +12,21 @@
 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 com.doumee.service.business.RefundService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -36,6 +42,8 @@
 
     @Autowired
     private GoodsorderService goodsorderService;
+    @Autowired
+    private RefundService refundService;
 
 
     @PreventRepeat
@@ -85,6 +93,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));
     }
 
@@ -99,13 +109,13 @@
     @PostMapping("/pageAccountDetail")
     @RequiresPermissions("business:goodsorder:query")
     public ApiResponse<PageData<GoodsorderExportVO>> findPageAccountDetail(@RequestBody PageWrap<Goodsorder> pageWrap) {
-        return ApiResponse.success(goodsorderService.findAccountDetailPage(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);
+            ExcelExporter.build(GoodsorderExportVO.class).exportWithFirstAndEnd(goodsorderService.findExportAccountDetailPage(pageWrap.getModel()), "璐﹀崟鏀舵鏄庣粏_"+System.currentTimeMillis(),"璐﹀崟鏀舵鏄庣粏_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
     }
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
@@ -113,4 +123,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