|
@@ -51,7 +51,7 @@ func (c *OrderDividendController) PageListOrderDividend() { |
|
@@ -51,7 +51,7 @@ func (c *OrderDividendController) PageListOrderDividend() { |
|
51
|
if param.PageSize == 0 {
|
51
|
if param.PageSize == 0 {
|
|
52
|
param.PageSize = 20
|
52
|
param.PageSize = 20
|
|
53
|
}
|
53
|
}
|
|
54
|
-
|
54
|
+ companyId := c.GetUserCompany()
|
|
55
|
orderSrv := orderService.NewOrderInfoService(nil)
|
55
|
orderSrv := orderService.NewOrderInfoService(nil)
|
|
56
|
orderinfos, cnt, err := orderSrv.PageListOrderBase(orderQuery.ListOrderBaseQuery{
|
56
|
orderinfos, cnt, err := orderSrv.PageListOrderBase(orderQuery.ListOrderBaseQuery{
|
|
57
|
PartnerId: param.Partner,
|
57
|
PartnerId: param.Partner,
|
|
@@ -59,6 +59,7 @@ func (c *OrderDividendController) PageListOrderDividend() { |
|
@@ -59,6 +59,7 @@ func (c *OrderDividendController) PageListOrderDividend() { |
|
59
|
OrderType: domain.OrderReal,
|
59
|
OrderType: domain.OrderReal,
|
|
60
|
Limit: param.PageSize,
|
60
|
Limit: param.PageSize,
|
|
61
|
Offset: (param.PageNumber - 1) * param.PageSize,
|
61
|
Offset: (param.PageNumber - 1) * param.PageSize,
|
|
|
|
62
|
+ CompanyId: companyId,
|
|
62
|
})
|
63
|
})
|
|
63
|
if err != nil {
|
64
|
if err != nil {
|
|
64
|
c.ResponseError(err)
|
65
|
c.ResponseError(err)
|
|
@@ -106,9 +107,11 @@ func (c *OrderDividendController) OrderDividendDetail() { |
|
@@ -106,9 +107,11 @@ func (c *OrderDividendController) OrderDividendDetail() { |
|
106
|
c.ResponseError(errors.New("参数错误"))
|
107
|
c.ResponseError(errors.New("参数错误"))
|
|
107
|
return
|
108
|
return
|
|
108
|
}
|
109
|
}
|
|
|
|
110
|
+ companyId := c.GetUserCompany()
|
|
109
|
orderSrv := orderService.NewOrderInfoService(nil)
|
111
|
orderSrv := orderService.NewOrderInfoService(nil)
|
|
110
|
orderinfo, err := orderSrv.GetOrderDetail(orderQuery.GetOrderQuery{
|
112
|
orderinfo, err := orderSrv.GetOrderDetail(orderQuery.GetOrderQuery{
|
|
111
|
OrderId: orderid,
|
113
|
OrderId: orderid,
|
|
|
|
114
|
+ CompanyId: companyId,
|
|
112
|
})
|
115
|
})
|
|
113
|
if err != nil {
|
116
|
if err != nil {
|
|
114
|
c.ResponseError(err)
|
117
|
c.ResponseError(err)
|
|
@@ -251,9 +254,11 @@ func (c *OrderDividendController) EditOrderDividend() { |
|
@@ -251,9 +254,11 @@ func (c *OrderDividendController) EditOrderDividend() { |
|
251
|
}
|
254
|
}
|
|
252
|
goodbouns = append(goodbouns, g)
|
255
|
goodbouns = append(goodbouns, g)
|
|
253
|
}
|
256
|
}
|
|
|
|
257
|
+ companyId := c.GetUserCompany()
|
|
254
|
cmd := orderCmd.UpdateGoodBouns{
|
258
|
cmd := orderCmd.UpdateGoodBouns{
|
|
255
|
Id: param.Id,
|
259
|
Id: param.Id,
|
|
256
|
GoodBouns: goodbouns,
|
260
|
GoodBouns: goodbouns,
|
|
|
|
261
|
+ CompanyId: companyId,
|
|
257
|
}
|
262
|
}
|
|
258
|
orderSrv := orderService.NewOrderInfoService(nil)
|
263
|
orderSrv := orderService.NewOrderInfoService(nil)
|
|
259
|
err = orderSrv.UpdateGoodBouns(cmd)
|
264
|
err = orderSrv.UpdateGoodBouns(cmd)
|