diff --git a/business/jxcallback/orderman/waybill.go b/business/jxcallback/orderman/waybill.go index fe8c9dce9..3e21f898c 100644 --- a/business/jxcallback/orderman/waybill.go +++ b/business/jxcallback/orderman/waybill.go @@ -263,3 +263,11 @@ func ComplaintRider(ctx *jxcontext.Context, vendorOrderID string, vendorID, wayb } return err } + +func ComplaintRiderPlatform(ctx *jxcontext.Context, vendorOrderID string, vendorID, waybillVendorID, complaintID int) (err error) { + if vendorID != model.VendorIDJD { + return fmt.Errorf("目前只支持京东投诉!") + } + handler := partner.GetPurchaseOrderHandlerFromVendorID(vendorID) + return handler.ComplaintRider(vendorOrderID, complaintID, "") +} diff --git a/business/partner/partner_order.go b/business/partner/partner_order.go index 726ea1e88..7167cd365 100644 --- a/business/partner/partner_order.go +++ b/business/partner/partner_order.go @@ -65,6 +65,8 @@ type IPurchasePlatformOrderHandler interface { GetSelfTakeCode(ctx *jxcontext.Context, order *model.GoodsOrder) (code string, err error) ConfirmSelfTake(ctx *jxcontext.Context, order *model.GoodsOrder, selfTakeCode string) (err error) GetOrderAfsInfo(ctx *jxcontext.Context, vendorOrderID, afsOrderID string) (orderAfsInfo *OrderAfsInfo, err error) + //投诉骑手 + ComplaintRider(vendorOrderId string, resonID int, resonContent string) (err error) } type IAddWaybillTip interface { diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 23d958dda..dba7db803 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -753,3 +753,7 @@ func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, order *model.G } return err } + +func (c *PurchaseHandler) ComplaintRider(vendorOrderId string, resonID int, resonContent string) (err error) { + return err +} diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index c626a52ac..13da79c7c 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -638,3 +638,11 @@ func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, order *model.G } return err } + +func (c *PurchaseHandler) ComplaintRider(vendorOrderId string, resonID int, resonContent string) (err error) { + if globals.EnableJdStoreWrite { + order, _ := partner.CurOrderManager.LoadOrder(vendorOrderId, model.VendorIDJD) + err = getAPI(order.VendorOrgCode).ComplaintDadaDeliver(vendorOrderId, resonID) + } + return err +} diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index ea05d6b24..56fe6c64f 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -297,3 +297,7 @@ func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, order *model.G func (c *PurchaseHandler) ListOrders(ctx *jxcontext.Context, vendorOrgCode string, parentTask tasksch.ITask, queryDate time.Time, vendorStoreID string) (vendorOrderIDs []string, err error) { return vendorOrderIDs, err } + +func (c *PurchaseHandler) ComplaintRider(vendorOrderId string, resonID int, resonContent string) (err error) { + return err +} diff --git a/business/partner/purchase/jx/order.go b/business/partner/purchase/jx/order.go index a8a272c43..f2a0541ef 100644 --- a/business/partner/purchase/jx/order.go +++ b/business/partner/purchase/jx/order.go @@ -136,3 +136,7 @@ func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, order *model.G func (c *PurchaseHandler) GetSelfTakeCode(ctx *jxcontext.Context, order *model.GoodsOrder) (selfTakeCode string, err error) { return selfTakeCode, err } + +func (c *PurchaseHandler) ComplaintRider(vendorOrderId string, resonID int, resonContent string) (err error) { + return err +} diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index 80986fbb4..3b72bb2e9 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -816,3 +816,7 @@ func (c *PurchaseHandler) GetSelfTakeCode(ctx *jxcontext.Context, order *model.G func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, order *model.GoodsOrder, selfTakeCode string) (err error) { return err } + +func (c *PurchaseHandler) ComplaintRider(vendorOrderId string, resonID int, resonContent string) (err error) { + return err +} diff --git a/business/partner/purchase/yb/order.go b/business/partner/purchase/yb/order.go index 52fade583..c87d42882 100644 --- a/business/partner/purchase/yb/order.go +++ b/business/partner/purchase/yb/order.go @@ -87,3 +87,7 @@ func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, order *model.G func (c *PurchaseHandler) GetOrderAfsInfo(ctx *jxcontext.Context, vendorOrderID, afsOrderID string) (orderAfsInfo *partner.OrderAfsInfo, err error) { return orderAfsInfo, err } + +func (c *PurchaseHandler) ComplaintRider(vendorOrderId string, resonID int, resonContent string) (err error) { + return err +} diff --git a/controllers/jx_order.go b/controllers/jx_order.go index 4c509084f..a21453730 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -920,8 +920,8 @@ func (c *OrderController) GetComplaintReasons() { }) } -// @Title 投诉骑手(三方运送) -// @Description 投诉骑手(三方运送) +// @Title 投诉骑手 +// @Description 投诉骑手 // @Param token header string true "认证token" // @Param vendorOrderID formData string true "订单ID" // @Param vendorID formData int true "订单所属厂商ID" @@ -932,7 +932,11 @@ func (c *OrderController) GetComplaintReasons() { // @router /ComplaintRider [post] func (c *OrderController) ComplaintRider() { c.callComplaintRider(func(params *tOrderComplaintRiderParams) (retVal interface{}, errCode string, err error) { - err = orderman.ComplaintRider(params.Ctx, params.VendorOrderID, params.VendorID, params.WaybillVendorID, params.ComplaintID) + if params.VendorID > 100 { + err = orderman.ComplaintRider(params.Ctx, params.VendorOrderID, params.VendorID, params.WaybillVendorID, params.ComplaintID) + } else { + err = orderman.ComplaintRiderPlatform(params.Ctx, params.VendorOrderID, params.VendorID, params.WaybillVendorID, params.ComplaintID) + } return retVal, "", err }) }