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

update

This commit is contained in:
yan.y 2024-05-16 16:14:50 +08:00
parent e06c2d10e9
commit ae34bf5f26
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
business/api/order.go
View File

@ -194,13 +194,14 @@ func GetOrderDetail(orderId string) OrderDetail {
var findUserServiceAddr models.UserServiceAddr var findUserServiceAddr models.UserServiceAddr
database.Instance().Model(&models.UserServiceAddr{}).Where("id = ?", orderMain.ServiceAddrId).Find(&findUserServiceAddr) database.Instance().Model(&models.UserServiceAddr{}).Where("id = ?", orderMain.ServiceAddrId).Find(&findUserServiceAddr)
orderDetail := OrderDetail{ orderDetail := OrderDetail{
OrderId: orderMain.OrderId, OrderId: orderMain.OrderId,
Status: orderMain.OrderStatus, Status: orderMain.OrderStatus,
ServiceTime: orderMain.ServiceTime, ServiceTime: orderMain.ServiceTime,
ServiceAddr: findUserServiceAddr, ServiceAddr: findUserServiceAddr,
ServiceRemark: orderMain.ServiceRemark, ServiceRemark: orderMain.ServiceRemark,
CreateTime: orderMain.CreateTime.Format("2006-01-02 15:04:05"), CreateTime: orderMain.CreateTime.Format("2006-01-02 15:04:05"),
PayStatus: orderMain.PayStatus, PayStatus: orderMain.PayStatus,
DispatchStatus: orderMain.DispatchStatus,
} }
var subOrderList []SubOrder var subOrderList []SubOrder
var orderSubList []models.OrderSub var orderSubList []models.OrderSub
@ -267,15 +268,16 @@ type SubOrder struct {
} }
type OrderDetail struct { type OrderDetail struct {
OrderId string `json:"orderId"` //主订单号 OrderId string `json:"orderId"` //主订单号
Status int `json:"status"` //主订单状态 0待派单 1待服务 2服务中 3已完成 4已取消 Status int `json:"status"` //主订单状态 0待派单 1待服务 2服务中 3已完成 4已取消
ServiceTime string `json:"serviceTime"` //服务时间 ServiceTime string `json:"serviceTime"` //服务时间
ServiceAddr models.UserServiceAddr `json:"serviceAddr"` //服务地址信息 ServiceAddr models.UserServiceAddr `json:"serviceAddr"` //服务地址信息
ServiceRemark string `json:"serviceRemark"` //服务备注 ServiceRemark string `json:"serviceRemark"` //服务备注
CreateTime string `json:"createTime"` //创建时间 CreateTime string `json:"createTime"` //创建时间
SubOrderList []SubOrder `json:"subOrderList"` //子订单列表 SubOrderList []SubOrder `json:"subOrderList"` //子订单列表
ServiceCar *models.ServiceCar `json:"serviceCar"` //服务车辆 只有主订单状态为 1 2 3的时候才会存在 ServiceCar *models.ServiceCar `json:"serviceCar"` //服务车辆 只有派单状态未1的时候才会存在
PayStatus int `json:"payStatus"` //支付状态 0未支付 1已支付 PayStatus int `json:"payStatus"` //支付状态 0未支付 1已支付
DispatchStatus int `json:"dispatchStatus"` //派单状态 0未派单 1已派单
} }
type OrderListResponse struct { type OrderListResponse struct {
@ -307,12 +309,14 @@ func (p DefParty) orderList() web_iris.Party {
var findUserServiceAddr models.UserServiceAddr var findUserServiceAddr models.UserServiceAddr
database.Instance().Model(&models.UserServiceAddr{}).Where("id = ? and uid = ?", value.ServiceAddrId, headerBaseInfo.Uid).Find(&findUserServiceAddr) database.Instance().Model(&models.UserServiceAddr{}).Where("id = ? and uid = ?", value.ServiceAddrId, headerBaseInfo.Uid).Find(&findUserServiceAddr)
orderListResponse := OrderDetail{ orderListResponse := OrderDetail{
OrderId: value.OrderId, OrderId: value.OrderId,
Status: value.OrderStatus, Status: value.OrderStatus,
ServiceTime: value.ServiceTime, ServiceTime: value.ServiceTime,
ServiceAddr: findUserServiceAddr, ServiceAddr: findUserServiceAddr,
ServiceRemark: value.ServiceRemark, ServiceRemark: value.ServiceRemark,
CreateTime: value.CreateTime.Format("2006-01-02 15:04:05"), CreateTime: value.CreateTime.Format("2006-01-02 15:04:05"),
PayStatus: value.PayStatus,
DispatchStatus: value.DispatchStatus,
} }
var subOrderList []SubOrder var subOrderList []SubOrder
var orderSubList []models.OrderSub var orderSubList []models.OrderSub
@ -373,6 +377,10 @@ func (p DefParty) orderCancel() web_iris.Party {
OrderError.Fail(ctx, orderCancelRequest) OrderError.Fail(ctx, orderCancelRequest)
return return
} }
if orderMain.DispatchStatus == 1 {
OrderError.Fail(ctx, orderCancelRequest)
return
}
if orderMain.PayStatus == 1 { if orderMain.PayStatus == 1 {
var userInfo models.User var userInfo models.User
database.Instance().Model(&models.User{}).Where("id = ?", orderMain.Uid).Find(&userInfo) database.Instance().Model(&models.User{}).Where("id = ?", orderMain.Uid).Find(&userInfo)