From 9daa8abeb6d7cce7413f5aeb6eec86b88c792c82 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 19:47:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java
index 9ff2204..ff5a481 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java
@@ -50,18 +50,13 @@
public ShopPointStatistics statistics(IPage<ShopPoint> page, ShopPoint shopPoint) {
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
-
- List<Shop> shopList = shopService.list(new LambdaQueryWrapper<Shop>()
- .eq(Shop::getAppUserId,sysUser.getAppUserId()));
Integer sPoint = 0;
Integer shopCommissionPoint = 0;
Integer subShopCommissionPoint = 0;
- for (Shop shop : shopList) {
- sPoint += shop.getServerPoint();
- shopCommissionPoint += shop.getSharePoint();
- subShopCommissionPoint += shop.getLowerLevelSharePoint();
- }
-
+ Shop shop = shopService.getById(sysUser.getObjectId());
+ sPoint += shop.getServerPoint();
+ shopCommissionPoint += shop.getSharePoint();
+ subShopCommissionPoint += shop.getLowerLevelSharePoint();
ShopPointStatistics shopPointStatistics = new ShopPointStatistics();
shopPointStatistics.setTotalPoint(sPoint + shopCommissionPoint + subShopCommissionPoint);
shopPointStatistics.setShopPoint(sPoint);
--
Gitblit v1.7.1