券相关接口提交

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

@@ -45,7 +45,7 @@ public class CandyCouponVo implements Serializable, Cloneable {
     /* --- --- --- CandyUserCoupon */
     @ApiModelProperty(value = "券id",example = "6d74a49d3d1d13f96ba09215abcc49af")
     private String ucouponId;
-    @ApiModelProperty(value = "券状态[1-可用|2-无效｜3-已过期｜5-已使用 |21-不可用]",example = "1")
+    @ApiModelProperty(value = "券状态[1-可用|2-无效｜3-已过期 |31-未到期｜5-已使用 |21-不可用]",example = "1")
     private Integer state;
     //    private String bindAt;//激活时间
     @ApiModelProperty(value = "使用时间 可null",example = "2021-09-25")

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

@@ -227,8 +227,10 @@ public class CouponBaseUtil {
         //券状态
         Integer data;
         if (state.equals(1)) {
-            if (currentTime.isAfter(expireAt) || currentTime.isBefore(effectAt)) {
+            if (currentTime.isAfter(expireAt)) {
                 data = 3;
+            }else if (currentTime.isBefore(effectAt)) {
+                data = 31;
             } else {
                 data = state;
             }