From 451116c1df3c639da15b3d213f3fcff2f585337a Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 15 四月 2025 19:22:52 +0800
Subject: [PATCH] 前端联调
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 9d7fac9..b005e8f 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,7 +57,7 @@
* @author luodangjia
* @since 2024-11-21
*/
-@Api(tags = {"登录注册-小程序"})
+@Api(tags = {"用户端-小程序"})
@RestController
@RequestMapping("/app-user")
@Slf4j
@@ -319,7 +319,7 @@
shopId = sysUser.getObjectId();
userId = orderClient.getAppUserByShoppingShop(shopId).getData();
}
- appUser.setExcludeStatus(3);
+// appUser.setExcludeStatus(3);
IPage<AppUser> appuserPage = appUserService.getAppuserPage(pageNum, pageSize, appUser, shopId, userId);
for (AppUser record : appuserPage.getRecords()) {
Shop shop1 = shopClient.getServiceProvider(record.getId()).getData();
@@ -327,7 +327,6 @@
record.setShopName(shop1.getName());
record.setShopId(shop1.getId());
}
- record.setTotalPoint(record.getUserTotalPoint());
}
return R.ok(appuserPage);
}
@@ -362,7 +361,7 @@
record.setShopName(shopById.getData().getName());
}
}
- record.setTotalPoint(record.getUserTotalPoint());
+
}
return R.ok(appuserPage);
}
@@ -629,14 +628,14 @@
* @return
*/
@PostMapping("/upload")
- public String upload(MultipartFile file){
+ public R upload(MultipartFile file){
String s = null;
try {
s = ObsUploadUtil.obsUpload(file);
} catch (IOException e) {
throw new RuntimeException(e);
}
- return s;
+ return R.ok(s);
}
--
Gitblit v1.7.1