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

fixed

This commit is contained in:
yan.y 2024-04-03 18:00:06 +08:00
parent dbdc5e3806
commit 22fd2b67f0
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
business/api/order.go
View File

@ -133,7 +133,11 @@ func (p DefParty) orderList() web_iris.Party {
return return
} }
var orderList []models.OrderMain var orderList []models.OrderMain
database.Instance().Model(&models.OrderMain{}).Where("where uid = ?", headerBaseInfo.Uid).Limit(orderListRequest.PageSize).Offset(orderListRequest.PageNo - 1).Find(&orderList) if orderListRequest.Status == 0 {
database.Instance().Model(&models.OrderMain{}).Where("uid = ?", headerBaseInfo.Uid).Limit(orderListRequest.PageSize).Offset(orderListRequest.PageNo - 1).Find(&orderList)
} else {
database.Instance().Model(&models.OrderMain{}).Where("uid = ? and status = ?", headerBaseInfo.Uid, orderListRequest.Status).Limit(orderListRequest.PageSize).Offset(orderListRequest.PageNo - 1).Find(&orderList)
}
var orderDetails []OrderDetail var orderDetails []OrderDetail
for _, value := range orderList { for _, value := range orderList {
var findUserServiceAddr models.UserServiceAddr var findUserServiceAddr models.UserServiceAddr
@ -148,10 +152,10 @@ func (p DefParty) orderList() web_iris.Party {
} }
var subOrderList []SubOrder var subOrderList []SubOrder
var orderSubList []models.OrderSub var orderSubList []models.OrderSub
database.Instance().Model(&models.OrderSub{}).Where("where main_order_id = ? ", value.OrderId).Find(&orderSubList) database.Instance().Model(&models.OrderSub{}).Where("main_order_id = ? ", value.OrderId).Find(&orderSubList)
for _, orderSub := range orderSubList { for _, orderSub := range orderSubList {
var orderDetailList []models.OrderDetail var orderDetailList []models.OrderDetail
database.Instance().Model(&models.OrderDetail{}).Where("where sub_order_id = ? ", orderSub.OrderId).Find(&orderDetailList) database.Instance().Model(&models.OrderDetail{}).Where("sub_order_id = ? ", orderSub.OrderId).Find(&orderDetailList)
var goods []models.Goods var goods []models.Goods
for _, orderDetail := range orderDetailList { for _, orderDetail := range orderDetailList {
good := GoodsMap[orderDetail.GoodsId] good := GoodsMap[orderDetail.GoodsId]

4
business/config/mysql.json
View File

@ -1,8 +1,8 @@
{ {
"config": "charset=utf8mb4\u0026parseTime=True\u0026loc=Local", "config": "charset=utf8mb4\u0026parseTime=True\u0026loc=Local",
"db-name": "pet_house", "db-name": "pet_house",
"log-mode": false, "log-mode": true,
"log-zap": "error", "log-zap": "info",
"max-idle-conns": 20, "max-idle-conns": 20,
"max-open-conns": 5, "max-open-conns": 5,
"password": "ifish7mysql", "password": "ifish7mysql",