提交 我的券列表

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

@@ -26,6 +26,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -61,6 +63,21 @@ public class CandyCouponController {
                 myCoupon.add(baseVo);
             }
         }
+        //排序
+        memberCoupon.sort(Comparator.comparing(CandyCouponVo::getState));
+        myCoupon.sort(Comparator.comparing(CandyCouponVo::getState));
+        vo.setMemberCoupon(memberCoupon);
+        vo.setMyCoupon(myCoupon);
         return ResponseDto.success(vo);
     }
+
+    //要使用券列表
+
+    //使用券
+
+    //回退券
+
+    //判断券是否可用
+
+    //判断券是否可用并使用
 }

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

@@ -40,17 +40,23 @@ public class CouponBaseUtil {
         } else {
             vo.setCouType(dtoItem.getCouType());
         }
+        vo.setState(getCouponState(now, dtoItem.getExpireAt(), dtoItem.getState()));
+        vo.setUseRules(rulesVoList);
+        return vo;
+    }
+
+    public static Integer getCouponState(LocalDateTime currentTime, LocalDateTime expireAt, Integer state) {
         //券状态
-        if (dtoItem.getState().equals(1)) {
-            if (now.isAfter(dtoItem.getExpireAt())) {
-                vo.setState(3);
+        Integer data;
+        if (state.equals(1)) {
+            if (currentTime.isAfter(expireAt)) {
+                data = 3;
             } else {
-                vo.setState(dtoItem.getState());
+                data = state;
             }
         } else {
-            vo.setState(dtoItem.getState());
+            data = state;
         }
-        vo.setUseRules(rulesVoList);
-        return vo;
+        return data;
     }
 }