From 4b2c48677c2b5de7f89ff0d018a55b7916467b27 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 22 四月 2025 17:29:41 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java
index 31de0b8..acb54bd 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java
@@ -321,7 +321,7 @@
withdrawDetailVO.setServeId(order.getServeId());
withdrawDetailVO.setServeName(order.getServeName());
withdrawDetailVO.setServePrice(order.getServePrice());
- withdrawDetailVO.setOrderMoney(order.getOrderMoney());
+ withdrawDetailVO.setOrderMoney(order.getSubsidy()!=null?order.getSubsidy().add(order.getOrderMoney()):order.getOrderMoney());
withdrawDetailVO.setReservationName(order.getReservationName());
withdrawDetailVO.setReservationPhone(order.getReservationPhone());
withdrawDetailVO.setReservationAddress(order.getReservationAddress());
@@ -340,6 +340,7 @@
withdrawDetailVO.setWithdrawalState(withdraw.getState());
withdrawDetailVO.setWithdrawalTime(withdraw.getCreateTime());
}
+ withdrawDetailVO.setPackageInfo(order.getPackageInfo());
withdrawDetailVO.setAddress(order.getAddress());
if (null != serveRecord) {
withdrawDetailVO.setPhoto(serveRecord.getPhoto());
--
Gitblit v1.7.1