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

10
business/api/order.go
View File

@ -201,6 +201,7 @@ func GetOrderDetail(orderId string) OrderDetail {
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
@ -274,8 +275,9 @@ type OrderDetail struct {
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 {
@ -313,6 +315,8 @@ func (p DefParty) orderList() web_iris.Party {
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)