From abe0a271403c67a28657d31aab4464e1c72ee42f Mon Sep 17 00:00:00 2001
From: "yan.y" <yiyan@021.com>
Date: Sun, 28 Apr 2024 17:38:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8F=8A=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/api/order.go        | 11 +++++------
 business/build_linux.bat     |  4 ++++
 business/utils/commonUtil.go |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/business/api/order.go b/business/api/order.go
index f9c7105..4df47d2 100644
--- a/business/api/order.go
+++ b/business/api/order.go
@@ -5,6 +5,7 @@ import (
 	"github.com/kataras/iris/v12"
 	"github.com/kataras/iris/v12/context"
 	"go.uber.org/zap"
+	"gorm.io/gorm/clause"
 	"io"
 	"pet-house.com/business/models"
 	"pet-house.com/business/utils"
@@ -13,7 +14,6 @@ import (
 	"pet-house.com/core/server/zap_server"
 	"strconv"
 	"sync"
-	"time"
 )
 
 type PetGoodsInfo struct {
@@ -126,7 +126,7 @@ func GetOrderDetail(orderId string) OrderDetail {
 		ServiceTime:   orderMain.ServiceTime,
 		ServiceAddr:   findUserServiceAddr,
 		ServiceRemark: orderMain.ServiceRemark,
-		CreateTime:    orderMain.CreateTime.String(),
+		CreateTime:    orderMain.CreateTime.Format("2006-01-02 15:04:05"),
 	}
 	var subOrderList []SubOrder
 	var orderSubList []models.OrderSub
@@ -157,7 +157,6 @@ func GetOrderDetail(orderId string) OrderDetail {
 	} else {
 		orderDetail.ServiceCar = &models.ServiceCar{}
 	}
-	orderDetail.CreateTime = time.DateTime
 	orderDetail.SubOrderList = subOrderList
 	return orderDetail
 }
@@ -221,9 +220,9 @@ func (p DefParty) orderList() web_iris.Party {
 			}
 			var orderList []models.OrderMain
 			if orderListRequest.Status == 0 {
-				database.Instance().Model(&models.OrderMain{}).Where("uid = ?", headerBaseInfo.Uid).Offset((orderListRequest.PageNo - 1) * orderListRequest.PageSize).Limit(orderListRequest.PageSize).Find(&orderList)
+				database.Instance().Model(&models.OrderMain{}).Where("uid = ?", headerBaseInfo.Uid).Offset((orderListRequest.PageNo - 1) * orderListRequest.PageSize).Limit(orderListRequest.PageSize).Order(clause.OrderByColumn{Column: clause.Column{Name: "create_time"}, Desc: false}).Find(&orderList)
 			} else {
-				database.Instance().Model(&models.OrderMain{}).Where("uid = ? and status = ?", headerBaseInfo.Uid, orderListRequest.Status).Offset((orderListRequest.PageNo - 1) * orderListRequest.PageSize).Limit(orderListRequest.PageSize).Find(&orderList)
+				database.Instance().Model(&models.OrderMain{}).Where("uid = ? and status = ?", headerBaseInfo.Uid, orderListRequest.Status).Offset((orderListRequest.PageNo - 1) * orderListRequest.PageSize).Limit(orderListRequest.PageSize).Order(clause.OrderByColumn{Column: clause.Column{Name: "create_time"}, Desc: false}).Find(&orderList)
 			}
 			var orderDetails []OrderDetail
 			for _, value := range orderList {
@@ -235,7 +234,7 @@ func (p DefParty) orderList() web_iris.Party {
 					ServiceTime:   value.ServiceTime,
 					ServiceAddr:   findUserServiceAddr,
 					ServiceRemark: value.ServiceRemark,
-					CreateTime:    value.CreateTime.String(),
+					CreateTime:    value.CreateTime.Format("2006-01-02 15:04:05"),
 				}
 				var subOrderList []SubOrder
 				var orderSubList []models.OrderSub
diff --git a/business/build_linux.bat b/business/build_linux.bat
index 1b2900c..b10e711 100644
--- a/business/build_linux.bat
+++ b/business/build_linux.bat
@@ -1,4 +1,8 @@
 @echo off
+set APP_NAME="petHouseApp"
+if exist %APP_NAME% (
+	del %APP_NAME%
+)
 set GOOS=linux
 set GOARCH=amd64
 echo build
diff --git a/business/utils/commonUtil.go b/business/utils/commonUtil.go
index 56bd411..2181eb6 100644
--- a/business/utils/commonUtil.go
+++ b/business/utils/commonUtil.go
@@ -48,8 +48,8 @@ func GetStrDays(day int, minute int, reserveMap map[string]models.ReserveTimeFil
 		//且不存在过滤时间中
 		_, existsDay := reserveMap[nextHour.Format("2006-01-02")]
 		_, existsHour := reserveMap[nextHour.Format("15")]
-		_, existOrderTime := orderTimeMap[nextHour.Format("2006-01-02 15:04:00")]
-		orderNum, existOrderNum := orderNumMap[nextHour.Format("2006-01-02 15:04:00")]
+		_, existOrderTime := orderTimeMap[nextHour.Format("2006-01-02 15:04")]
+		orderNum, existOrderNum := orderNumMap[nextHour.Format("2006-01-02 15:04")]
 		if (nextHour.Hour() >= workStart && nextHour.Hour() < workEnd) && (!existsDay && !existsHour) && !existOrderTime {
 			key := nextHour.Format("2006-01-02")
 			if _, ok := dayHoursMap[key]; ok {