From efc7fe9c194a12f7bebe7a5363ce7cd4f8330f2e Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期六, 10 六月 2023 22:36:14 +0800
Subject: [PATCH] 123
---
ruoyi-admin/src/main/resources/application-druid.yml | 4 ++--
zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java | 9 +++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 045d564..b2e66b2 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,8 +6,8 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
-# url: jdbc:mysql://47.93.189.255:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://47.93.189.255:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: ZhangApp123!
# password: 123456
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java
index 64f1393..6052b7c 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java
@@ -229,6 +229,15 @@
List<ZTravelPriceDetail> detailList = priceDto.getDetailList();
+ //濡傛灉浼犺繃鏉ョ殑鍒楄〃鐨勬暟鎹噷闈㈡病鏈塱d
+ List<ZTravelPriceDetail> addPriceDetail = detailList.stream().filter(priceDetail -> priceDetail.getId() == null || priceDetail.getId() == 0 ).collect(Collectors.toList());
+ addPriceDetail.forEach(priceDetail -> {
+ priceDetail.setFeeId(priceDto.getId());
+ });
+
+ //閭ｅ氨鍏堝鍔犲埌鏁版嵁搴撲腑
+ zTravelPriceDetailService.saveBatch(addPriceDetail);
+
//寰楀埌鎬诲ぉ鏁�
long count = detailList.stream().map(ZTravelPriceDetail::getHappenTime).distinct().count();
Integer totalDay = Math.toIntExact(count);
--
Gitblit v1.9.1