Merge branch 'dev-coupon-recommend' into test6.9.6

@@ -226,8 +226,11 @@ public class ChargeService {
                     .collect(Collectors.toList());
                     .collect(Collectors.toList());
 
 
             if (CollectionUtils.isNotEmpty(betterShippingCouponMatchResults)) {
             if (CollectionUtils.isNotEmpty(betterShippingCouponMatchResults)) {
-                //存在金额 >= 运费的券，按照金额从小到大的顺序
-                betterShippingCouponMatchResults.sort(Comparator.comparing(result -> result.getUserCouponsBo().getCouponAmount()));
+                //存在金额 >= 运费的券，按照 从小到大，过期先用 排序
+                betterShippingCouponMatchResults.sort(
+                        Comparator.comparing((CouponMatchResult result) -> result.getUserCouponsBo().getCouponAmount())
+                                .thenComparing((CouponMatchResult result) -> result.getUserCouponsBo().getEndTime())
+                );
 
 
                 betterCouponMatchResults = new LinkedList<>(activityCouponMatchResults);
                 betterCouponMatchResults = new LinkedList<>(activityCouponMatchResults);
                 betterCouponMatchResults.addAll(betterShippingCouponMatchResults);
                 betterCouponMatchResults.addAll(betterShippingCouponMatchResults);