From 36dd5e7edf18d0ab0e0d57ed960bdbd8aa770c40 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 13:52:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 877b36a..fb85e64 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
@@ -715,6 +715,7 @@
if(sysUser.getRoleType() == 2){
queryWrapper.eq(AppUser::getShopId, sysUser.getObjectId());
}
+ queryWrapper.orderByAsc(AppUser::getCreateTime);
List<AppUser> appUserList = appUserService.list(queryWrapper);
if (appUserList.isEmpty()) {
return R.ok(new CommissionDetail());
@@ -723,7 +724,7 @@
BigDecimal totalServiceFee = BigDecimal.ZERO;
BigDecimal totalUserCommission = BigDecimal.ZERO;
Map<Integer, BigDecimal> vipCommissions = new HashMap<>();
- Map<String, Map<Integer, BigDecimal>> dailyVipCommissions = 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);
--
Gitblit v1.7.1