Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java

@@ -8,6 +8,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
@@ -37,6 +38,7 @@ public class Category extends BaseEntity {
     private String parentId;
 
     @NotNull(message = "层级不能为空")
+    @Min(value = 0,message = "层级需要大于0")
     @ApiModelProperty(value = "层级, 从0开始")
     private Integer level;
 

framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java

@@ -91,8 +91,8 @@ public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, Mem
         QueryWrapper<MemberCoupon> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("member_id", UserContext.getCurrentUser().getId());
         queryWrapper.ge("member_coupon_status", MemberCouponStatusEnum.NEW.name());
-        queryWrapper.ge("start_time", System.currentTimeMillis());
-        queryWrapper.le("end_time", System.currentTimeMillis());
+        queryWrapper.le("start_time", new Date());
+        queryWrapper.ge("end_time", new Date());
         return this.list(queryWrapper);
     }