From 95769e6e90667c9a3c4e702c19881b93ac84846f Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Fri, 15 Sep 2023 14:12:02 +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=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/dao/orderInquiry.go | 30 ++++++++++++++++++++++++++++++ api/dao/orderProduct.go | 25 +++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/api/dao/orderInquiry.go b/api/dao/orderInquiry.go index 25e1c78..c52579c 100644 --- a/api/dao/orderInquiry.go +++ b/api/dao/orderInquiry.go @@ -147,6 +147,11 @@ func (r *OrderInquiryDao) GetOrderInquiryPageSearch(req requests.GetOrderInquiry if len(payTime) == 2 { 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) + } + query = query.Where("pay_time BETWEEN ? AND ?", startTime, endTime) } } @@ -157,6 +162,11 @@ func (r *OrderInquiryDao) GetOrderInquiryPageSearch(req requests.GetOrderInquiry if len(receptionTime) == 2 { startTime, _ := time.Parse("2006-01-02", receptionTime[0]) endTime, _ := time.Parse("2006-01-02", receptionTime[1]) + + if startTime == endTime { + endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) + } + query = query.Where("reception_time BETWEEN ? AND ?", startTime, endTime) } } @@ -167,6 +177,11 @@ func (r *OrderInquiryDao) GetOrderInquiryPageSearch(req requests.GetOrderInquiry if len(completeTime) == 2 { startTime, _ := time.Parse("2006-01-02", completeTime[0]) endTime, _ := time.Parse("2006-01-02", completeTime[1]) + + if startTime == endTime { + endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) + } + query = query.Where("complete_time BETWEEN ? AND ?", startTime, endTime) } } @@ -177,6 +192,11 @@ func (r *OrderInquiryDao) GetOrderInquiryPageSearch(req requests.GetOrderInquiry if len(finishTime) == 2 { startTime, _ := time.Parse("2006-01-02", finishTime[0]) endTime, _ := time.Parse("2006-01-02", finishTime[1]) + + if startTime == endTime { + endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second) + } + query = query.Where("finish_time BETWEEN ? AND ?", startTime, endTime) } } @@ -192,6 +212,11 @@ func (r *OrderInquiryDao) GetOrderInquiryPageSearch(req requests.GetOrderInquiry if len(cancelTime) == 2 { 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) + } + query = query.Where("cancel_time BETWEEN ? AND ?", startTime, endTime) } } @@ -202,6 +227,11 @@ func (r *OrderInquiryDao) GetOrderInquiryPageSearch(req requests.GetOrderInquiry if len(createdAt) == 2 { 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) + } + query = query.Where("created_at BETWEEN ? AND ?", startTime, endTime) } } diff --git a/api/dao/orderProduct.go b/api/dao/orderProduct.go index a2bc9e4..6a652e5 100644 --- a/api/dao/orderProduct.go +++ b/api/dao/orderProduct.go @@ -181,6 +181,11 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct if len(deliveryTime) == 2 { 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) + } + query = query.Where("delivery_time BETWEEN ? AND ?", startTime, endTime) } } @@ -191,6 +196,11 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct if len(cancelTime) == 2 { 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) + } + query = query.Where("cancel_time BETWEEN ? AND ?", startTime, endTime) } } @@ -201,6 +211,11 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct if len(payTime) == 2 { 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) + } + query = query.Where("pay_time BETWEEN ? AND ?", startTime, endTime) } } @@ -211,6 +226,11 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct if len(reportPreTime) == 2 { 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) + } + query = query.Where("report_pre_time BETWEEN ? AND ?", startTime, endTime) } } @@ -221,6 +241,11 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct if len(createdAt) == 2 { 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) + } + query = query.Where("created_at BETWEEN ? AND ?", startTime, endTime) } }