From 926e065fb0b4424d0d51023c234a92433bac61c8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 01 八月 2025 11:53:45 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
index c02d01d..7987767 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
@@ -157,6 +157,7 @@
serverCarModelWarpper.setContentExclusive(contentExclusive);
serverCarModelWarpper.setContentPrice(contentPrice);
+ serverCarModelWarpper.setWaitPrice(jsonObject);
serverCarModelWarpper.setAmount(this.calculationPrice(contentExclusive, distance, duration, wait, waitMoney));
serverCarModelWarpper.setBuyNowAmount(this.calculationPrice(contentPrice, distance, duration, wait, waitMoney));
@@ -296,7 +297,7 @@
serverCarModelWarpper.setContentNotTwo(new JSONObject());
serverCarModelWarpper.setContentPutThree(new JSONObject());
serverCarModelWarpper.setContentNotThree(new JSONObject());
- serverCarModelWarpper.setContentExclusive(new JSONObject());
+ serverCarModelWarpper.setContentExclusive(jsonObject);
serverCarModelWarpper.setContentPrice(new JSONObject());
return serverCarModelWarpper;
--
Gitblit v1.7.1