From a04cc61a75c61025a4efcdd95b07d73b0f892ce9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 13:50:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 186 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 141 insertions(+), 45 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 62b4272..1649af8 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -28,13 +28,17 @@
import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
import com.ruoyi.order.model.Order;
import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.domain.ShopBalanceStatement;
import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.other.api.factory.ShopBalanceStatementClientFallbackFactory;
+import com.ruoyi.other.api.feignClient.ShopBalanceStatementClient;
import com.ruoyi.other.api.feignClient.ShopClient;
import com.ruoyi.other.api.feignClient.StoreClient;
import com.ruoyi.other.api.feignClient.VipSettingClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PostMapping;
@@ -48,8 +52,10 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.web.controller.BaseController;
@@ -98,6 +104,12 @@
private SysUserClient sysUserClient;
@Resource
private OrderClient orderClient;
+ @Resource
+ private ShopBalanceStatementClient shopBalanceStatementClient;
+ @Resource
+ private UserCancellationLogService userCancellationLogService;
+ @Resource
+ private BalanceChangeRecordService balanceChangeRecordService;
@ResponseBody
@@ -125,6 +137,8 @@
@PostMapping("/editAppUserById")
public R<Void> editAppUserById(@RequestBody AppUser appUser) {
appUserService.updateById(appUser);
+ appUserService.update(new LambdaUpdateWrapper<AppUser>().eq(AppUser::getId, appUser.getId())
+ .set(AppUser::getLastShopTime, appUser.getLastShopTime()));
return R.ok();
}
@@ -207,8 +221,7 @@
return R.ok(user);
}
- @Resource
- private UserCancellationLogService userCancellationLogService;
+
@ResponseBody
@GetMapping("/unregis")
@@ -304,7 +317,8 @@
if (user.getShopId() != null) {
R<Shop> storeById = shopClient.getShopById(user.getShopId());
if (storeById.getData() != null) {
- user.setShopName(storeById.getData().getName());
+ Shop shop = storeById.getData();
+ user.setShopName(shop.getName());
}
}
Long count1 = appUserService.lambdaQuery().eq(AppUser::getVipId, 1).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
@@ -509,7 +523,11 @@
@GetMapping("/select")
@ApiOperation(value = "用户列表-查询绑定人", tags = {"管理后台"})
public R<AppUser> select(String phone) {
- AppUser byId = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();
+ AppUser byId = appUserService.lambdaQuery()
+ .eq(AppUser::getPhone, phone)
+ .eq(AppUser::getDelFlag,0)
+ .eq(AppUser::getStatus,1)
+ .one();
if (byId == null) {
return R.fail("搜索失败，手机号错误。");
}
@@ -727,45 +745,98 @@
*/
@GetMapping("/commissionDetail")
@ApiOperation(value = "分佣统计", tags = "管理后台-首页统计")
- public R<CommissionDetail> commissionDetail(@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime,
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) {
- Long userid = tokenService.getLoginUser().getUserid();
- SysUser sysUser = sysUserClient.getSysUser(userid).getData();
- LambdaQueryWrapper<AppUser> queryWrapper = new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0);
- if(sysUser.getRoleType() == 2){
- queryWrapper.eq(AppUser::getShopId, sysUser.getObjectId());
+ public R<CommissionDetail> commissionDetail(CommissionDetail cd) {
+ if (cd.getStartTime() == null || cd.getEndTime() == null) {
+ return R.fail("请选择时间");
}
- queryWrapper.ge(null != startTime, AppUser::getCreateTime, startTime);
- queryWrapper.le(null != endTime, AppUser::getCreateTime, endTime);
- queryWrapper.orderByAsc(AppUser::getCreateTime);
- List<AppUser> appUserList = appUserService.list(queryWrapper);
- if (appUserList.isEmpty()) {
- return R.ok(new CommissionDetail());
+ if (cd.getStartTime().isAfter(cd.getEndTime())) {
+ return R.fail("开始时间不能大于结束时间");
}
- BigDecimal totalCommission = BigDecimal.ZERO;
- BigDecimal totalServiceFee = BigDecimal.ZERO;
- BigDecimal totalUserCommission = BigDecimal.ZERO;
- Map<Integer, BigDecimal> vipCommissions = new HashMap<>();
- Map<String, Map<Integer, BigDecimal>> dailyVipCommissions = new TreeMap<>();
- for (AppUser appUser : appUserList) {
- BigDecimal distributionAmount = Optional.ofNullable(appUser.getTotalDistributionAmount()).orElse(BigDecimal.ZERO);
- totalCommission = totalCommission.add(distributionAmount);
- Integer vipId = appUser.getVipId();
- if (vipId != null && vipId >= 1 && vipId <= 7) {
- vipCommissions.merge(vipId, distributionAmount, BigDecimal::add);
- String dateKey = appUser.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+
+ Map<String, Map<Integer, BigDecimal>> dailyVipCommissions = new TreeMap<>();
+ getDatesBetween(cd.getStartTime(), cd.getEndTime()).forEach(date -> {
+ for (int i = 1; i < 8; i++){
+ List<BalanceChangeRecord> list = balanceChangeRecordService.list(new LambdaQueryWrapper<BalanceChangeRecord>()
+ .between(BalanceChangeRecord::getCreateTime, date, date.plusDays(1))
+ .eq(BalanceChangeRecord::getChangeType,4)
+ .eq(BalanceChangeRecord::getVipId, i));
+ BigDecimal reduce = list.stream().map(BalanceChangeRecord::getChangeAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ String dateKey = date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
dailyVipCommissions.computeIfAbsent(dateKey, k -> new HashMap<>())
- .merge(vipId, distributionAmount, BigDecimal::add);
+ .merge(i, reduce, BigDecimal::add);
+ }
+
+ for (int i = 1; i < 4; i++){
+ R<List<ShopBalanceStatement>> r = shopBalanceStatementClient.getShopBalanceStatementList2(i, date);
+ if (!CollectionUtils.isEmpty(r.getData())){
+ List<ShopBalanceStatement> list = r.getData();
+ BigDecimal reduce = list.stream().map(ShopBalanceStatement::getVariableAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ String dateKey = date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ int type;
+ if (i == 1){
+ type = 8;
+ }else if (i == 2){
+ type = 9;
+ }else {
+ type = 10;
+ }
+ dailyVipCommissions.computeIfAbsent(dateKey, k -> new HashMap<>())
+ .merge(type, reduce, BigDecimal::add);
+ }
+ }
+ });
+
+
+ BigDecimal totalCommission = BigDecimal.ZERO;
+ BigDecimal totalNormalCommission = BigDecimal.ZERO;
+
+ BigDecimal totalGoldCommission = BigDecimal.ZERO;
+
+ BigDecimal totalDiamondCommission = BigDecimal.ZERO;
+
+ BigDecimal totalAgentCommission = BigDecimal.ZERO;
+
+ BigDecimal totalSuperAgentCommission = BigDecimal.ZERO;
+
+ BigDecimal totalTopAgentCommission = BigDecimal.ZERO;
+
+ BigDecimal totalPartnerCommission = BigDecimal.ZERO;
+
+ List<AppUser> allAppUserList = appUserService.list();
+ for (AppUser appUser : allAppUserList) {
+ BigDecimal totalDistributionAmount = appUser.getTotalDistributionAmount();
+ totalCommission = totalCommission.add(totalDistributionAmount);
+ if (appUser.getVipId() == 1){
+ totalNormalCommission = totalNormalCommission.add(totalDistributionAmount);
+ }
+ if (appUser.getVipId() == 2){
+ totalGoldCommission = totalGoldCommission.add(totalDistributionAmount);
+ }
+ if (appUser.getVipId() == 3){
+ totalDiamondCommission = totalDiamondCommission.add(totalDistributionAmount);
+ }
+ if (appUser.getVipId() == 4){
+ totalAgentCommission = totalAgentCommission.add(totalDistributionAmount);
+ }
+ if (appUser.getVipId() == 5){
+ totalSuperAgentCommission = totalSuperAgentCommission.add(totalDistributionAmount);
+ }
+ if (appUser.getVipId() == 6){
+ totalTopAgentCommission = totalTopAgentCommission.add(totalDistributionAmount);
+ }
+ if (appUser.getVipId() == 7){
+ totalPartnerCommission = totalPartnerCommission.add(totalDistributionAmount);
}
}
- List<Shop> data = shopClient.getAllShop().getData();
- if(sysUser.getRoleType() == 2){
- data = Arrays.asList(shopClient.getShopById(sysUser.getObjectId()).getData());
- }
- for (Shop shop : data) {
- totalServiceFee = totalServiceFee.add(shop.getServerGiveawayMoney());
- totalUserCommission = totalUserCommission.add(shop.getGiveawayMoney());
+
+ R<Map<String, BigDecimal>> shopStatistics = shopClient.getShopStatistics();
+ Map<String, BigDecimal> data = shopStatistics.getData();
+ BigDecimal totalServiceFee = BigDecimal.ZERO;
+ BigDecimal totalUserCommission = BigDecimal.ZERO;
+ if (data != null){
+ totalServiceFee = data.get("serverGiveawayMoney");
+ totalUserCommission = data.get("lowerLevelGiveawayMoney");
}
CommissionDetail commissionDetail = new CommissionDetail();
@@ -773,13 +844,14 @@
commissionDetail.setTotalServiceFee(totalServiceFee);
commissionDetail.setTotalUserCommission(totalUserCommission);
- commissionDetail.setTotalNormalCommission(vipCommissions.getOrDefault(1, BigDecimal.ZERO));
- commissionDetail.setTotalGoldCommission(vipCommissions.getOrDefault(2, BigDecimal.ZERO));
- commissionDetail.setTotalDiamondCommission(vipCommissions.getOrDefault(3, BigDecimal.ZERO));
- commissionDetail.setTotalAgentCommission(vipCommissions.getOrDefault(4, BigDecimal.ZERO));
- commissionDetail.setTotalSuperAgentCommission(vipCommissions.getOrDefault(5, BigDecimal.ZERO));
- commissionDetail.setTotalTopAgentCommission(vipCommissions.getOrDefault(6, BigDecimal.ZERO));
- commissionDetail.setTotalPartnerCommission(vipCommissions.getOrDefault(7, BigDecimal.ZERO));
+ commissionDetail.setTotalNormalCommission(totalNormalCommission);
+ commissionDetail.setTotalGoldCommission(totalGoldCommission);
+ commissionDetail.setTotalDiamondCommission(totalDiamondCommission);
+ commissionDetail.setTotalAgentCommission(totalAgentCommission);
+ commissionDetail.setTotalSuperAgentCommission(totalSuperAgentCommission);
+ commissionDetail.setTotalTopAgentCommission(totalTopAgentCommission);
+ commissionDetail.setTotalPartnerCommission(totalPartnerCommission);
+
List<CommissionDate> commissionDateList = dailyVipCommissions.entrySet().stream()
.map(entry -> {
@@ -796,14 +868,38 @@
BigDecimal add = commissionDate.getNormalCommission().add(commissionDate.getGoldCommission()).add(commissionDate.getDiamondCommission()).add(commissionDate.getAgentCommission())
.add(commissionDate.getSuperAgentCommission()).add(commissionDate.getTopAgentCommission()).add(commissionDate.getPartnerCommission());
commissionDate.setTotalCommission(add);
+
+ commissionDate.setServiceChargeCommission(dailyCommissions.getOrDefault(10, BigDecimal.ZERO));
+ commissionDate.setAssociatedUserCommission(dailyCommissions.getOrDefault(8, BigDecimal.ZERO));
+ commissionDate.setBindLowerLevelStoresCommission(dailyCommissions.getOrDefault(9, BigDecimal.ZERO));
return commissionDate;
})
.collect(Collectors.toList());
commissionDetail.setCommissionDateList(commissionDateList);
+
return R.ok(commissionDetail);
}
-
+
+
+ /**
+ * 获取指定时间段内每一天的列表
+ *
+ * @param startDate 开始日期时间
+ * @param endDate 结束日期时间
+ * @return 包含每天日期时间的列表
+ */
+ private static List<LocalDateTime> getDatesBetween(LocalDateTime startDate, LocalDateTime endDate) {
+ // 计算开始日期和结束日期之间的天数差（忽略时间部分）
+ long daysBetween = ChronoUnit.DAYS.between(startDate.toLocalDate(), endDate.toLocalDate());
+
+ // 使用Stream.iterate从开始日期开始迭代，每次增加一天，直到达到天数差+1
+ return Stream.iterate(startDate, date -> date.plus(1, ChronoUnit.DAYS))
+ .limit(daysBetween + 1)
+ .collect(Collectors.toList());
+ }
+
+
/**
* 上传图片
--
Gitblit v1.7.1