From 3c923d976c45df37ea752153e12107a3a29437e1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 17:54:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java | 172 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 124 insertions(+), 48 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 ff5a481..18b4501 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.domain.ShopPoint;
@@ -53,56 +54,131 @@
Integer sPoint = 0;
Integer shopCommissionPoint = 0;
Integer subShopCommissionPoint = 0;
- 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);
- shopPointStatistics.setShopCommissionPoint(shopCommissionPoint);
- shopPointStatistics.setSubShopCommissionPoint(subShopCommissionPoint);
+ Integer serverCommissionPoint = 0;
+ if (sysUser.getRoleType()==1){
+ if (StringUtils.isNotEmpty(shopPoint.getShopName())){
- IPage<ShopPoint> shopPointIPage = this.baseMapper.queryShpointPage(page, shopPoint);
- shopPointStatistics.setShopPointIPage(shopPointIPage);
-
- LocalDateTime startTime = shopPoint.getStartTime();
- LocalDateTime endTime = shopPoint.getEndTime();
- if(null != startTime){
- List<ShopPoint> list = this.list(new LambdaUpdateWrapper<ShopPoint>()
- .eq(ShopPoint::getShopId, sysUser.getObjectId())
- .last(" and create_time between '" + startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + "' and '" + endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + "'"));
- List<String> date = new ArrayList<>();
- List<Map<String, Integer>> data = new ArrayList<>();
- String format = "MM.dd";
- while (true){
- if(startTime.isAfter(endTime)){
- break;
- }
- date.add(startTime.format(DateTimeFormatter.ofPattern(format)));
- Map<String, Integer> map = new HashMap<>();
- //返佣积分
- LocalDateTime finalStartTime = startTime;
- List<ShopPoint> collect = list.stream().filter(s -> s.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))
- .equals(finalStartTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) && s.getType() == 2).collect(Collectors.toList());
- map.put("fyjf", collect.stream().mapToInt(ShopPoint::getVariablePoint).sum());
-
- //服务积分
- List<ShopPoint> collect1 = list.stream().filter(s -> s.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))
- .equals(finalStartTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) && s.getType() == 4).collect(Collectors.toList());
- map.put("fwjf", collect1.stream().mapToInt(ShopPoint::getVariablePoint).sum());
- //绑定下级门店返佣积分
- List<ShopPoint> collect2 = list.stream().filter(s -> s.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))
- .equals(finalStartTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) && s.getType() == 3).collect(Collectors.toList());
- map.put("xjmdfyjf", collect2.stream().mapToInt(ShopPoint::getVariablePoint).sum());
- data.add(map);
- startTime = startTime.plusDays(1);
}
- Map<String, Object> brokenLine = new HashMap<>();
- brokenLine.put("date", date);
- brokenLine.put("data", data);
- shopPointStatistics.setBrokenLine(brokenLine);
+ if (StringUtils.isNotEmpty(shopPoint.getShopLeaderName())){
+
+ }
+ ShopPointStatistics shopPointStatistics = new ShopPointStatistics();
+ IPage<ShopPoint> shopPointIPage = this.baseMapper.queryShpointPage(page, shopPoint);
+ shopPointStatistics.setShopPointIPage(shopPointIPage);
+
+ for (ShopPoint record : shopPointIPage.getRecords()) {
+ switch (record.getType()){
+ case 1:
+ sPoint += record.getVariablePoint();
+
+ break;
+ case 2:
+ shopCommissionPoint += record.getVariablePoint();
+
+ break;
+ case 3:
+ subShopCommissionPoint += record.getVariablePoint();
+
+ break;
+ case 4:
+ serverCommissionPoint+= record.getVariablePoint();
+ break;
+ }
+ }
+ shopPointStatistics.setTotalPoint(sPoint + shopCommissionPoint + subShopCommissionPoint+serverCommissionPoint);
+ shopPointStatistics.setShopPoint(sPoint);
+ shopPointStatistics.setShopCommissionPoint(shopCommissionPoint);
+ shopPointStatistics.setSubShopCommissionPoint(subShopCommissionPoint);
+ LocalDateTime startTime = shopPoint.getStartTime();
+ LocalDateTime endTime = shopPoint.getEndTime();
+ if(null != startTime){
+ List<ShopPoint> list = this.list(new LambdaUpdateWrapper<ShopPoint>()
+ .eq(ShopPoint::getShopId, sysUser.getObjectId())
+ .last(" and create_time between '" + startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + "' and '" + endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + "'"));
+ List<String> date = new ArrayList<>();
+ List<Map<String, Integer>> data = new ArrayList<>();
+ String format = "MM.dd";
+ while (true){
+ if(startTime.isAfter(endTime)){
+ break;
+ }
+ date.add(startTime.format(DateTimeFormatter.ofPattern(format)));
+ Map<String, Integer> map = new HashMap<>();
+ //返佣积分
+ LocalDateTime finalStartTime = startTime;
+ List<ShopPoint> collect = list.stream().filter(s -> s.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))
+ .equals(finalStartTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) && s.getType() == 2).collect(Collectors.toList());
+ map.put("fyjf", collect.stream().mapToInt(ShopPoint::getVariablePoint).sum());
+
+ //服务积分
+ List<ShopPoint> collect1 = list.stream().filter(s -> s.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))
+ .equals(finalStartTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) && s.getType() == 4).collect(Collectors.toList());
+ map.put("fwjf", collect1.stream().mapToInt(ShopPoint::getVariablePoint).sum());
+ //绑定下级门店返佣积分
+ List<ShopPoint> collect2 = list.stream().filter(s -> s.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))
+ .equals(finalStartTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) && s.getType() == 3).collect(Collectors.toList());
+ map.put("xjmdfyjf", collect2.stream().mapToInt(ShopPoint::getVariablePoint).sum());
+ data.add(map);
+ startTime = startTime.plusDays(1);
+ }
+ Map<String, Object> brokenLine = new HashMap<>();
+ brokenLine.put("date", date);
+ brokenLine.put("data", data);
+ shopPointStatistics.setBrokenLine(brokenLine);
+ }
+ return shopPointStatistics;
+ }else{
+ 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);
+ shopPointStatistics.setShopCommissionPoint(shopCommissionPoint);
+ shopPointStatistics.setSubShopCommissionPoint(subShopCommissionPoint);
+
+ IPage<ShopPoint> shopPointIPage = this.baseMapper.queryShpointPage(page, shopPoint);
+ shopPointStatistics.setShopPointIPage(shopPointIPage);
+
+ LocalDateTime startTime = shopPoint.getStartTime();
+ LocalDateTime endTime = shopPoint.getEndTime();
+ if(null != startTime){
+ List<ShopPoint> list = this.list(new LambdaUpdateWrapper<ShopPoint>()
+ .eq(ShopPoint::getShopId, sysUser.getObjectId())
+ .last(" and create_time between '" + startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + "' and '" + endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + "'"));
+ List<String> date = new ArrayList<>();
+ List<Map<String, Integer>> data = new ArrayList<>();
+ String format = "MM.dd";
+ while (true){
+ if(startTime.isAfter(endTime)){
+ break;
+ }
+ date.add(startTime.format(DateTimeFormatter.ofPattern(format)));
+ Map<String, Integer> map = new HashMap<>();
+ //返佣积分
+ LocalDateTime finalStartTime = startTime;
+ List<ShopPoint> collect = list.stream().filter(s -> s.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))
+ .equals(finalStartTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) && s.getType() == 2).collect(Collectors.toList());
+ map.put("fyjf", collect.stream().mapToInt(ShopPoint::getVariablePoint).sum());
+
+ //服务积分
+ List<ShopPoint> collect1 = list.stream().filter(s -> s.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))
+ .equals(finalStartTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) && s.getType() == 4).collect(Collectors.toList());
+ map.put("fwjf", collect1.stream().mapToInt(ShopPoint::getVariablePoint).sum());
+ //绑定下级门店返佣积分
+ List<ShopPoint> collect2 = list.stream().filter(s -> s.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))
+ .equals(finalStartTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) && s.getType() == 3).collect(Collectors.toList());
+ map.put("xjmdfyjf", collect2.stream().mapToInt(ShopPoint::getVariablePoint).sum());
+ data.add(map);
+ startTime = startTime.plusDays(1);
+ }
+ Map<String, Object> brokenLine = new HashMap<>();
+ brokenLine.put("date", date);
+ brokenLine.put("data", data);
+ shopPointStatistics.setBrokenLine(brokenLine);
+ }
+ return shopPointStatistics;
}
- return shopPointStatistics;
}
}
--
Gitblit v1.7.1