作者 tangxvhui

更新

@@ -122,12 +122,11 @@ func (c *OrderDividendController) OrderDividendDetail() { @@ -122,12 +122,11 @@ func (c *OrderDividendController) OrderDividendDetail() {
122 allGoods := []map[string]interface{}{} 122 allGoods := []map[string]interface{}{}
123 for _, v := range orderinfo.Goods { 123 for _, v := range orderinfo.Goods {
124 detail := map[string]interface{}{ 124 detail := map[string]interface{}{
125 - "productName": v.GoodName,  
126 - "orderNum": v.PlanGoodNumber,  
127 - "univalence": v.Price,  
128 - "partnerRatio": v.PartnerBonusPercent,  
129 - "orderPrice": v.GoodCompute.PlanAmount,  
130 - 125 + "productName": v.GoodName,
  126 + "orderNum": v.PlanGoodNumber,
  127 + "univalence": v.Price,
  128 + "partnerRatio": v.PartnerBonusPercent,
  129 + "orderPrice": v.GoodCompute.PlanAmount,
131 "partnerDividendsReceivable": v.GoodCompute.PlanPartnerBonus, 130 "partnerDividendsReceivable": v.GoodCompute.PlanPartnerBonus,
132 } 131 }
133 m := map[string]interface{}{ 132 m := map[string]interface{}{
@@ -138,6 +137,9 @@ func (c *OrderDividendController) OrderDividendDetail() { @@ -138,6 +137,9 @@ func (c *OrderDividendController) OrderDividendDetail() {
138 "remark": v.Remark, 137 "remark": v.Remark,
139 "amountControl": "", 138 "amountControl": "",
140 "partnerDividendControl": "", 139 "partnerDividendControl": "",
  140 + "receivedDividends": v.GoodCompute.PartnerBonusHas,
  141 + "notReceivedDividend": v.GoodCompute.PartnerBonusNot,
  142 + "dividendSpending": v.GoodCompute.PartnerBonusExpense,
141 } 143 }
142 if v.GoodCompute.UseAmount >= 0 { 144 if v.GoodCompute.UseAmount >= 0 {
143 m["amountControl"] = fmt.Sprint(v.GoodCompute.UseAmount) 145 m["amountControl"] = fmt.Sprint(v.GoodCompute.UseAmount)