From 21c8161b67d69a16fbb665d8e1bbedd5e5f67775 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期二, 20 五月 2025 15:28:21 +0800
Subject: [PATCH] fix: 增加报价参数
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 3 ++-
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderAppVo.java | 6 ++++++
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
index d4cb7e2..0b35ee0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
@@ -168,7 +168,7 @@
model.setCondition(tbOrders.getRemark()); // 璁剧疆澶囨敞淇℃伅
}
-
+ model.setPrice(tbOrders.getBookingPrice().doubleValue());
model.setOfferPrice(tbOrders.getBookingPrice().doubleValue()); // 鐢熸垚鎶ヤ环
model.setReferrals(scApp.getReferrals()); // 璁剧疆鎺ㄤ粙浜哄悕绉颁负鏈烘瀯鍚嶇О
// model.setUnitRemarks("鍟嗘埛闅忔満澶囨敞淇℃伅"); // 闅忔満璁剧疆鍟嗘埛澶囨敞
@@ -252,6 +252,7 @@
model.setOfferPrice(tbOrders.getBookingPrice().doubleValue()); // 鐢熸垚鎶ヤ环
+ model.setPrice(tbOrders.getBookingPrice().doubleValue());
model.setReferrals(scApp.getReferrals()); // 璁剧疆鎺ㄤ粙浜哄悕绉颁负鏈烘瀯鍚嶇О
// model.setUnitRemarks("鍟嗘埛闅忔満澶囨敞淇℃伅"); // 闅忔満璁剧疆鍟嗘埛澶囨敞
model.setPayQRcodeURL(scApp.getPayUrl());
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderAppVo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderAppVo.java
index e376690..86b55b1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderAppVo.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderAppVo.java
@@ -117,6 +117,12 @@
* 鎶ヤ环锛屽崟浣嶏細鍏�
*/
private Double offerPrice;
+
+ /**
+ * 鎴愪氦浠�
+ */
+ private Double price;
+
/**
* 鎺ㄤ粙浜轰俊鎭紝鏀寔鎵嬫満鍙锋垨濮撳悕
*/
--
Gitblit v1.9.1