From 41af6f7c9dbd59d945946c805c3f29eeaa8bb261 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 20 一月 2025 15:10:00 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 386f253..1270038 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
@@ -57,8 +57,7 @@
@RestController
@RequestMapping("/app-user")
public class AppUserController extends BaseController {
-
-
+
@Resource
private TokenService tokenService;
@Resource
@@ -653,7 +652,6 @@
@GetMapping("/detail")
@ApiOperation(value = "用户列表-详情", tags = {"管理后台"})
public R<AppUser> detail(Long id,Integer shopId) {
-
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
AppUser byId = appUserService.getById(id);
@@ -686,7 +684,10 @@
List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).list();
byId.setBottomUsers(list);
//消费总金额
- R<List<Order>> orderR = remoteOrderGoodsClient.byShopIdAndUserId(id,shopId);
+ if(null == shopId){
+ shopId = -1;
+ }
+ R<List<Order>> orderR = remoteOrderGoodsClient.byShopIdAndUserId(id, shopId);
List<Order> orderList = orderR.getData();
if (!CollectionUtils.isEmpty(orderList)){
BigDecimal paymentAmount = orderList.stream().map(Order::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -831,8 +832,6 @@
if (cd.getStartTime().isAfter(cd.getEndTime())) {
return R.fail("开始时间不能大于结束时间");
}
-
-
Map<String, Map<Integer, BigDecimal>> dailyVipCommissions = new TreeMap<>();
getDatesBetween(cd.getStartTime(), cd.getEndTime()).forEach(date -> {
for (int i = 1; i < 8; i++){
@@ -1001,7 +1000,7 @@
* 检查会员降级
* @param appUserId
*/
- @PostMapping("/app-user/vipDemotion")
+ @PostMapping("/vipDemotion")
public void vipDemotion(@RequestParam("appUserId") Long appUserId){
appUserService.vipDemotion(appUserId);
}
--
Gitblit v1.7.1