From 514c4c935c7179f0c2994faaafb4a19f2a2d0f47 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 18 十二月 2024 10:30:23 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 4 ++--
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/AppUserMapper.java | 2 +-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 12 +++++++++++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java | 2 +-
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml | 25 +++++++++++++++++++++++++
5 files changed, 40 insertions(+), 5 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 a6bb668..a8dc0a4 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
@@ -415,7 +415,7 @@
for (Order datum : listR.getData()) {
userIds.add(datum.getAppUserId());
}
- IPage<AppUser> appuserPage = appUserService.getAppuserPage1(pageNum, pageSize, appUser,objectId);
+ IPage<AppUser> appuserPage = appUserService.getAppuserPage1(pageNum, pageSize, appUser,objectId,userIds);
return R.ok(appuserPage);
}
@@ -526,6 +526,16 @@
}
+ @GetMapping("/orders")
+ @ApiOperation(value = "用户列表-订单列表", tags = {"管理后台"})
+ public R<List<Order>> orders(Long id)
+ {
+ R<List<Order>> listR = remoteOrderGoodsClient.byUserId(id);
+ return R.ok(listR.getData());
+
+ }
+
+
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/AppUserMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/AppUserMapper.java
index a2ae452..9d165d1 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/AppUserMapper.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/AppUserMapper.java
@@ -28,7 +28,7 @@
List<NearbyReferrerVo> getNearbyReferrer(@Param("cityCode") String cityCode, @Param("nearbyReferrer") NearbyReferrer nearbyReferrer);
IPage<AppUser> getAppuserPage(@Param("page") IPage<AppUser> page, @Param("appUser") AppUser appUser);
- IPage<AppUser> getAppuserPage1(@Param("page") IPage<AppUser> page, @Param("appUser") AppUser appUser,Integer objectId);
+ IPage<AppUser> getAppuserPage1(@Param("page") IPage<AppUser> page, @Param("appUser") AppUser appUser,@Param("objectId")Integer objectId,@Param("userIds")List<Long> userIds);
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java
index db37014..d484af9 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java
@@ -82,5 +82,5 @@
void onlineRecord();
IPage<AppUser> getAppuserPage(Integer pageNum, Integer pageSize, AppUser appUser);
- IPage<AppUser> getAppuserPage1(Integer pageNum, Integer pageSize, AppUser appUser,Integer objectId);
+ IPage<AppUser> getAppuserPage1(Integer pageNum, Integer pageSize, AppUser appUser,Integer objectId,List<Long> userIds);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index 864d130..6adc13f 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -670,8 +670,8 @@
return appUserMapper.getAppuserPage(new Page<>(pageNum, pageSize), appUser);
}
@Override
- public IPage<AppUser> getAppuserPage1(Integer pageNum, Integer pageSize, AppUser appUser,Integer objectId) {
+ public IPage<AppUser> getAppuserPage1(Integer pageNum, Integer pageSize, AppUser appUser,Integer objectId,List<Long> userIds) {
- return appUserMapper.getAppuserPage1(new Page<>(pageNum, pageSize), appUser,objectId);
+ return appUserMapper.getAppuserPage1(new Page<>(pageNum, pageSize), appUser,objectId,userIds);
}
}
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml
index 2e68559..fa9943c 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml
@@ -79,4 +79,29 @@
order by ta.is_danger desc
</select>
+ <select id="getAppuserPage1" resultType="com.ruoyi.account.api.model.AppUser">
+ SELECT ta.id, ta.`name`, ta.vip_id, ta.shop_id
+ FROM t_app_user ta
+ <where>
+ ta.del_flag = 0
+ <if test="null != appUser.name and '' != appUser.name">
+ and ta.`name` like CONCAT('%',#{appUser.name},'%')
+ </if>
+ <if test="null != appUser.phone and '' != appUser.phone">
+ and ta.phone like CONCAT('%',#{appUser.phone},'%')
+ </if>
+ <if test="null != appUser.status">
+ and ta.status = #{appUser.status}
+ </if>
+ <if test="null != appUser.vipId">
+ and ta.vip_id = #{appUser.vipId}
+ </if>
+ <if test="null != appUser.shopIds and appUser.shopIds.size() > 0">
+ and ta.shop_id in
+ <foreach collection="appUser.shopIds" item="shopId" open="(" separator="," close=")">
+ #{shopId}
+ </foreach>
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.7.1