diff --git a/business/api/order.go b/business/api/order.go index cf11d04..fc8b365 100644 --- a/business/api/order.go +++ b/business/api/order.go @@ -133,7 +133,11 @@ func (p DefParty) orderList() web_iris.Party { return } 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 for _, value := range orderList { var findUserServiceAddr models.UserServiceAddr @@ -148,10 +152,10 @@ func (p DefParty) orderList() web_iris.Party { } var subOrderList []SubOrder 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 { 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 for _, orderDetail := range orderDetailList { good := GoodsMap[orderDetail.GoodsId] diff --git a/business/config/mysql.json b/business/config/mysql.json index 9432d2c..738eba7 100644 --- a/business/config/mysql.json +++ b/business/config/mysql.json @@ -1,8 +1,8 @@ { "config": "charset=utf8mb4\u0026parseTime=True\u0026loc=Local", "db-name": "pet_house", - "log-mode": false, - "log-zap": "error", + "log-mode": true, + "log-zap": "info", "max-idle-conns": 20, "max-open-conns": 5, "password": "ifish7mysql",