From b09a68551c8c5a952a3aae196e9b42f6f8b6da36 Mon Sep 17 00:00:00 2001
From: howell <2827207845@qq.com>
Date: Fri, 9 Jul 2021 17:35:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8E=A5=E5=8F=97=E5=8F=82=E6=95=B0error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/rest/afs/afsDetail.go | 38 +++++++++++++++++++-------------------
 api/rest/order/cancel.go  |  2 ++
 api/rest/order/order.go   |  4 +++-
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/api/rest/afs/afsDetail.go b/api/rest/afs/afsDetail.go
index 7af5e22..6999bc5 100644
--- a/api/rest/afs/afsDetail.go
+++ b/api/rest/afs/afsDetail.go
@@ -36,25 +36,25 @@ type GetAfsResponse struct {
 }
 
 type GetAfsParams struct {
-	ProcessResult     uint       `json:"processResult"`
-	CustomerName      string     `json:"customerName"`
-	ApplyReasonID     uint       `json:"applyReasonId"`
-	ApplyReasonName   string     `json:"applyReasonName"`
-	ApproveResult     uint       `json:"approveResult"`
-	AfsApplyTime      string     `json:"afsApplyTime"`
-	ApproveResultName string     `json:"approveResultName"`
-	ProcessResultName string     `json:"processResultName"`
-	AfsType           returnType `json:"afsType"`
-	ReturnWareType    uint       `json:"returnWareType"`
-	CustomerMobile    string     `json:"customerMobile"`
-	QuestionPic       string     `json:"questionPic"`
-	ApproveNotes      string     `json:"approveNotes"`
-	ApprovedDate      string     `json:"approvedDate"`
-	CustomerEmail     string     `json:"customerEmail"`
-	ProcessedDate     string     `json:"processedDate"`
-	AfsApplyID        uint       `json:"afsApplyId"`
-	AfsTypeName       string     `json:"afsTypeName"`
-	Pin               string     `json:"pin"`
+	ProcessResult       uint        `json:"processResult"`
+	CustomerName        string      `json:"customerName"`
+	ApplyReasonID       uint        `json:"applyReasonId"`
+	ApplyReasonName     string      `json:"applyReasonName"`
+	ApproveResult       uint        `json:"approveResult"`
+	AfsApplyTime        int64       `json:"afsApplyTime"`
+	ApproveResultName   string      `json:"approveResultName"`
+	ProcessResultName   string      `json:"processResultName"`
+	AfsType             returnType  `json:"afsType"`
+	ReturnWareType      uint        `json:"returnWareType"`
+	CustomerMobile      string      `json:"customerMobile"`
+	QuestionPic         string      `json:"questionPic"`
+	ApproveNotes        string      `json:"approveNotes"`
+	ApprovedDate        int64       `json:"approvedDate"`
+	CustomerEmail       string      `json:"customerEmail"`
+	ProcessedDate       string      `json:"processedDate"`
+	AfsApplyID          uint        `json:"afsApplyId"`
+	AfsTypeName         string      `json:"afsTypeName"`
+	Pin                 string      `json:"pin"`
 	AfsServiceState     uint        `json:"afsServiceState"`
 	AfsServiceID        uint        `json:"afsServiceId"`
 	NewOrderID          uint        `json:"newOrderId"`
diff --git a/api/rest/order/cancel.go b/api/rest/order/cancel.go
index 1fe417e..2fd0d22 100644
--- a/api/rest/order/cancel.go
+++ b/api/rest/order/cancel.go
@@ -37,11 +37,13 @@ type CancelOrderResponse struct {
 type cancelStatus uint
 
 const (
+	CancelNot     cancelStatus = 0
 	CancelFail    cancelStatus = 1
 	CancelSuccess cancelStatus = 3
 )
 
 var cancelStatusMap = map[cancelStatus]string{
+	CancelNot:     "不可取消",
 	CancelFail:    "取消失败",
 	CancelSuccess: "取消成功",
 }
diff --git a/api/rest/order/order.go b/api/rest/order/order.go
index 3d5cd6d..03999c7 100644
--- a/api/rest/order/order.go
+++ b/api/rest/order/order.go
@@ -78,7 +78,8 @@ const (
 	OutOfStock         = 8
 	WaitConfirm        = 15
 	UserReject         = 16
-	Lock               = 20
+	UserSign           = 18
+	Lock               = 21
 	Cancel             = -100
 )
 
@@ -91,6 +92,7 @@ var statusMap = map[status]string{
 	OutOfStock:  "出库完成",
 	WaitConfirm: "待用户确认收货",
 	UserReject:  "用户拒收",
+	UserSign:    "用户签收",
 	Lock:        "订单锁定",
 	Cancel:      "已取消",
 }