From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 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 dda97c7..753f115 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
@@ -10,11 +10,14 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.WxBillDetail;
+import com.doumee.dao.business.vo.BikeIncomeReportVO;
+import com.doumee.dao.business.vo.DiscountGoodsorderExportVO;
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.dao.business.web.response.GoodsorderDetailVO;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.RefundService;
@@ -22,13 +25,16 @@
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.checkerframework.checker.units.qual.C;
+import org.springframework.beans.BeanUtils;
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.Date;
import java.util.List;
+import java.util.Objects;
/**
* @author 姹熻箘韫�
@@ -89,6 +95,8 @@
public ApiResponse<PageData<Goodsorder>> findPage (@RequestBody PageWrap<Goodsorder> pageWrap) {
return ApiResponse.success(goodsorderService.findPage(pageWrap));
}
+
+
@ApiOperation("绾夸笂浜ゆ槗姹囨�绘暟鎹帴鍙�")
@PostMapping("/getTotalData")
@RequiresPermissions("business:goodsorder:query")
@@ -98,19 +106,41 @@
return ApiResponse.success(goodsorderService.getTotalData(pageWrap));
}
+
+
@ApiOperation("璁㈠崟鍒楄〃-瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:goodsorder:exportExcel")
public void exportExcel (@RequestBody PageWrap<Goodsorder> pageWrap, HttpServletResponse response) {
ExcelExporter.build(Goodsorder.class).exportWithFirstAndEnd(goodsorderService.findPage(pageWrap).getRecords(), "璁㈠崟鍒楄〃_"+System.currentTimeMillis(),"璁㈠崟鍒楄〃_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
-
}
+
+
+ @ApiOperation("濂楅鍗¤鍗曞垪琛�-瀵煎嚭Excel")
+ @PostMapping("/discountExportExcel")
+ @RequiresPermissions("business:goodsorder:exportExcel")
+ public void discountExportExcel (@RequestBody PageWrap<Goodsorder> pageWrap, HttpServletResponse response) {
+ List<Goodsorder> goodsorders = goodsorderService.findPage(pageWrap).getRecords();
+ List<DiscountGoodsorderExportVO> discountGoodsorderExportVOList = new ArrayList<>();
+ for (Goodsorder goodsorder:goodsorders) {
+ DiscountGoodsorderExportVO discountGoodsorderExportVO = new DiscountGoodsorderExportVO();
+ BeanUtils.copyProperties(goodsorder,discountGoodsorderExportVO);
+ discountGoodsorderExportVO.setPayMoney(discountGoodsorderExportVO.getMoney());
+ discountGoodsorderExportVO.setOrigin(Constants.ZERO);
+ discountGoodsorderExportVOList.add(discountGoodsorderExportVO);
+ }
+ ExcelExporter.build(DiscountGoodsorderExportVO.class).exportWithFirstAndEnd(discountGoodsorderExportVOList, "璁㈠崟鍒楄〃_"+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")
@@ -124,6 +154,12 @@
return ApiResponse.success(goodsorderService.getGoodsorderDetailDTO(id));
}
+ @ApiOperation("璁㈠崟璇︽儏-濂楅鍗�")
+ @GetMapping("/discountOrderDetail")
+ @RequiresPermissions("business:goodsorder:query")
+ public ApiResponse<GoodsorderDetailVO> discountOrderDetail(@RequestParam String id) {
+ return ApiResponse.success(goodsorderService.getGoodsorderDetailForDisCount(id));
+ }
/**
* 寮哄埗缁撶畻璁㈠崟
@@ -143,7 +179,10 @@
@PostMapping("/backGoodsorder")
@RequiresPermissions("business:goodsorder:query")
public ApiResponse backGoodsorder(@RequestBody GoodsorderBackDTO goodsorderBackDTO){
- goodsorderService.backGoodsorder(goodsorderBackDTO.getOrderId(),goodsorderBackDTO.getMoney(),goodsorderBackDTO.getReason());
+ if(Objects.nonNull(goodsorderBackDTO) && Objects.isNull(goodsorderBackDTO.getBackType())){
+ goodsorderBackDTO.setBackType(Constants.ONE);
+ }
+ goodsorderService.backGoodsorder(goodsorderBackDTO);
return ApiResponse.success(null);
}
@@ -153,4 +192,19 @@
public ApiResponse<GoodsorderCanBanlanceDTO> getGoodsorderCanBanlanceDTO(@RequestParam String orderId){
return ApiResponse.success(goodsorderService.getGoodsorderCanBanlanceDTO(orderId));
}
+
+
+ @ApiOperation("杞﹀瀷鏀跺叆鍒嗘瀽")
+ @PostMapping("/getBikeIncomeReportVOList")
+ public ApiResponse<List<List<String>>> getBikeIncomeReportVOList (@RequestBody Goodsorder goodsorder) {
+ return ApiResponse.success(goodsorderService.getBikeIncomeReportVOList(goodsorder.getStartDate(),goodsorder.getEndDate()));
+ }
+
+
+
+ @ApiOperation("杞﹀瀷鏀跺叆鍒嗘瀽-瀵煎嚭Excel")
+ @PostMapping("/bikeIncomeExportExcel")
+ public void exportExcel (@RequestBody Goodsorder goodsorder, HttpServletResponse response) {
+ goodsorderService.excel(goodsorder.getStartDate(),goodsorder.getEndDate(),response);
+ }
}
--
Gitblit v1.9.3