Merge remote-tracking branch 'origin/dev' into test

yangfu
pkg/port/beego/controllers/dividends_controller.go
--- a/pkg/port/beego/controllers/dividends_controller.go
查看文件 @3792b35
+++ b/pkg/port/beego/controllers/dividends_controller.go
查看文件 @3792b35
@@ -191,9 +191,9 @@ func (c *DividendsController) Detail() {
 		DividendProportion:   order.PartnerBonusPercent,
 		DividendsReceivable:  order.OrderTotalBonus() + order.OrderBonusOutstanding(), //应收分红 = 实收分红+分红支出
 		DividendSpending:     order.OrderBonusOutstanding(),                           //分红支出
-		ReceiveDividends:     order.OrderBonusReceive() + order.OrderBonusWait(),      //应实收分红 = 已收分红 + 等待分红
+		ReceiveDividends:     order.OrderTotalBonus(),                                 //实收分红 = 实际金额 * 比例
 		NotReceivedDividends: order.OrderBonusWait(),                                  //未收分红
-		RceivedDividends:     order.OrderBonusReceive(),
+		RceivedDividends:     order.OrderBonusReceive(),                               //已收分红
 	}
 	rsp.Commission = Commission{
 		CommissionProportion: order.SalesmanBonusPercent,