Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/partnermg into dev

@@ -182,8 +182,8 @@ func (c *DividendsController) Detail() {
 		OrderState:  order.OrderStatus,
 		OrderState:  order.OrderStatus,
 		CreateTime:  order.CreateAt.Local().Format("2006-01-02 15:04:05"),
 		CreateTime:  order.CreateAt.Local().Format("2006-01-02 15:04:05"),
 		OrderName:   order.OrderName,
 		OrderName:   order.OrderName,
-		OrderNum:    fmt.Sprintf("%v", order.OrderCount),
-		OrderAmount: fmt.Sprintf("%v", order.OrderAmount),
+		OrderNum:    fmt.Sprintf("%v", order.OrderActualCount),
+		OrderAmount: fmt.Sprintf("%v", order.OrderActualAmount),
 		Id:          fmt.Sprintf("%v", order.Id),
 		Id:          fmt.Sprintf("%v", order.Id),
 	}
 	}
 	rsp.Partner = Partner{
 	rsp.Partner = Partner{