作者 tangxvhui

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

... ... @@ -196,16 +196,11 @@ func (OrderPaymentService *OrderPaymentService) ListDividendOrders(listOrderPaym
CreateTime: order.CreateAt.Local().Format("2006-01-02 15:04:05"),
PartnerName: order.PartnerInfo.PartnerName,
DividendProportion: order.PartnerBonusPercent,
DividendsReceivable: utils.Decimal(order.OrderActualAmount * (order.PartnerBonusPercent / 100.0)),
DividendsReceivable: utils.Decimal(order.OrderAmount * (order.PartnerBonusPercent / 100.0)),
DividendSpending: 0,
ReceiveDividends: utils.Decimal(order.OrderPaymentAmount * (order.PartnerBonusPercent / 100.0)),
ReceiveDividends: utils.Decimal(order.OrderActualAmount * (order.PartnerBonusPercent / 100.0)),
CommissionProportion: order.SalesmanBonusPercent,
}
//if order.BonusStatus == domain.BonusPaid {
// item.StateOfPayment = "已支付分红"
//} else {
// item.StateOfPayment = "等待支付分红"
//}
if order.OrderActualAmount < order.OrderAmount {
item.DividendSpending = utils.Decimal((order.OrderAmount - order.OrderActualAmount) * (order.PartnerBonusPercent / 100.0))
}
... ...