From f6f67d4acdf51cc0ce5224ff31f4c149fce5a108 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Mon, 25 Mar 2024 17:31:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/dao/orderProduct.go | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/api/dao/orderProduct.go b/api/dao/orderProduct.go index bd11906..a79f693 100644 --- a/api/dao/orderProduct.go +++ b/api/dao/orderProduct.go @@ -192,9 +192,7 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct startTime, _ := time.Parse("2006-01-02", deliveryTime[0]) endTime, _ := time.Parse("2006-01-02", deliveryTime[1]) - if startTime == endTime { - endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) - } + endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) query = query.Where("delivery_time BETWEEN ? AND ?", startTime, endTime) } @@ -207,9 +205,7 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct startTime, _ := time.Parse("2006-01-02", cancelTime[0]) endTime, _ := time.Parse("2006-01-02", cancelTime[1]) - if startTime == endTime { - endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) - } + endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) query = query.Where("cancel_time BETWEEN ? AND ?", startTime, endTime) } @@ -222,9 +218,7 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct startTime, _ := time.Parse("2006-01-02", payTime[0]) endTime, _ := time.Parse("2006-01-02", payTime[1]) - if startTime == endTime { - endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) - } + endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) query = query.Where("pay_time BETWEEN ? AND ?", startTime, endTime) } @@ -237,9 +231,7 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct startTime, _ := time.Parse("2006-01-02", reportPreTime[0]) endTime, _ := time.Parse("2006-01-02", reportPreTime[1]) - if startTime == endTime { - endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) - } + endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) query = query.Where("report_pre_time BETWEEN ? AND ?", startTime, endTime) } @@ -252,9 +244,7 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct startTime, _ := time.Parse("2006-01-02", createdAt[0]) endTime, _ := time.Parse("2006-01-02", createdAt[1]) - if startTime == endTime { - endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) - } + endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) query = query.Where("created_at BETWEEN ? AND ?", startTime, endTime) } @@ -415,9 +405,7 @@ func (r *OrderProductDao) GetOrderProductExportListSearch(req requests.OrderProd startTime, _ := time.Parse("2006-01-02", deliveryTime[0]) endTime, _ := time.Parse("2006-01-02", deliveryTime[1]) - if startTime == endTime { - endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) - } + endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) query = query.Where("delivery_time BETWEEN ? AND ?", startTime, endTime) } @@ -430,9 +418,7 @@ func (r *OrderProductDao) GetOrderProductExportListSearch(req requests.OrderProd startTime, _ := time.Parse("2006-01-02", cancelTime[0]) endTime, _ := time.Parse("2006-01-02", cancelTime[1]) - if startTime == endTime { - endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) - } + endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) query = query.Where("cancel_time BETWEEN ? AND ?", startTime, endTime) } @@ -445,9 +431,7 @@ func (r *OrderProductDao) GetOrderProductExportListSearch(req requests.OrderProd startTime, _ := time.Parse("2006-01-02", payTime[0]) endTime, _ := time.Parse("2006-01-02", payTime[1]) - if startTime == endTime { - endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) - } + endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) query = query.Where("pay_time BETWEEN ? AND ?", startTime, endTime) } @@ -460,9 +444,7 @@ func (r *OrderProductDao) GetOrderProductExportListSearch(req requests.OrderProd startTime, _ := time.Parse("2006-01-02", reportPreTime[0]) endTime, _ := time.Parse("2006-01-02", reportPreTime[1]) - if startTime == endTime { - endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) - } + endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) query = query.Where("report_pre_time BETWEEN ? AND ?", startTime, endTime) } @@ -475,9 +457,7 @@ func (r *OrderProductDao) GetOrderProductExportListSearch(req requests.OrderProd startTime, _ := time.Parse("2006-01-02", createdAt[0]) endTime, _ := time.Parse("2006-01-02", createdAt[1]) - if startTime == endTime { - endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) - } + endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) query = query.Where("created_at BETWEEN ? AND ?", startTime, endTime) }