记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
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
董敬伟
liquidnet-bus-v1
Commits
39b0aea0
Commit
39b0aea0
authored
Dec 21, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 我的券排序 根据 状态倒叙,激活时间倒叙
parent
82a4991c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
12 deletions
+11
-12
application-dev.yml
liquidnet-bus-config/liquidnet-config/application-dev.yml
+5
-5
CandyCouponServiceImpl.java
...et/service/candy/service/impl/CandyCouponServiceImpl.java
+6
-7
No files found.
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @
39b0aea0
...
@@ -56,11 +56,11 @@ liquidnet:
...
@@ -56,11 +56,11 @@ liquidnet:
port
:
6379
port
:
6379
password
:
3Xa%8p
password
:
3Xa%8p
candy
:
candy
:
dbs
:
0,
1
6
dbs
:
0,
25
6
database
:
1
5
database
:
25
5
host
:
39.107.71.112
host
:
r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
port
:
63
79
port
:
63
80
password
:
3Xa%8p
password
:
PO@B!Iud32
mongodb
:
mongodb
:
host
:
39.107.71.112:27017
host
:
39.107.71.112:27017
port
:
27017
port
:
27017
...
...
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/service/impl/CandyCouponServiceImpl.java
View file @
39b0aea0
...
@@ -83,9 +83,8 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
...
@@ -83,9 +83,8 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
}
}
}
}
//排序 可用->金额->类型->过期时间
//排序 可用->金额->类型->过期时间
memberCoupon
.
stream
().
sorted
(
Comparator
.
comparing
(
CandyCouponVo:
:
getState
,
Comparator
.
reverseOrder
()).
thenComparing
(
CandyCouponVo:
:
getBindAt
,
Comparator
.
reverseOrder
()));
memberCoupon
=
memberCoupon
.
stream
().
sorted
(
Comparator
.
comparing
(
CandyCouponVo:
:
getState
,
Comparator
.
reverseOrder
()).
thenComparing
(
CandyCouponVo:
:
getBindAt
,
Comparator
.
reverseOrder
())).
collect
(
Collectors
.
toList
());
myCoupon
.
stream
().
sorted
(
Comparator
.
comparing
(
CandyCouponVo:
:
getState
,
Comparator
.
reverseOrder
()).
thenComparing
(
CandyCouponVo:
:
getBindAt
,
Comparator
.
reverseOrder
()));
myCoupon
=
myCoupon
.
stream
().
sorted
(
Comparator
.
comparing
(
CandyCouponVo:
:
getState
,
Comparator
.
reverseOrder
()).
thenComparing
(
CandyCouponVo:
:
getBindAt
,
Comparator
.
reverseOrder
())).
collect
(
Collectors
.
toList
());
myCoupon
.
sort
(
Comparator
.
comparing
(
CandyCouponVo:
:
getState
));
vo
.
setMemberCoupon
(
memberCoupon
);
vo
.
setMemberCoupon
(
memberCoupon
);
vo
.
setMyCoupon
(
myCoupon
);
vo
.
setMyCoupon
(
myCoupon
);
return
vo
;
return
vo
;
...
@@ -176,8 +175,8 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
...
@@ -176,8 +175,8 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
}
}
//排序
//排序
memberCoupon
.
stream
().
sorted
(
Comparator
.
comparing
(
CandyCouponVo:
:
getState
,
Comparator
.
reverseOrder
()).
thenComparing
(
CandyCouponVo:
:
getBindAt
,
Comparator
.
reverseOrder
()
));
memberCoupon
=
memberCoupon
.
stream
().
sorted
(
Comparator
.
comparing
(
CandyCouponVo:
:
getState
,
Comparator
.
reverseOrder
()).
thenComparing
(
CandyCouponVo:
:
getBindAt
,
Comparator
.
reverseOrder
())).
collect
(
Collectors
.
toList
(
));
myCoupon
.
stream
().
sorted
(
Comparator
.
comparing
(
CandyCouponVo:
:
getState
,
Comparator
.
reverseOrder
()).
thenComparing
(
CandyCouponVo:
:
getBindAt
,
Comparator
.
reverseOrder
()
));
myCoupon
=
myCoupon
.
stream
().
sorted
(
Comparator
.
comparing
(
CandyCouponVo:
:
getState
,
Comparator
.
reverseOrder
()).
thenComparing
(
CandyCouponVo:
:
getBindAt
,
Comparator
.
reverseOrder
())).
collect
(
Collectors
.
toList
(
));
vo
.
setMemberCoupon
(
memberCoupon
);
vo
.
setMemberCoupon
(
memberCoupon
);
vo
.
setMyCoupon
(
myCoupon
);
vo
.
setMyCoupon
(
myCoupon
);
return
vo
;
return
vo
;
...
@@ -245,8 +244,8 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
...
@@ -245,8 +244,8 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
}
}
//排序
//排序
memberCoupon
.
stream
().
sorted
(
Comparator
.
comparing
(
CandyCouponVo:
:
getState
,
Comparator
.
reverseOrder
()).
thenComparing
(
CandyCouponVo:
:
getBindAt
,
Comparator
.
reverseOrder
()
));
memberCoupon
=
memberCoupon
.
stream
().
sorted
(
Comparator
.
comparing
(
CandyCouponVo:
:
getState
,
Comparator
.
reverseOrder
()).
thenComparing
(
CandyCouponVo:
:
getBindAt
,
Comparator
.
reverseOrder
())).
collect
(
Collectors
.
toList
(
));
myCoupon
.
stream
().
sorted
(
Comparator
.
comparing
(
CandyCouponVo:
:
getState
,
Comparator
.
reverseOrder
()).
thenComparing
(
CandyCouponVo:
:
getBindAt
,
Comparator
.
reverseOrder
()
));
myCoupon
=
myCoupon
.
stream
().
sorted
(
Comparator
.
comparing
(
CandyCouponVo:
:
getState
,
Comparator
.
reverseOrder
()).
thenComparing
(
CandyCouponVo:
:
getBindAt
,
Comparator
.
reverseOrder
())).
collect
(
Collectors
.
toList
(
));
vo
.
setMemberCoupon
(
memberCoupon
);
vo
.
setMemberCoupon
(
memberCoupon
);
vo
.
setMyCoupon
(
myCoupon
);
vo
.
setMyCoupon
(
myCoupon
);
return
vo
;
return
vo
;
...
...
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