|
...
|
...
|
@@ -122,12 +122,11 @@ func (c *OrderDividendController) OrderDividendDetail() { |
|
|
|
allGoods := []map[string]interface{}{}
|
|
|
|
for _, v := range orderinfo.Goods {
|
|
|
|
detail := map[string]interface{}{
|
|
|
|
"productName": v.GoodName,
|
|
|
|
"orderNum": v.PlanGoodNumber,
|
|
|
|
"univalence": v.Price,
|
|
|
|
"partnerRatio": v.PartnerBonusPercent,
|
|
|
|
"orderPrice": v.GoodCompute.PlanAmount,
|
|
|
|
|
|
|
|
"productName": v.GoodName,
|
|
|
|
"orderNum": v.PlanGoodNumber,
|
|
|
|
"univalence": v.Price,
|
|
|
|
"partnerRatio": v.PartnerBonusPercent,
|
|
|
|
"orderPrice": v.GoodCompute.PlanAmount,
|
|
|
|
"partnerDividendsReceivable": v.GoodCompute.PlanPartnerBonus,
|
|
|
|
}
|
|
|
|
m := map[string]interface{}{
|
|
...
|
...
|
@@ -138,6 +137,9 @@ func (c *OrderDividendController) OrderDividendDetail() { |
|
|
|
"remark": v.Remark,
|
|
|
|
"amountControl": "",
|
|
|
|
"partnerDividendControl": "",
|
|
|
|
"receivedDividends": v.GoodCompute.PartnerBonusHas,
|
|
|
|
"notReceivedDividend": v.GoodCompute.PartnerBonusNot,
|
|
|
|
"dividendSpending": v.GoodCompute.PartnerBonusExpense,
|
|
|
|
}
|
|
|
|
if v.GoodCompute.UseAmount >= 0 {
|
|
|
|
m["amountControl"] = fmt.Sprint(v.GoodCompute.UseAmount)
|
...
|
...
|
|
