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

- order.DeliveryFlag added.

Browse Source
This commit is contained in:
gazebo
2018-08-24 10:03:34 +08:00
parent 46bbb7418c
commit bb049bb28b
12 changed files with 238 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
controllers/jx_order.go
View File

@@ -3,7 +3,7 @@ package controllers
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler/basesch"
"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler/defsch"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"github.com/astaxie/beego"
@@ -78,7 +78,7 @@ func (c *OrderController) orderOperate(handler func(vendorOrderID string, vendor
// @router /FinishedPickup [post]
func (c *OrderController) FinishedPickup() {
c.orderOperate(func(vendorOrderID string, vendorID int, userName string) (interface{}, error) {
return nil, basesch.FixedBaseScheduler.PickupGoodsAndUpdateStatus(vendorOrderID, vendorID, userName)
return nil, defsch.FixedScheduler.PickupGoodsAndUpdateStatus(vendorOrderID, vendorID, userName)
})
}
@@ -92,7 +92,7 @@ func (c *OrderController) FinishedPickup() {
// @router /SelfDelivering [post]
func (c *OrderController) SelfDelivering() {
c.orderOperate(func(vendorOrderID string, vendorID int, userName string) (interface{}, error) {
return nil, basesch.FixedBaseScheduler.SelfDeliveringAndUpdateStatus(vendorOrderID, vendorID, userName)
return nil, defsch.FixedScheduler.SelfDeliveringAndUpdateStatusExt(vendorOrderID, vendorID, userName)
})
}
@@ -106,7 +106,7 @@ func (c *OrderController) SelfDelivering() {
// @router /SelfDelivered [post]
func (c *OrderController) SelfDelivered() {
c.orderOperate(func(vendorOrderID string, vendorID int, userName string) (interface{}, error) {
return nil, basesch.FixedBaseScheduler.SelfDeliveredAndUpdateStatus(vendorOrderID, vendorID, userName)
return nil, defsch.FixedScheduler.SelfDeliveredAndUpdateStatus(vendorOrderID, vendorID, userName)
})
}
@@ -120,7 +120,7 @@ func (c *OrderController) SelfDelivered() {
// @router /CreateWaybillOnProviders [post]
func (c *OrderController) CreateWaybillOnProviders() {
c.orderOperate(func(vendorOrderID string, vendorID int, userName string) (interface{}, error) {
return basesch.FixedBaseScheduler.CreateWaybillOnProviders(vendorOrderID, vendorID, userName)
return defsch.FixedScheduler.CreateWaybillOnProviders(vendorOrderID, vendorID, userName)
})
}