Merge branch 'main-merge-base-a'

# Conflicts:
#	deploy/dev/docker-compose.yml
#	deploy/dev/envoy.yaml
#	desc/api/dispute.api
#	desc/api/review.api
#	desc/api/search.api

desc/api/dispute.api

@@ -3,34 +3,48 @@ syntax = "v1"
 import "common.api"
 
 type (
-	PathId {
+	DisputePathId {
 		Id int64 `path:"id"`
 	}
 	Dispute {
-		Id        int64    `json:"id"`
-		OrderId   int64    `json:"orderId"`
-		Reason    string   `json:"reason"`
-		Status    string   `json:"status"`
-		Evidence  []string `json:"evidence"`
-		Result    string   `json:"result,optional"`
-		CreatedAt string   `json:"createdAt"`
+		Id                 int64    `json:"id"`
+		OrderId            int64    `json:"orderId"`
+		InitiatorId        int64    `json:"initiatorId"`
+		InitiatorName      string   `json:"initiatorName"`
+		RespondentId       int64    `json:"respondentId"`
+		Reason             string   `json:"reason"`
+		Evidence           []string `json:"evidence"`
+		Status             string   `json:"status"`
+		Result             string   `json:"result,optional"`
+		RespondentReason   string   `json:"respondentReason,optional"`
+		RespondentEvidence []string `json:"respondentEvidence"`
+		AppealReason       string   `json:"appealReason,optional"`
+		AppealedAt         string   `json:"appealedAt,optional"`
+		ResolvedBy         int64    `json:"resolvedBy,optional"`
+		ResolvedAt         string   `json:"resolvedAt,optional"`
+		CreatedAt          string   `json:"createdAt"`
+		UpdatedAt          string   `json:"updatedAt"`
+	}
+	DisputeListReq {
+		PageReq
+		Status string `form:"status,optional"`
 	}
 	DisputeListResp {
 		Items []Dispute `json:"items"`
 		Meta  PageMeta  `json:"meta"`
 	}
 	CreateDisputeReq {
-		PathId
+		DisputePathId
 		Reason   string   `json:"reason"`
 		Evidence []string `json:"evidence"`
 	}
 	DisputeResponseReq {
-		PathId
+		DisputePathId
 		Reason   string   `json:"reason"`
 		Evidence []string `json:"evidence"`
 	}
 	AppealReq {
-		PathId
+		DisputePathId
 		Reason string `json:"reason"`
 	}
 )
@@ -42,11 +56,11 @@ type (
 service dispute-api {
 	@doc "获取争议列表"
 	@handler ListDisputes
-	get /disputes (PageReq) returns (DisputeListResp)
+	get /disputes (DisputeListReq) returns (DisputeListResp)
 
 	@doc "获取订单争议"
 	@handler GetOrderDispute
-	get /orders/:id/dispute (PathId) returns (Dispute)
+	get /orders/:id/dispute (DisputePathId) returns (Dispute)
 
 	@doc "发起争议"
 	@handler CreateDispute