From eb661972ebcf05e3690bac5a06676020cca122d0 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Sat, 5 Sep 2020 18:11:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E8=B4=A6?=
 =?UTF-8?q?=E5=8D=95sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/service/impl/YxUserBillServiceImpl.java  | 8 ++++----
 .../modules/user/service/mapper/UserBillMapper.java       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java
index 805aca97..9d67ec2f 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java
@@ -274,13 +274,13 @@ public class YxUserBillServiceImpl extends BaseServiceImpl<UserBillMapper, YxUse
     @Override
     public List<YxUserBillDto> queryAll(YxUserBillQueryCriteria criteria){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Integer date =null;
-        Integer date1 = null;
+        String date =null;
+        String date1 = null;
         if(StringUtils.isNotEmpty(criteria.getStartTime())){
             try {
-                date =   OrderUtil.dateToTimestamp(sdf.parse(criteria.getStartTime()));
+                date =  sdf.parse(criteria.getStartTime())+ " 00:00:00";
                 if(StringUtils.isNotEmpty(criteria.getEndTime())){
-                    date1 = OrderUtil.dateToTimestamp(sdf.parse(criteria.getEndTime()))+24*60*60;
+                    date1 =sdf.parse(criteria.getEndTime())+ " 23:59:59";
                 }
             } catch (ParseException e) {
                 e.printStackTrace();
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java
index 5b6fe0c4..d160a435 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java
@@ -84,8 +84,8 @@ public interface UserBillMapper extends CoreMapper<YxUserBill> {
             "<if test =\"type !=''\">and b.type=#{type}</if> " +
             "<if test =\"title !=''\">and b.title=#{title}</if> " +
             "<if test =\"pm !=null\">and b.pm=#{pm}</if> " +
-            "<if test =\"date !=null\">and b.add_time &gt;= ${date}</if> " +
-            "<if test =\"date1 !=null\">and b.add_time &lt;= ${date1}</if> " +
+            "<if test =\"date !=null\">and b.create_time &gt;= STR_TO_DATE(#{date},'%Y-%m-%d %H:%i:%s')</if> " +
+            "<if test =\"date1 !=null\">and b.create_time &lt;=STR_TO_DATE(#{date1},'%Y-%m-%d %H:%i:%s')</if> " +
             "<if test =\"nickname !=''\">and u.nickname LIKE CONCAT('%',#{nickname},'%')</if> </script> ")
-    List<YxUserBillDto> findAllByQueryCriteria(@Param("category") String category, @Param("type") String type, @Param("nickname") String nickname, @Param("pm") Integer pm, @Param("date")Integer date, @Param("date1")Integer date1,@Param("title")String title);
+    List<YxUserBillDto> findAllByQueryCriteria(@Param("category") String category, @Param("type") String type, @Param("nickname") String nickname, @Param("pm") Integer pm, @Param("date")String date, @Param("date1")String date1,@Param("title")String title);
 }