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

Skip to content

L
liquidnet-bus-v1
Commit 39b0aea0 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

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

parent 82a4991c
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 12 deletions
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @ 39b0aea0
......@@ -56,11 +56,11 @@ liquidnet:
port: 6379
password: 3Xa%8p
candy:
dbs: 0,16
database: 15
host: 39.107.71.112
port: 6379
password: 3Xa%8p
dbs: 0,256
database: 255
host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
port: 6380
password: PO@B!Iud32
mongodb:
host: 39.107.71.112: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 {
}
}
//排序 可用->金额->类型->过期时间
memberCoupon.stream().sorted(Comparator.comparing(CandyCouponVo::getState,Comparator.reverseOrder()).thenComparing(CandyCouponVo::getBindAt,Comparator.reverseOrder()));
myCoupon.stream().sorted(Comparator.comparing(CandyCouponVo::getState,Comparator.reverseOrder()).thenComparing(CandyCouponVo::getBindAt,Comparator.reverseOrder()));
myCoupon.sort(Comparator.comparing(CandyCouponVo::getState));
memberCoupon = memberCoupon.stream().sorted(Comparator.comparing(CandyCouponVo::getState,Comparator.reverseOrder()).thenComparing(CandyCouponVo::getBindAt,Comparator.reverseOrder())).collect(Collectors.toList());
myCoupon = myCoupon.stream().sorted(Comparator.comparing(CandyCouponVo::getState,Comparator.reverseOrder()).thenComparing(CandyCouponVo::getBindAt,Comparator.reverseOrder())).collect(Collectors.toList());
vo.setMemberCoupon(memberCoupon);
vo.setMyCoupon(myCoupon);
return vo;
......@@ -176,8 +175,8 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
}
//排序
memberCoupon.stream().sorted(Comparator.comparing(CandyCouponVo::getState,Comparator.reverseOrder()).thenComparing(CandyCouponVo::getBindAt,Comparator.reverseOrder()));
myCoupon.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 = myCoupon.stream().sorted(Comparator.comparing(CandyCouponVo::getState,Comparator.reverseOrder()).thenComparing(CandyCouponVo::getBindAt,Comparator.reverseOrder())).collect(Collectors.toList());
vo.setMemberCoupon(memberCoupon);
vo.setMyCoupon(myCoupon);
return vo;
......@@ -245,8 +244,8 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
}
//排序
memberCoupon.stream().sorted(Comparator.comparing(CandyCouponVo::getState,Comparator.reverseOrder()).thenComparing(CandyCouponVo::getBindAt,Comparator.reverseOrder()));
myCoupon.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 = myCoupon.stream().sorted(Comparator.comparing(CandyCouponVo::getState,Comparator.reverseOrder()).thenComparing(CandyCouponVo::getBindAt,Comparator.reverseOrder())).collect(Collectors.toList());
vo.setMemberCoupon(memberCoupon);
vo.setMyCoupon(myCoupon);
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