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

17
business/jd/controller/order.go
View File

@@ -8,6 +8,7 @@ import (
"git.rosy.net.cn/jx-callback/business/jd/models"
"git.rosy.net.cn/jx-callback/compat/corm"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/globals2"
"github.com/astaxie/beego/orm"
)
@@ -119,7 +120,7 @@ func (c *OrderController) OrderStatus(order *jdapi.JDOrderMsg) *jdapi.JDCallback
utils.CallFuncLogError(func() error {
_, err := db.Update(rec, "OrderStatus", "OrderStatusTime", "Code")
return err
}, globals.ErrStrAccessDB)
}, globals2.ErrStrAccessDB)
addOrderMsg(order)
}
} else {
@@ -135,7 +136,7 @@ func (c *OrderController) OrderStatus(order *jdapi.JDOrderMsg) *jdapi.JDCallback
}
func (c *OrderController) OrderDeliveryStatus(jdOrderDeliveryStatusMsg *jdapi.JDDeliveryStatusMsg) *jdapi.JDCallbackResponse {
err := globals.FreshFoodAPI.JDOrderDeliveryStatus(jdOrderDeliveryStatusMsg)
err := globals2.FreshFoodAPI.JDOrderDeliveryStatus(jdOrderDeliveryStatusMsg)
if err != nil {
globals.SugarLogger.Errorf("Error when calling JDOrderDeliveryStatus, error:%v", err)
@@ -147,11 +148,11 @@ func (c *OrderController) OrderDeliveryStatus(jdOrderDeliveryStatusMsg *jdapi.JD
//-----------
func acceptOrder(order *jdapi.JDOrderMsg) {
globals.Jdapi.OrderAcceptOperate(order.BillId, true)
globals2.Jdapi.OrderAcceptOperate(order.BillId, true)
}
func newOrder(order *jdapi.JDOrderMsg) error {
result, err := globals.Jdapi.LegacyQuerySingleOrder(order.BillId)
result, err := globals2.Jdapi.LegacyQuerySingleOrder(order.BillId)
acceptOrder(order)
if err != nil {
globals.SugarLogger.Errorf("error when query jd order:%s, error:%v", order.BillId, err)
@@ -183,13 +184,13 @@ func newOrder(order *jdapi.JDOrderMsg) error {
resultByteArr := utils.MustMarshal(data)
rec.Data = string(resultByteArr)
err = globals.FreshFoodAPI.NewJDOrder(rec)
err = globals2.FreshFoodAPI.NewJDOrder(rec)
if err == nil {
db := orm.NewOrm()
utils.CallFuncLogError(func() error {
_, err := db.Update(rec, "Data", "Code", "Msg", "Success", "CityName", "OrderStatus", "OrderStatusTime")
return err
}, globals.ErrStrAccessDB)
}, globals2.ErrStrAccessDB)
} else {
globals.SugarLogger.Errorf("Error when calling NewJDOrder error:%v", err)
}
@@ -223,7 +224,7 @@ func normalOrderStatus(order *jdapi.JDOrderMsg) error {
rec.OrderStatus = utils.Str2Int(order.StatusId)
rec.OrderStatusTime = order.Timestamp
err = globals.FreshFoodAPI.JDOrderStatus(rec)
err = globals2.FreshFoodAPI.JDOrderStatus(rec)
if err != nil {
globals.SugarLogger.Warnf("access freshfood failed, error:%v", err)
return err
@@ -233,6 +234,6 @@ func normalOrderStatus(order *jdapi.JDOrderMsg) error {
utils.CallFuncLogError(func() error {
_, err := db.Update(rec, "OrderStatus", "OrderStatusTime", "Code")
return err
}, globals.ErrStrAccessDB)
}, globals2.ErrStrAccessDB)
return err
}