记得上下班打卡 | git大法好,push需谨慎

Commit 39b0aea0 authored by 胡佳晨's avatar 胡佳晨

修改 我的券排序 根据 状态倒叙,激活时间倒叙

parent 82a4991c
...@@ -56,11 +56,11 @@ liquidnet: ...@@ -56,11 +56,11 @@ liquidnet:
port: 6379 port: 6379
password: 3Xa%8p password: 3Xa%8p
candy: candy:
dbs: 0,16 dbs: 0,256
database: 15 database: 255
host: 39.107.71.112 host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
port: 6379 port: 6380
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
......
...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment