aa

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{

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"},
-	}
-}