Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
af799fff
Commit
af799fff
authored
Nov 01, 2019
by
libin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员订单列表导出
parent
cb5af54f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
2 deletions
+25
-2
AppUserManageDTO.java
...m/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
+5
-0
AppUserManageBiz.java
...m/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java
+10
-0
AppUsersManageController.java
...wxiaoqi/security/admin/rest/AppUsersManageController.java
+6
-1
AppUserDetailMapper.xml
...e-admin/src/main/resources/mapper/AppUserDetailMapper.xml
+3
-0
OrderMemberController.java
...a/com/xxfc/platform/order/rest/OrderMemberController.java
+1
-1
No files found.
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
View file @
af799fff
...
...
@@ -60,6 +60,11 @@ public class AppUserManageDTO {
*/
private
Set
<
Integer
>
citySet
;
/**
* 用户id
*/
private
Integer
userId
;
// /**
// * 接收前台时间范围
// */
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java
View file @
af799fff
...
...
@@ -184,4 +184,14 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
}
}
public
AppUserManageVo
findUserInfoById
(
Integer
userId
)
{
AppUserManageVo
appUserManageVo
=
new
AppUserManageVo
();
AppUserManageDTO
appUserManageDTO
=
new
AppUserManageDTO
();
appUserManageDTO
.
setUserId
(
userId
);
List
<
AppUserManageVo
>
appUserManageVos
=
mapper
.
selectAppUserManage
(
appUserManageDTO
);
if
(
CollectionUtils
.
isEmpty
(
appUserManageVos
)){
return
appUserManageVo
;
}
return
appUserManageVos
.
get
(
0
);
}
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java
View file @
af799fff
...
...
@@ -19,7 +19,6 @@ import com.xxfc.platform.vehicle.feign.VehicleFeign;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.Set
;
/**
...
...
@@ -66,6 +65,12 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
appUserManageDTO
.
setCitySet
(
cityList
);
return
ObjectRestResponse
.
succ
(
baseBiz
.
findAllByQueryAndCity
(
appUserManageDTO
));
}
@GetMapping
(
"/user_info/{id}"
)
public
ObjectRestResponse
<
AppUserManageVo
>
findUserInfo
(
@PathVariable
(
value
=
"id"
)
Integer
userId
){
AppUserManageVo
appUserManageVo
=
baseBiz
.
findUserInfoById
(
userId
);
return
ObjectRestResponse
.
succ
(
appUserManageVo
);
}
/**
* 查询一条
* @param id
...
...
ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
View file @
af799fff
...
...
@@ -166,6 +166,9 @@
<if
test=
"source !=null "
>
and d.source = #{source}
</if>
<if
test=
"userId!=null"
>
and l.id=#{userId}
</if>
<if
test=
"citySet != null "
>
and d.city_code in
<foreach
collection=
"citySet"
item=
"item"
index=
"index"
open=
"("
separator=
","
close=
")"
>
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderMemberController.java
View file @
af799fff
...
...
@@ -72,7 +72,7 @@ public class OrderMemberController extends BaseController<OrderMemberDetailBiz,
return
ObjectRestResponse
.
succ
(
memberOrderPageVo
);
}
@
Pos
tMapping
(
"/export"
)
@
Ge
tMapping
(
"/export"
)
@ResponseBody
public
void
exportMemberOrders
(
@RequestBody
MemberOrderFindDTO
memberOrderFindDTO
,
HttpServletResponse
response
){
try
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment