From 086be7eae50e48ad554fd8a3f4cb1e333d587595 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 27 一月 2026 10:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_admin/src/main/java/com/doumee/api/business/GoodsorderController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/server/dmmall_admin/src/main/java/com/doumee/api/business/GoodsorderController.java b/server/dmmall_admin/src/main/java/com/doumee/api/business/GoodsorderController.java
index 8bbc807..7c29c2a 100644
--- a/server/dmmall_admin/src/main/java/com/doumee/api/business/GoodsorderController.java
+++ b/server/dmmall_admin/src/main/java/com/doumee/api/business/GoodsorderController.java
@@ -12,6 +12,8 @@
import com.doumee.core.utils.kuaidi100.ExpressUtils;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.GoodsorderExport;
+import com.doumee.dao.web.request.AfterSaleApplyRequest;
+import com.doumee.service.business.AftersaleService;
import com.doumee.service.business.GoodsorderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -36,6 +38,8 @@
@Autowired
private GoodsorderService goodsorderService;
+ @Autowired
+ private AftersaleService aftersaleService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -95,6 +99,7 @@
@PostMapping("/page")
@RequiresPermissions("business:goodsorder:query")
public ApiResponse<PageData<Goodsorder>> findPage (@RequestBody PageWrap<Goodsorder> pageWrap) {
+ pageWrap.getModel().setNeedCount(true);
return ApiResponse.success(goodsorderService.findPage(pageWrap));
}
@@ -108,15 +113,9 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:goodsorder:exportExcel")
- public void exportExcel (@RequestBody Goodsorder pageWrap, HttpServletResponse response) {
- List<Goodsorder> list=goodsorderService.exportExcel(pageWrap);
- for(Goodsorder model:list){
- if(model.getStatus()!=null){
- model.setStatusStr(Constants.OrderStatus.getInfo(model.getStatus()));
- model.setGoodsPrice(model.getGoodsPrice()+" "+model.getGoodsNum());
- }
- }
- ExcelExporter.build(Goodsorder.class).export(list, "鍟嗗搧璁㈠崟淇℃伅琛�", response);
+ public void exportExcel (@RequestBody PageWrap<Goodsorder> pageWrap, HttpServletResponse response) {
+ List<GoodsorderExport> list=goodsorderService.exportExcel(pageWrap);
+ ExcelExporter.build(GoodsorderExport.class).export(list, "鍟嗗搧璁㈠崟淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -145,8 +144,8 @@
@ApiOperation("璁㈠崟閫�娆�")
@PostMapping("/orderRefund")
@RequiresPermissions("business:goodsorder:update")
- public ApiResponse orderRefund(@RequestBody Goodsorder goodsorder) {
- goodsorderService.orderRefund(goodsorder);
+ public ApiResponse orderRefund(@RequestBody AfterSaleApplyRequest goodsorder) {
+ aftersaleService.afterSaleApply(goodsorder);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3