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

- cancel waybill reason added.

Browse Source 
- api operator added.
- token added.
This commit is contained in:
gazebo
2018-08-22 16:06:47 +08:00
parent 5afe95d422
commit 79ed0a7929
9 changed files with 122 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
controllers/jx_order.go
View File

@@ -13,6 +13,14 @@ type OrderController struct {
beego.Controller
}
func GetUserNameFromToken(token string) string {
userName := token
if len(userName) > 10 {
userName = userName[:10]
}
return userName
}
func (c *OrderController) URLMapping() {
c.Mapping("FinishedPickup", c.FinishedPickup)
c.Mapping("GetStoreOrderInfo", c.GetStoreOrderInfo)
@@ -21,16 +29,17 @@ func (c *OrderController) URLMapping() {
c.Mapping("Swtich2SelfDeliver", c.Swtich2SelfDeliver)
}
func (c *OrderController) orderOperate(handler func(vendorOrderID string, vendorID int) (interface{}, error)) {
func (c *OrderController) orderOperate(handler func(vendorOrderID string, vendorID int, userName string) (interface{}, error)) {
var (
vendorOrderID string
vendorID int
err error
vendorOrderID, token string
vendorID int
err error
)
token = c.Ctx.Input.Header("token")
vendorOrderID = c.GetString("vendorOrderID")
vendorID, err1 := c.GetInt("vendorID", 0)
if vendorOrderID != "" && err1 == nil {
result, err2 := handler(vendorOrderID, vendorID)
if vendorOrderID != "" && token != "" && err1 == nil {
result, err2 := handler(vendorOrderID, vendorID, GetUserNameFromToken(token))
if err = err2; err == nil {
retObj := &model.CallResult{
Code: "0",
@@ -45,6 +54,9 @@ func (c *OrderController) orderOperate(handler func(vendorOrderID string, vendor
if vendorOrderID == "" {
errMsg += "vendorOrderID is empty\n"
}
if token == "" {
errMsg += "token is empty\n"
}
if errMsg != "" {
c.Data["json"] = &model.CallResult{
Code: "-1",
@@ -56,45 +68,49 @@ func (c *OrderController) orderOperate(handler func(vendorOrderID string, vendor
// @Title 完成拣货
// @Description 完成拣货
// @Param token header string true "认证toke"
// @Param vendorOrderID formData string true "订单ID"
// @Param vendorID formData int true "订单所属的厂商ID"
// @Success 200 {object} business.model.CallResult
// @Failure 200 {object} business.model.CallResult
// @router /FinishedPickup [post]
func (c *OrderController) FinishedPickup() {
c.orderOperate(func(vendorOrderID string, vendorID int) (interface{}, error) {
return nil, basesch.FixedBaseScheduler.PickupGoodsAndUpdateStatus(vendorOrderID, vendorID)
c.orderOperate(func(vendorOrderID string, vendorID int, userName string) (interface{}, error) {
return nil, basesch.FixedBaseScheduler.PickupGoodsAndUpdateStatus(vendorOrderID, vendorID, userName)
})
}
// @Title 转自送
// @Description 转自送
// @Param token header string true "认证toke"
// @Param vendorOrderID formData string true "订单ID"
// @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() {
c.orderOperate(func(vendorOrderID string, vendorID int) (interface{}, error) {
return nil, basesch.FixedBaseScheduler.Swtich2SelfDeliverAndUpdateStatus(vendorOrderID, vendorID)
c.orderOperate(func(vendorOrderID string, vendorID int, userName string) (interface{}, error) {
return nil, basesch.FixedBaseScheduler.Swtich2SelfDeliverAndUpdateStatus(vendorOrderID, vendorID, userName)
})
}
// @Title 创建三方运单
// @Description 创建三方运单
// @Param token header string true "认证toke"
// @Param vendorOrderID formData string true "订单ID"
// @Param vendorID formData int true "订单所属的厂商ID"
// @Success 200 {object} business.model.CallResult
// @Failure 200 {object} business.model.CallResult
// @router /CreateWaybillOnProviders [post]
func (c *OrderController) CreateWaybillOnProviders() {
c.orderOperate(func(vendorOrderID string, vendorID int) (interface{}, error) {
c.orderOperate(func(vendorOrderID string, vendorID int, userName string) (interface{}, error) {
return basesch.FixedBaseScheduler.CreateWaybillOnProviders(vendorOrderID, vendorID)
})
}
// @Title 得到门店订单信息
// @Description 得到门店订单信息
// @Param token header string true "认证toke"
// @Param storeID query string true "京西门店ID"
// @Param lastHours query int false "最近多少小时的信息（缺省为两天）"
// @Success 200 {object} business.model.CallResult
@@ -132,6 +148,7 @@ func (c *OrderController) GetStoreOrderCountInfo() {
// @Title 得到门店订单状态信息
// @Description 得到门店订单状态信息
// @Param token header string true "认证toke"
// @Param storeID query string true "京西门店ID"
// @Param lastHours query int false "最近多少小时的信息（缺省为两天）"
// @Param fromStatus query int true "起始状态（包括）"
@@ -178,13 +195,15 @@ func (c *OrderController) GetStoreOrderInfo() {
// @Title 得到订单SKU信息
// @Description 得到订单SKU信息
// @Param token header string true "认证toke"
// @Param vendorOrderID query string true "订单ID"
// @Param vendorID query int true "订单所属的厂商ID"
// @Success 200 {object} business.model.CallResult
// @Failure 200 {object} business.model.CallResult
// @router /GetOrderSkuInfo [get]
func (c *OrderController) GetOrderSkuInfo() {
c.orderOperate(func(vendorOrderID string, vendorID int) (interface{}, error) {
c.orderOperate(func(vendorOrderID string, vendorID int, userName string) (interface{}, error) {
// globals.SugarLogger.Debugf("userName:%s", userName)
return orderman.FixedOrderManager.GetOrderSkuInfo(vendorOrderID, vendorID)
})
}