diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderQueryCriteria.java index a84fb443..87a503a5 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderQueryCriteria.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderQueryCriteria.java @@ -19,7 +19,7 @@ public class YxStoreOrderQueryCriteria{ // 模糊 @Query(type = Query.Type.UNIX_TIMESTAMP) - private List addTime; + private List createTime; // 模糊 diff --git a/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java b/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java index 369145d3..f0397b2e 100644 --- a/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java +++ b/yshop-mproot/src/main/java/co/yixiang/common/utils/QueryHelpPlus.java @@ -13,10 +13,7 @@ import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; +import java.util.*; /** * @author Zheng Jie @@ -105,8 +102,8 @@ public class QueryHelpPlus { List UNIX_TIMESTAMP = new ArrayList<>((List)val); if(!UNIX_TIMESTAMP.isEmpty()){ SimpleDateFormat fm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - long time1 = fm.parse(UNIX_TIMESTAMP.get(0).toString()).getTime()/1000; - long time2 = fm.parse(UNIX_TIMESTAMP.get(1).toString()).getTime()/1000; + Date time1 = fm.parse(UNIX_TIMESTAMP.get(0).toString()); + Date time2 = fm.parse(UNIX_TIMESTAMP.get(1).toString()); queryWrapper.between(finalAttributeName, time1, time2); } break;