From 3f9ab86faefe6a02101997397366366a7897a0b4 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Fri, 7 May 2021 15:36:50 +0800
Subject: [PATCH] aa

---
 business/model/const.go | 8 ++++----
 business/model/order.go | 6 ------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/business/model/const.go b/business/model/const.go
index 82413cd36..6da92a2a4 100644
--- a/business/model/const.go
+++ b/business/model/const.go
@@ -92,11 +92,11 @@ var (
 
 	UnionOrderStatusName = map[int]string{
 		UnionOrderStatusNew:       "新订单",
-		UnionOrderStatusPay:       "已支付",
-		UnionOrderStatusTakeOver:  "已确认收货",
+		UnionOrderStatusPay:       "用户已支付",
+		UnionOrderStatusTakeOver:  "用户已确认收货",
 		UnionOrderStatusAuditOver: "已审核",
-		UnionOrderStatusFinish:    "已结算",
-		UnionOrderStatusFail:      "结算失败",
+		UnionOrderStatusFinish:    "已完成（已结算）",
+		UnionOrderStatusFail:      "已退款（结算失败）",
 	}
 
 	ComplaintReasons = map[int]string{
diff --git a/business/model/order.go b/business/model/order.go
index aa56c3f04..eb2b393f1 100644
--- a/business/model/order.go
+++ b/business/model/order.go
@@ -181,9 +181,3 @@ type UnionOrderStatus struct {
 	OrderStatusAt time.Time `json:"orderStatusAt"`                               //更新时间
 	Comment       string    `orm:"size(255)" json:"comment"`                     //备注
 }
-
-func (v *UnionOrderStatus) TableUnique() [][]string {
-	return [][]string{
-		[]string{"VendorOrderID", "VendorID"},
-	}
-}