From ef33492fa817c1a61589a25cc5a2721663f49e8c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 06 一月 2025 11:37:23 +0800
Subject: [PATCH] 添加了两个字段，已经修改了对应代码
---
zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java | 5 +++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 4 ++--
zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java | 4 ++++
zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java | 5 +++++
4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 89856db..25adffc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -85,12 +85,12 @@
{
SysUser user = SecurityUtils.getLoginUser().getUser();
// System.out.println(user);
- // System.out.println("===========0-000000000000000000");
+// System.out.println("===========0oiii999999999999999-000000000000000000");
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
Set<String> permissions = permissionService.getMenuPermission(user);
- // System.out.println(permissions);
+ System.out.println(permissions);
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
ajax.put("roles", roles);
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java b/zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java
index 7300971..f340cd3 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java
@@ -90,6 +90,11 @@
private Double eatTotal;
/**
+ * 鍏辫璐墿璐�
+ */
+ private Double shopTotal;
+
+ /**
* 鍏辫鍥㈣垂
*
*
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java b/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java
index 6854e25..edaefdd 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java
@@ -85,6 +85,10 @@
* 浜ら�氳垂
*/
private Double travel;
+ /**
+ * 璐墿璐�
+ */
+ private Double shop;
/**
* 鐢靛瓙鏂囦欢璺緞
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