...
|
...
|
@@ -120,23 +120,24 @@ 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,
|
|
|
"amount": v.GoodCompute.PlanAmount,
|
|
|
|
|
|
"partnerDividendsReceivable": v.GoodCompute.PlanPartnerBonus,
|
|
|
}
|
|
|
m := map[string]interface{}{
|
|
|
"detail": detail,
|
|
|
"quantityControl": "",
|
|
|
"id": v.Id,
|
|
|
"stateOfPayment": v.BonusStatus,
|
|
|
"remark": v.Remark,
|
|
|
"orderPriceControl": "",
|
|
|
"detail": detail,
|
|
|
"quantityControl": "",
|
|
|
"id": v.Id,
|
|
|
"stateOfPayment": v.BonusStatus,
|
|
|
"remark": v.Remark,
|
|
|
"amountControl": "",
|
|
|
}
|
|
|
if v.GoodCompute.UseAmount >= 0 {
|
|
|
m["orderPriceControl"] = fmt.Sprint(v.GoodCompute.UseAmount)
|
|
|
m["amountControl"] = fmt.Sprint(v.GoodCompute.UseAmount)
|
|
|
}
|
|
|
if v.UseGoodNumber >= 0 {
|
|
|
m["quantityControl"] = fmt.Sprint(v.UseGoodNumber)
|
...
|
...
|
@@ -149,7 +150,7 @@ func (c *OrderDividendController) OrderDividendDetail() { |
|
|
"orderDist": orderinfo.RegionInfo.RegionName,
|
|
|
"partner": orderinfo.PartnerInfo.PartnerName,
|
|
|
"id": orderinfo.Id,
|
|
|
"orderNumber": orderinfo.OrderCode,
|
|
|
"orderId": orderinfo.OrderCode,
|
|
|
}
|
|
|
dividendCount := map[string]interface{}{
|
|
|
"orderNum": orderinfo.OrderCompute.PlanOrderCount,
|
...
|
...
|
@@ -188,3 +189,20 @@ func (c *OrderDividendController) OrderDividendDetail() { |
|
|
c.ResponseData(rsp)
|
|
|
return
|
|
|
}
|
|
|
|
|
|
type postOrderDividend struct {
|
|
|
Id string `json:"id"`
|
|
|
}
|
|
|
|
|
|
func (c *OrderDividendController) EditOrderDividend() {
|
|
|
var (
|
|
|
param postOrderDividend
|
|
|
err error
|
|
|
)
|
|
|
if err = c.BindJsonData(¶m); err != nil {
|
|
|
logs.Error(err)
|
|
|
c.ResponseError(errors.New("json数据解析失败"))
|
|
|
return
|
|
|
}
|
|
|
return
|
|
|
} |
...
|
...
|
|