From 9f8b3700ffbcc616a97e7ee2ea283ef4df3d666a Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 04 六月 2026 08:43:55 +0800
Subject: [PATCH] 代码生成
---
server/admin/src/main/java/com/doumee/api/business/OrdersController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/OrdersController.java b/server/admin/src/main/java/com/doumee/api/business/OrdersController.java
index 5bfa6ba..23163ed 100644
--- a/server/admin/src/main/java/com/doumee/api/business/OrdersController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/OrdersController.java
@@ -12,10 +12,7 @@
import com.doumee.dao.dto.DispatchDTO;
import com.doumee.dao.dto.HandleOrderExceptionDTO;
import com.doumee.dao.dto.ManualRefundDTO;
-import com.doumee.dao.vo.OrderDetailVO;
-import com.doumee.dao.vo.OrderDispatchVO;
-import com.doumee.dao.vo.OrdersExportVO;
-import com.doumee.dao.vo.OrderSummaryVO;
+import com.doumee.dao.vo.*;
import com.doumee.service.business.OrdersService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -97,9 +94,14 @@
for (Orders o : records) {
OrdersExportVO vo = new OrdersExportVO();
vo.setCode(o.getCode());
+ vo.setRelationOrderCode(o.getRelationOrderCode());
vo.setGoodsInfo(o.getGoodsInfo());
- vo.setTypeName(o.getType() != null ? (o.getType() == 0 ? "灏卞湴瀛樺彇" : "寮傚湴瀛樺彇") : "");
- vo.setOrderLevel(Constants.getDriverLevelName(Objects.nonNull(o.getOrderLevel())?Integer.valueOf(o.getOrderLevel()):Constants.ZERO));
+ vo.setTakeUser(o.getTakeUser());
+ vo.setTakePhone(o.getTakePhone());
+ vo.setDepositShopName(o.getDepositShopName());
+ vo.setTakeShopName(o.getTakeShopName());
+ vo.setTypeName(o.getType() != null ? (o.getType() == 0 ? "灏卞湴瀵勫瓨" : "鍚屽煄瀵勯��") : "");
+ vo.setOrderLevel(StringUtils.isNotBlank(o.getOrderLevel()) ? Constants.getDriverLevelName(Integer.valueOf(o.getOrderLevel())) : Constants.getDriverLevelName(Constants.ZERO));
vo.setDeclaredFee(String.valueOf(Constants.getFormatMoney(o.getDeclaredFee())));
vo.setBasicAmount(String.valueOf(Constants.getFormatMoney(o.getBasicAmount())));
vo.setTotalAmount(String.valueOf(Constants.getFormatMoney(o.getTotalAmount())));
@@ -109,6 +111,8 @@
vo.setOverdueAmount(String.valueOf(Constants.getFormatMoney(o.getOverdueAmount())));
vo.setExceptionAmount(String.valueOf(Constants.getFormatMoney(o.getExceptionAmount())));
vo.setDeductionAmount(String.valueOf(Constants.getFormatMoney(o.getDeductionAmount())));
+ vo.setExceptionFee(String.valueOf(Constants.getFormatMoney(o.getExceptionFee())));
+ vo.setShopCompensationAmount(String.valueOf(Constants.getFormatMoney(o.getShopCompensationAmount())));
vo.setStatusDesc(o.getStatusDesc());
vo.setSettlementDesc(o.getSettlementStatus() != null ? (o.getSettlementStatus() == 1 ? "宸茬粨绠�" : "寰呯粨绠�") : "");
vo.setPayTime(o.getPayTime());
@@ -174,4 +178,11 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @ApiOperation("鎵嬪姩閫�娆捐鎯�")
+ @GetMapping("/manualRefundDetail/{orderId}")
+ @RequiresPermissions("business:orders:query")
+ public ApiResponse<ManualRefundDetailVO> manualRefundDetail(@PathVariable Integer orderId) {
+ return ApiResponse.success(ordersService.getManualRefundDetail(orderId));
+ }
+
}
--
Gitblit v1.9.3