正在显示
1 个修改的文件
包含
18 行增加
和
12 行删除
| @@ -135,17 +135,17 @@ func (c *OrderDividendController) OrderDividendDetail() { | @@ -135,17 +135,17 @@ func (c *OrderDividendController) OrderDividendDetail() { | ||
| 135 | return | 135 | return |
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | -type postOrderDividend struct { | ||
| 139 | - Id int64 `json:"id"` | ||
| 140 | - DividendPayments []postDividendPayment `json:"dividendPayment"` | ||
| 141 | -} | 138 | +// type postOrderDividend struct { |
| 139 | +// Id int64 `json:"id"` | ||
| 140 | +// DividendPayments []postDividendPayment `json:"dividendPayment"` | ||
| 141 | +// } | ||
| 142 | 142 | ||
| 143 | -type postDividendPayment struct { | ||
| 144 | - QuantityControl string `json:"quantityControl"` | ||
| 145 | - StateOfPayment int `json:"stateOfPayment"` | ||
| 146 | - ProductId int64 `json:"productId"` | ||
| 147 | - Remark string `json:"remark"` | ||
| 148 | -} | 143 | +// type postDividendPayment struct { |
| 144 | +// QuantityControl string `json:"quantityControl"` | ||
| 145 | +// StateOfPayment int `json:"stateOfPayment"` | ||
| 146 | +// ProductId int64 `json:"productId"` | ||
| 147 | +// Remark string `json:"remark"` | ||
| 148 | +// } | ||
| 149 | 149 | ||
| 150 | //OrderDividendDetailForBestshop 海鲜干货的订单分红详情 | 150 | //OrderDividendDetailForBestshop 海鲜干货的订单分红详情 |
| 151 | func (c *OrderDividendController) OrderDividendDetailForBestshop() { | 151 | func (c *OrderDividendController) OrderDividendDetailForBestshop() { |
| @@ -346,7 +346,7 @@ func (c *OrderDividendController) ListOrderBonusForExcel() { | @@ -346,7 +346,7 @@ func (c *OrderDividendController) ListOrderBonusForExcel() { | ||
| 346 | //BatchPayOrderGoodBonus 批量支付订单中的分红 | 346 | //BatchPayOrderGoodBonus 批量支付订单中的分红 |
| 347 | func (c *OrderDividendController) BatchPayOrderGoodBonus() { | 347 | func (c *OrderDividendController) BatchPayOrderGoodBonus() { |
| 348 | type Parameter struct { | 348 | type Parameter struct { |
| 349 | - OrderIds []int64 `json:"orderIds"` | 349 | + OrderIds []string `json:"orderIds"` |
| 350 | } | 350 | } |
| 351 | var ( | 351 | var ( |
| 352 | param Parameter | 352 | param Parameter |
| @@ -357,9 +357,15 @@ func (c *OrderDividendController) BatchPayOrderGoodBonus() { | @@ -357,9 +357,15 @@ func (c *OrderDividendController) BatchPayOrderGoodBonus() { | ||
| 357 | c.ResponseError(errors.New("json数据解析失败")) | 357 | c.ResponseError(errors.New("json数据解析失败")) |
| 358 | return | 358 | return |
| 359 | } | 359 | } |
| 360 | + orderIds := []int64{} | ||
| 361 | + for _, v := range param.OrderIds { | ||
| 362 | + id, _ := strconv.ParseInt(v, 10, 64) | ||
| 363 | + orderIds = append(orderIds, id) | ||
| 364 | + } | ||
| 360 | adminId := c.GetUserId() | 365 | adminId := c.GetUserId() |
| 361 | orderSrv := orderService.NewOrderInfoService(nil) | 366 | orderSrv := orderService.NewOrderInfoService(nil) |
| 362 | - err = orderSrv.BatchPayPartnerBonus(param.OrderIds, adminId) | 367 | + |
| 368 | + err = orderSrv.BatchPayPartnerBonus(orderIds, adminId) | ||
| 363 | if err != nil { | 369 | if err != nil { |
| 364 | c.ResponseError(err) | 370 | c.ResponseError(err) |
| 365 | return | 371 | return |
-
请 注册 或 登录 后发表评论