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

- adjust package structure.

Browse Source
This commit is contained in:
gazebo
2018-06-20 15:53:08 +08:00
parent 9ca830c240
commit 157d36c47f
9 changed files with 139 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/elm/controller/order.go
View File

@@ -5,6 +5,7 @@ import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/elm/models"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/globals2"
"github.com/astaxie/beego/orm"
)
@@ -46,12 +47,12 @@ func (o *OrderController) NewOrder(msg *elmapi.ELMCallbackMsg, orderId string) *
return errResponseDBError
}
if created || rec.Type != msg.Type {
result, err := globals.ElmAPI.GetOrder(orderId)
result, err := globals2.ElmAPI.GetOrder(orderId)
if err != nil {
globals.SugarLogger.Warnf("call GetOrder error:%v", err)
return errResponseCallELMAPIError
}
err = globals.FreshFoodAPI.NewELMOrder(result)
err = globals2.FreshFoodAPI.NewELMOrder(result)
if err != nil {
globals.SugarLogger.Warnf("internal error:%v", err)
return errResponseInternal
@@ -74,7 +75,7 @@ func (o *OrderController) OrderStatusChanged(msg *elmapi.ELMCallbackMsg, orderId
return errResponseDBError
}
if rec.Type != msg.Type {
err = globals.FreshFoodAPI.ELMOrderStatus(orderId, msg.Type, utils.GetCurTimestamp())
err = globals2.FreshFoodAPI.ELMOrderStatus(orderId, msg.Type, utils.GetCurTimestamp())
if err != nil {
globals.SugarLogger.Warnf("internal error:%v", err)
return errResponseInternal
@@ -83,7 +84,7 @@ func (o *OrderController) OrderStatusChanged(msg *elmapi.ELMCallbackMsg, orderId
utils.CallFuncLogError(func() error {
_, err := db.Update(rec, "Type")
return err
}, globals.ErrStrAccessDB)
}, globals2.ErrStrAccessDB)
}
} else {
globals.SugarLogger.Infof("duplicate elm msg received:%v", msg)