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

@@ -207,7 +207,7 @@ func (OrderPaymentService *OrderPaymentService) ListDividendOrders(listOrderPaym
 			item.StateOfPayment = "等待支付分红"
 		}
 		if order.OrderActualAmount < order.OrderAmount {
-			item.DividendSpending = utils.Decimal(order.OrderAmount - order.OrderActualAmount)
+			item.DividendSpending = utils.Decimal((order.OrderAmount - order.OrderActualAmount) * (order.PartnerBonusPercent / 100.0))
 		}
 		list = append(list, item)
 	}

@@ -76,6 +76,7 @@ func (dao *OrderDao) GetDividendOrders(options map[string]interface{}) (count in
 	if v, ok := options["limit"]; ok {
 		q.Limit(v.(int))
 	}
+	q.Order(`order.id DESC`)
 	count, err = q.SelectAndCount()
 	return
 }