From fbfde8292c1ab06ccd943ef4c7acfe3c0e4101a1 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 15 四月 2025 19:42:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
index 39214ce..d2a16a8 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
@@ -91,20 +91,21 @@
double eatTotal = 0;
double stayTotal = 0;
double travelTotal = 0;
-
+ double shopTotal = 0;
//鎶婃墍鏈夎缁嗘暟鎹殑璐圭敤鍊肩疮鍔犺捣鏉�
for (TravelDetail detail : travelDetailList) {
entranceTotal+=detail.getEntrance();
eatTotal+=detail.getEat();
stayTotal+=detail.getStay();
travelTotal+=detail.getTravel();
+ shopTotal += detail.getShop();
}
travelCount.setEntranceTotal(entranceTotal);
travelCount.setEatTotal(eatTotal);
travelCount.setStayTotal(stayTotal);
travelCount.setTravelTotal(travelTotal);
-
+ travelCount.setShopTotal(shopTotal);
DecimalFormat df = new DecimalFormat("0.00");
travelCount.setTotalPrice(Double.parseDouble(df.format(entranceTotal+eatTotal+travelCount.getGroupTotal()+stayTotal+travelTotal)));
}
--
Gitblit v1.9.1