root
/
pet-house
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

时间及打包处理

This commit is contained in:
yan.y 2024-04-28 17:38:17 +08:00
parent 4555360bbb
commit abe0a27140
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
business/api/order.go
View File

@ -5,6 +5,7 @@ import (
"github.com/kataras/iris/v12" "github.com/kataras/iris/v12"
"github.com/kataras/iris/v12/context" "github.com/kataras/iris/v12/context"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/gorm/clause"
"io" "io"
"pet-house.com/business/models" "pet-house.com/business/models"
"pet-house.com/business/utils" "pet-house.com/business/utils"
@ -13,7 +14,6 @@ import (
"pet-house.com/core/server/zap_server" "pet-house.com/core/server/zap_server"
"strconv" "strconv"
"sync" "sync"
"time"
) )
type PetGoodsInfo struct { type PetGoodsInfo struct {
@ -126,7 +126,7 @@ func GetOrderDetail(orderId string) OrderDetail {
ServiceTime: orderMain.ServiceTime, ServiceTime: orderMain.ServiceTime,
ServiceAddr: findUserServiceAddr, ServiceAddr: findUserServiceAddr,
ServiceRemark: orderMain.ServiceRemark, ServiceRemark: orderMain.ServiceRemark,
CreateTime: orderMain.CreateTime.String(), CreateTime: orderMain.CreateTime.Format("2006-01-02 15:04:05"),
} }
var subOrderList []SubOrder var subOrderList []SubOrder
var orderSubList []models.OrderSub var orderSubList []models.OrderSub
@ -157,7 +157,6 @@ func GetOrderDetail(orderId string) OrderDetail {
} else { } else {
orderDetail.ServiceCar = &models.ServiceCar{} orderDetail.ServiceCar = &models.ServiceCar{}
} }
orderDetail.CreateTime = time.DateTime
orderDetail.SubOrderList = subOrderList orderDetail.SubOrderList = subOrderList
return orderDetail return orderDetail
} }
@ -221,9 +220,9 @@ func (p DefParty) orderList() web_iris.Party {
} }
var orderList []models.OrderMain var orderList []models.OrderMain
if orderListRequest.Status == 0 { 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 { } 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 var orderDetails []OrderDetail
for _, value := range orderList { for _, value := range orderList {
@ -235,7 +234,7 @@ func (p DefParty) orderList() web_iris.Party {
ServiceTime: value.ServiceTime, ServiceTime: value.ServiceTime,
ServiceAddr: findUserServiceAddr, ServiceAddr: findUserServiceAddr,
ServiceRemark: value.ServiceRemark, ServiceRemark: value.ServiceRemark,
CreateTime: value.CreateTime.String(), CreateTime: value.CreateTime.Format("2006-01-02 15:04:05"),
} }
var subOrderList []SubOrder var subOrderList []SubOrder
var orderSubList []models.OrderSub var orderSubList []models.OrderSub

4
business/build_linux.bat
View File

@ -1,4 +1,8 @@
@echo off @echo off
set APP_NAME="petHouseApp"
if exist %APP_NAME% (
del %APP_NAME%
)
set GOOS=linux set GOOS=linux
set GOARCH=amd64 set GOARCH=amd64
echo build echo build

4
business/utils/commonUtil.go
View File

@ -48,8 +48,8 @@ func GetStrDays(day int, minute int, reserveMap map[string]models.ReserveTimeFil
//且不存在过滤时间中 //且不存在过滤时间中
_, existsDay := reserveMap[nextHour.Format("2006-01-02")] _, existsDay := reserveMap[nextHour.Format("2006-01-02")]
_, existsHour := reserveMap[nextHour.Format("15")] _, existsHour := reserveMap[nextHour.Format("15")]
_, existOrderTime := orderTimeMap[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:00")] orderNum, existOrderNum := orderNumMap[nextHour.Format("2006-01-02 15:04")]
if (nextHour.Hour() >= workStart && nextHour.Hour() < workEnd) && (!existsDay && !existsHour) && !existOrderTime { if (nextHour.Hour() >= workStart && nextHour.Hour() < workEnd) && (!existsDay && !existsHour) && !existOrderTime {
key := nextHour.Format("2006-01-02") key := nextHour.Format("2006-01-02")
if _, ok := dayHoursMap[key]; ok { if _, ok := dayHoursMap[key]; ok {