liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- change Switch2SelfDeliver to SelfDelivering.

Browse Source
This commit is contained in:
gazebo
2018-08-23 09:53:52 +08:00
parent 50f8ee12d6
commit 1cb266d4d1
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -24,7 +24,7 @@ func (c *BaseScheduler) CreateWaybillOnProviders(vendorOrderID string, vendorID
} }
// todo 这里应该要考虑纯自送与转自送 // 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) order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
if err == nil { if err == nil {
if getStoreDeliveryType(order) == scheduler.StoreDeliveryTypeByStore { if getStoreDeliveryType(order) == scheduler.StoreDeliveryTypeByStore {

12
controllers/jx_order.go
View File

@@ -22,11 +22,13 @@ func GetUserNameFromToken(token string) string {
} }
func (c *OrderController) URLMapping() { func (c *OrderController) URLMapping() {
c.Mapping("FinishedPickup", c.FinishedPickup)
c.Mapping("GetStoreOrderInfo", c.GetStoreOrderInfo) c.Mapping("GetStoreOrderInfo", c.GetStoreOrderInfo)
c.Mapping("GetOrderSkuInfo", c.GetOrderSkuInfo) c.Mapping("GetOrderSkuInfo", c.GetOrderSkuInfo)
c.Mapping("FinishedPickup", c.FinishedPickup)
c.Mapping("SelfDelivering", c.SelfDelivering)
c.Mapping("CreateWaybillOnProviders", c.CreateWaybillOnProviders) 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)) { 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" // @Param vendorID formData int true "订单所属的厂商ID"
// @Success 200 {object} business.model.CallResult // @Success 200 {object} business.model.CallResult
// @Failure 200 {object} business.model.CallResult // @Failure 200 {object} business.model.CallResult
// @router /Swtich2SelfDeliver [post] // @router /SelfDelivering [post]
func (c *OrderController) Swtich2SelfDeliver() { func (c *OrderController) SelfDelivering() {
c.orderOperate(func(vendorOrderID string, vendorID int, userName string) (interface{}, error) { 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)
}) })
} }

4
routers/commentsRouter_controllers.go
View File

@@ -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.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
beego.ControllerComments{ beego.ControllerComments{
Method: "Swtich2SelfDeliver", Method: "SelfDelivering",
Router: `/Swtich2SelfDeliver`, Router: `/SelfDelivering`,
AllowHTTPMethods: []string{"post"}, AllowHTTPMethods: []string{"post"},
MethodParams: param.Make(), MethodParams: param.Make(),
Params: nil}) Params: nil})