diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 202434b95..9d3c17f44 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -24,7 +24,7 @@ func (c *BaseScheduler) CreateWaybillOnProviders(vendorOrderID string, vendorID } // todo 这里应该要考虑纯自送与转自送 -func (c *BaseScheduler) Swtich2SelfDeliverAndUpdateStatus(vendorOrderID string, vendorID int, userName string) (err error) { +func (c *BaseScheduler) SelfDeliveringAndUpdateStatus(vendorOrderID string, vendorID int, userName string) (err error) { order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID) if err == nil { if getStoreDeliveryType(order) == scheduler.StoreDeliveryTypeByStore { diff --git a/controllers/jx_order.go b/controllers/jx_order.go index b5ed35d3f..c03648bc4 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -22,11 +22,13 @@ func GetUserNameFromToken(token string) string { } func (c *OrderController) URLMapping() { - c.Mapping("FinishedPickup", c.FinishedPickup) c.Mapping("GetStoreOrderInfo", c.GetStoreOrderInfo) c.Mapping("GetOrderSkuInfo", c.GetOrderSkuInfo) + + c.Mapping("FinishedPickup", c.FinishedPickup) + c.Mapping("SelfDelivering", c.SelfDelivering) c.Mapping("CreateWaybillOnProviders", c.CreateWaybillOnProviders) - c.Mapping("Swtich2SelfDeliver", c.Swtich2SelfDeliver) + c.Mapping("SelfDelivered", c.SelfDelivered) } func (c *OrderController) orderOperate(handler func(vendorOrderID string, vendorID int, userName string) (interface{}, error)) { @@ -87,10 +89,10 @@ func (c *OrderController) FinishedPickup() { // @Param vendorID formData int true "订单所属的厂商ID" // @Success 200 {object} business.model.CallResult // @Failure 200 {object} business.model.CallResult -// @router /Swtich2SelfDeliver [post] -func (c *OrderController) Swtich2SelfDeliver() { +// @router /SelfDelivering [post] +func (c *OrderController) SelfDelivering() { c.orderOperate(func(vendorOrderID string, vendorID int, userName string) (interface{}, error) { - return nil, basesch.FixedBaseScheduler.Swtich2SelfDeliverAndUpdateStatus(vendorOrderID, vendorID, userName) + return nil, basesch.FixedBaseScheduler.SelfDeliveringAndUpdateStatus(vendorOrderID, vendorID, userName) }) } diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 761e8c557..1c5ee2fdd 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -57,8 +57,8 @@ func init() { beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"], beego.ControllerComments{ - Method: "Swtich2SelfDeliver", - Router: `/Swtich2SelfDeliver`, + Method: "SelfDelivering", + Router: `/SelfDelivering`, AllowHTTPMethods: []string{"post"}, MethodParams: param.Make(), Params: nil})