From 3eac3116ce54c2593f09a74feed370cf0800028e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 21:21:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 4a4b6eb..636afd9 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
@@ -104,6 +104,8 @@
private OrderClient orderClient;
@Resource
private ShopBalanceStatementClient shopBalanceStatementClient;
+ @Resource
+ private UserCancellationLogService userCancellationLogService;
@ResponseBody
@@ -213,8 +215,7 @@
return R.ok(user);
}
- @Resource
- private UserCancellationLogService userCancellationLogService;
+
@ResponseBody
@GetMapping("/unregis")
@@ -310,7 +311,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();
@@ -766,8 +768,6 @@
.merge(vipId, distributionAmount, BigDecimal::add);
}
}
-
- // 门店分佣计算
List<Shop> data = shopClient.getAllShop().getData();
if(sysUser.getRoleType() == 2){
data = Arrays.asList(shopClient.getShopById(sysUser.getObjectId()).getData());
@@ -832,13 +832,10 @@
})
.collect(Collectors.toList());
-
-
-
commissionDetail.setCommissionDateList(commissionDateList);
return R.ok(commissionDetail);
}
-
+
/**
* 上传图片
--
Gitblit v1.7.1