From cc4b5bd5e491f7f88db579dbd8c6a87c42da367a Mon Sep 17 00:00:00 2001
From: sdif <xiaoping_0000@163.com>
Date: Tue, 10 Oct 2023 19:48:32 +0800
Subject: [PATCH] 修改统计条件
---
pz-admin/src/main/resources/application-dev.yml | 6 +++---
pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pz-admin/src/main/resources/application-dev.yml b/pz-admin/src/main/resources/application-dev.yml
index 89e81a7..970c7e5 100644
--- a/pz-admin/src/main/resources/application-dev.yml
+++ b/pz-admin/src/main/resources/application-dev.yml
@@ -102,13 +102,13 @@ spring:
spring:
redis:
# 地址
- host: cluster1.prd.nyinhong.com
+ host: 127.0.0.1
# 端口，默认为6379
- port: 6319
+ port: 6379
# 数据库索引
database: 3
# 密码(如没有密码请注释掉)
- password: yongqi@2022
+ #password: yongqi@2022
# 连接超时时间
timeout: 10s
# 是否开启ssl
diff --git a/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java b/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
index 72e59af..1844f5d 100644
--- a/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
+++ b/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
@@ -1435,6 +1435,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
@Override
public DataOrderVo platformRevenue(DataViewBo dataViewBo) {
if(null != dataViewBo.getUserId()){
+ Company company = companyMapper.selectOne(new LambdaQueryWrapper<Company>().eq(Company::getUid, dataViewBo.getUserId()));
+ dataViewBo.setUserId(company.getId().longValue());
return baseMapper.selectPlatformCom(dataViewBo);
}
return baseMapper.selectPlatformRevenue(dataViewBo);
--
libgit2 0.26.0