|
...
|
...
|
@@ -563,8 +563,8 @@ func (c *OrderInfoController) GetOrderReal() { |
|
|
|
//实际订单
|
|
|
|
type postRealOrderDetail struct {
|
|
|
|
postPurposeOrderDetail
|
|
|
|
PartnerCategory int64 `json:"partner_category"`
|
|
|
|
ShipmentsId string `json:"shipmentsId"` //发货单号
|
|
|
|
PartnerCategoryId int64 `json:"partnerCategoryId"`
|
|
|
|
ShipmentsId string `json:"shipmentsId"` //发货单号
|
|
|
|
}
|
|
|
|
|
|
|
|
func (postData *postRealOrderDetail) Valid() error {
|
|
...
|
...
|
@@ -629,7 +629,7 @@ func (c *OrderInfoController) addOrderReal(param postRealOrderDetail) error { |
|
|
|
SalesmanBonusPercent: param.CommissionProportion,
|
|
|
|
Goods: newGoods,
|
|
|
|
CompanyId: companyId,
|
|
|
|
PartnerCategory: param.PartnerCategory,
|
|
|
|
PartnerCategory: param.PartnerCategoryId,
|
|
|
|
}
|
|
|
|
_, err := orderSrv.CreateNewOrder(createcmd)
|
|
|
|
return err
|
|
...
|
...
|
@@ -659,7 +659,7 @@ func (c *OrderInfoController) editOrderReal(param postRealOrderDetail) error { |
|
|
|
SalesmanBonusPercent: param.CommissionProportion,
|
|
|
|
Goods: newGoods,
|
|
|
|
CompanyId: companyId,
|
|
|
|
PartnerCategory: param.PartnerCategory,
|
|
|
|
PartnerCategory: param.PartnerCategoryId,
|
|
|
|
}
|
|
|
|
orderSrv := orderService.NewOrderInfoService(nil)
|
|
|
|
_, err := orderSrv.UpdateOrderData(updatecmd)
|
...
|
...
|
|
