mmm-go / partnermg · 提交

转到一个项目

作者 tangxvhui
提交 c9fbbec31439041baf3ecd7af3c4682c8f0b0694 2 个父辈 eeabbed3 d7f3c669

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

内嵌 并排对比
正在显示 2 个修改的文件 包含 4 行增加 和 9 行删除
@@ -196,16 +196,11 @@ func (OrderPaymentService *OrderPaymentService) ListDividendOrders(listOrderPaym @@ -196,16 +196,11 @@ func (OrderPaymentService *OrderPaymentService) ListDividendOrders(listOrderPaym
196 CreateTime: order.CreateAt.Local().Format("2006-01-02 15:04:05"), 196 CreateTime: order.CreateAt.Local().Format("2006-01-02 15:04:05"),
197 PartnerName: order.PartnerInfo.PartnerName, 197 PartnerName: order.PartnerInfo.PartnerName,
198 DividendProportion: order.PartnerBonusPercent, 198 DividendProportion: order.PartnerBonusPercent,
199 - DividendsReceivable: utils.Decimal(order.OrderActualAmount * (order.PartnerBonusPercent / 100.0)), 199 + DividendsReceivable: utils.Decimal(order.OrderAmount * (order.PartnerBonusPercent / 100.0)),
200 DividendSpending: 0, 200 DividendSpending: 0,
201 - ReceiveDividends: utils.Decimal(order.OrderPaymentAmount * (order.PartnerBonusPercent / 100.0)), 201 + ReceiveDividends: utils.Decimal(order.OrderActualAmount * (order.PartnerBonusPercent / 100.0)),
202 CommissionProportion: order.SalesmanBonusPercent, 202 CommissionProportion: order.SalesmanBonusPercent,
203 } 203 }
204 - //if order.BonusStatus == domain.BonusPaid {  
205 - // item.StateOfPayment = "已支付分红"  
206 - //} else {  
207 - // item.StateOfPayment = "等待支付分红"  
208 - //}  
209 if order.OrderActualAmount < order.OrderAmount { 204 if order.OrderActualAmount < order.OrderAmount {
210 item.DividendSpending = utils.Decimal((order.OrderAmount - order.OrderActualAmount) * (order.PartnerBonusPercent / 100.0)) 205 item.DividendSpending = utils.Decimal((order.OrderAmount - order.OrderActualAmount) * (order.PartnerBonusPercent / 100.0))
211 } 206 }
@@ -191,9 +191,9 @@ func (c *DividendsController) Detail() { @@ -191,9 +191,9 @@ func (c *DividendsController) Detail() {
191 DividendProportion: order.PartnerBonusPercent, 191 DividendProportion: order.PartnerBonusPercent,
192 DividendsReceivable: order.OrderTotalBonus() + order.OrderBonusOutstanding(), //应收分红 = 实收分红+分红支出 192 DividendsReceivable: order.OrderTotalBonus() + order.OrderBonusOutstanding(), //应收分红 = 实收分红+分红支出
193 DividendSpending: order.OrderBonusOutstanding(), //分红支出 193 DividendSpending: order.OrderBonusOutstanding(), //分红支出
194 - ReceiveDividends: order.OrderBonusReceive() + order.OrderBonusWait(), //应实收分红 = 已收分红 + 等待分红 194 + ReceiveDividends: order.OrderTotalBonus(), //实收分红 = 实际金额 * 比例
195 NotReceivedDividends: order.OrderBonusWait(), //未收分红 195 NotReceivedDividends: order.OrderBonusWait(), //未收分红
196 - RceivedDividends: order.OrderBonusReceive(), 196 + RceivedDividends: order.OrderBonusReceive(), //已收分红
197 } 197 }
198 rsp.Commission = Commission{ 198 rsp.Commission = Commission{
199 CommissionProportion: order.SalesmanBonusPercent, 199 CommissionProportion: order.SalesmanBonusPercent,