From ae34bf5f2643c81d3da9baa2b5f006b26d80a78c Mon Sep 17 00:00:00 2001
From: "yan.y" <yiyan@021.com>
Date: Thu, 16 May 2024 16:14:50 +0800
Subject: [PATCH] update

---
 business/api/order.go | 52 +++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 22 deletions(-)

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