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

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/vo/CandyCouponVo.java

@@ -47,7 +47,8 @@ public class CandyCouponVo implements Serializable, Cloneable {
     private String ucouponId;
     @ApiModelProperty(value = "券状态[1-可用|2-无效｜3-已过期 |31-未到期｜5-已使用 |21-不可用 | 22-需领取]", example = "1")
     private Integer state;
-    //    private String bindAt;//激活时间
+    @ApiModelProperty(value = "激活时间")
+    private String bindAt;
     @ApiModelProperty(value = "使用时间 可null", example = "2021-09-25")
     private String usedAt;
     @ApiModelProperty(value = "购买内容 可null", example = "北京草莓")

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/service/impl/CandyCouponServiceImpl.java

@@ -83,7 +83,8 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
             }
         }
         //排序 可用->金额->类型->过期时间
-        memberCoupon.sort(Comparator.comparing(CandyCouponVo::getState));
+        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));
         vo.setMemberCoupon(memberCoupon);
         vo.setMyCoupon(myCoupon);
@@ -175,8 +176,8 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         }
 
         //排序
-        memberCoupon.sort(Comparator.comparing(CandyCouponVo::getState));
-        myCoupon.sort(Comparator.comparing(CandyCouponVo::getState));
+        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()));
         vo.setMemberCoupon(memberCoupon);
         vo.setMyCoupon(myCoupon);
         return vo;
@@ -244,8 +245,8 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         }
 
         //排序
-        memberCoupon.sort(Comparator.comparing(CandyCouponVo::getState));
-        myCoupon.sort(Comparator.comparing(CandyCouponVo::getState));
+        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()));
         vo.setMemberCoupon(memberCoupon);
         vo.setMyCoupon(myCoupon);
         return vo;

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/CouponBaseUtil.java

@@ -40,6 +40,7 @@ public class CouponBaseUtil {
         vo.setUcouponId(dtoItem.getUcouponId());
         vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd));
         vo.setUsedFor(dtoItem.getUsedFor());
+        vo.setBindAt(DateUtil.format(dtoItem.getBindAt(), DateUtil.Formatter.yyyyMMddHHmmss));
         //适用范围 规则
         if (dtoItem.getUseRules() != null) {
             for (CandyCouponRuleDto ruleItem : dtoItem.getUseRules()) {
@@ -89,6 +90,7 @@ public class CouponBaseUtil {
         vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd));
         vo.setUsedFor(dtoItem.getUsedFor());
         vo.setBusiType(dtoItem.getBusiType());
+        vo.setBindAt(DateUtil.format(dtoItem.getBindAt(), DateUtil.Formatter.yyyyMMddHHmmss));
         //适用范围 规则
         if (dtoItem.getBusiType().equals(0)) {
             isTarget = true;
@@ -178,6 +180,7 @@ public class CouponBaseUtil {
         vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd));
         vo.setUsedFor(dtoItem.getUsedFor());
         vo.setBusiType(dtoItem.getBusiType());
+        vo.setBindAt(DateUtil.format(dtoItem.getBindAt(), DateUtil.Formatter.yyyyMMddHHmmss));
         //适用范围 规则
         if (dtoItem.getBusiType().equals(0)) {
             isTarget = true;