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
c3e616a4
Commit
c3e616a4
authored
Oct 31, 2019
by
libin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员订单列表
parent
e3a5f508
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
AppUserLoginMapper.xml
...ce-admin/src/main/resources/mapper/AppUserLoginMapper.xml
+1
-1
OrderMemberService.java
...a/com/xxfc/platform/order/service/OrderMemberService.java
+1
-1
No files found.
ace-modules/ace-admin/src/main/resources/mapper/AppUserLoginMapper.xml
View file @
c3e616a4
...
...
@@ -3,7 +3,7 @@
<mapper
namespace=
"com.github.wxiaoqi.security.admin.mapper.AppUserLoginMapper"
>
<select
id=
"selectbyPhones"
resultType=
"com.github.wxiaoqi.security.admin.entity.AppUserLogin"
>
select `id`,`username` from `app_user_login` where `isdel`=0
,
`username` in
select `id`,`username` from `app_user_login` where `isdel`=0
and
`username` in
<foreach
collection=
"phones"
item=
"phone"
open=
"("
close=
")"
separator=
","
>
#{phone}
</foreach>
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderMemberService.java
View file @
c3e616a4
...
...
@@ -206,7 +206,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
boolean
isNoNullUserName
=
StringUtils
.
isNotEmpty
(
memberOrderFindDTO
.
getName
())
&&
memberOrderFindDTO
.
getName
().
trim
().
length
()
>
0
;
boolean
isNoNullPhone
=
StringUtils
.
isNotEmpty
(
memberOrderFindDTO
.
getPhone
())
&&
memberOrderFindDTO
.
getPhone
().
trim
().
length
()
>
0
;
boolean
isNoNullLeaderPhone
=
StringUtils
.
isNotEmpty
(
memberOrderFindDTO
.
get
Phone
())
&&
memberOrderFindDTO
.
get
Phone
().
trim
().
length
()
>
0
;
boolean
isNoNullLeaderPhone
=
StringUtils
.
isNotEmpty
(
memberOrderFindDTO
.
get
LeaderPhone
())
&&
memberOrderFindDTO
.
getLeader
Phone
().
trim
().
length
()
>
0
;
if
(
isNoNullLeaderPhone
||
isNoNullPhone
||
isNoNullUserName
)
{
userIds
=
userFeign
.
findAppUserIds
(
memberOrderFindDTO
.
getPhone
(),
memberOrderFindDTO
.
getLeaderPhone
(),
memberOrderFindDTO
.
getName
());
if
(
CollectionUtils
.
isEmpty
(
userIds
)){
...
...
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