From dfafe88917bd344d570277f14b7ea7bf03fa93d4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 二月 2025 18:33:41 +0800
Subject: [PATCH] jtt808初始化
---
server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 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 bd350df..7f564cc 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,16 +10,21 @@
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.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;
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.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -40,6 +45,8 @@
@Autowired
private GoodsorderService goodsorderService;
+ @Autowired
+ private RefundService refundService;
@PreventRepeat
@@ -99,19 +106,37 @@
@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.getPayMoney());
+ 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));
+ 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}")
@@ -120,6 +145,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));
+ }
/**
* 寮哄埗缁撶畻璁㈠崟
@@ -139,7 +170,7 @@
@PostMapping("/backGoodsorder")
@RequiresPermissions("business:goodsorder:query")
public ApiResponse backGoodsorder(@RequestBody GoodsorderBackDTO goodsorderBackDTO){
- goodsorderService.backGoodsorder(goodsorderBackDTO.getOrderId(),goodsorderBackDTO.getMoney(),goodsorderBackDTO.getReason());
+ goodsorderService.backGoodsorder(goodsorderBackDTO);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3