fix:接受参数error

api/rest/afs/afsDetail.go

@@ -36,25 +36,25 @@ type GetAfsResponse struct {
 }
 
 type GetAfsParams struct {
-	ProcessResult     uint       `json:"processResult"`
+	ProcessResult       uint        `json:"processResult"`
-	CustomerName      string     `json:"customerName"`
+	CustomerName        string      `json:"customerName"`
-	ApplyReasonID     uint       `json:"applyReasonId"`
+	ApplyReasonID       uint        `json:"applyReasonId"`
-	ApplyReasonName   string     `json:"applyReasonName"`
+	ApplyReasonName     string      `json:"applyReasonName"`
-	ApproveResult     uint       `json:"approveResult"`
+	ApproveResult       uint        `json:"approveResult"`
-	AfsApplyTime      string     `json:"afsApplyTime"`
+	AfsApplyTime        int64       `json:"afsApplyTime"`
-	ApproveResultName string     `json:"approveResultName"`
+	ApproveResultName   string      `json:"approveResultName"`
-	ProcessResultName string     `json:"processResultName"`
+	ProcessResultName   string      `json:"processResultName"`
-	AfsType           returnType `json:"afsType"`
+	AfsType             returnType  `json:"afsType"`
-	ReturnWareType    uint       `json:"returnWareType"`
+	ReturnWareType      uint        `json:"returnWareType"`
-	CustomerMobile    string     `json:"customerMobile"`
+	CustomerMobile      string      `json:"customerMobile"`
-	QuestionPic       string     `json:"questionPic"`
+	QuestionPic         string      `json:"questionPic"`
-	ApproveNotes      string     `json:"approveNotes"`
+	ApproveNotes        string      `json:"approveNotes"`
-	ApprovedDate      string     `json:"approvedDate"`
+	ApprovedDate        int64       `json:"approvedDate"`
-	CustomerEmail     string     `json:"customerEmail"`
+	CustomerEmail       string      `json:"customerEmail"`
-	ProcessedDate     string     `json:"processedDate"`
+	ProcessedDate       string      `json:"processedDate"`
-	AfsApplyID        uint       `json:"afsApplyId"`
+	AfsApplyID          uint        `json:"afsApplyId"`
-	AfsTypeName       string     `json:"afsTypeName"`
+	AfsTypeName         string      `json:"afsTypeName"`
-	Pin               string     `json:"pin"`
+	Pin                 string      `json:"pin"`
 	AfsServiceState     uint        `json:"afsServiceState"`
 	AfsServiceID        uint        `json:"afsServiceId"`
 	NewOrderID          uint        `json:"newOrderId"`

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: "取消成功",
 }

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:      "已取消",
 }