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

- remove redundant log.

Browse Source
This commit is contained in:
gazebo
2018-06-22 22:46:12 +08:00
parent 65593521b9
commit 04ff64d346
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@ func (o *OrderController) OrderMessage(msg *elmapi.CallbackMsg) *elmapi.Callback
var innerMsg map[string]interface{} var innerMsg map[string]interface{}
err := utils.UnmarshalUseNumber([]byte(msg.Message), &innerMsg) err := utils.UnmarshalUseNumber([]byte(msg.Message), &innerMsg)
if err != nil { if err != nil {
globals.SugarLogger.Warnf("OrderMessage unmarshal %v error:%v", msg, err)
return errResponseDataError return errResponseDataError
} }
if msg.Type == elmapi.MsgTypeOrderValid { if msg.Type == elmapi.MsgTypeOrderValid {
@@ -49,12 +48,10 @@ func (o *OrderController) NewOrder(msg *elmapi.CallbackMsg, orderId string) *elm
if created || rec.Type != msg.Type { if created || rec.Type != msg.Type {
result, err := globals2.ElmAPI.GetOrder(orderId) result, err := globals2.ElmAPI.GetOrder(orderId)
if err != nil { if err != nil {
globals.SugarLogger.Warnf("call GetOrder error:%v", err)
return errResponseCallELMAPIError return errResponseCallELMAPIError
} }
err = globals2.FreshFoodAPI.NewELMOrder(result) err = globals2.FreshFoodAPI.NewELMOrder(result)
if err != nil { if err != nil {
globals.SugarLogger.Warnf("internal error:%v", err)
return errResponseInternal return errResponseInternal
} }
} else { } else {
@@ -77,7 +74,6 @@ func (o *OrderController) OrderStatusChanged(msg *elmapi.CallbackMsg, orderId st
if rec.Type != msg.Type { if rec.Type != msg.Type {
err = globals2.FreshFoodAPI.ELMOrderStatus(orderId, msg.Type, utils.GetCurTimestamp()) err = globals2.FreshFoodAPI.ELMOrderStatus(orderId, msg.Type, utils.GetCurTimestamp())
if err != nil { if err != nil {
globals.SugarLogger.Warnf("internal error:%v", err)
return errResponseInternal return errResponseInternal
} else { } else {
rec.Type = msg.Type rec.Type = msg.Type

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

@@ -136,10 +136,7 @@ func (c *OrderController) OrderStatus(order *jdapi.CallbackOrderMsg) *jdapi.Call
} }
func (c *OrderController) OrderDeliveryStatus(jdOrderDeliveryStatusMsg *jdapi.CallbackDeliveryStatusMsg) *jdapi.CallbackResponse { func (c *OrderController) OrderDeliveryStatus(jdOrderDeliveryStatusMsg *jdapi.CallbackDeliveryStatusMsg) *jdapi.CallbackResponse {
err := globals2.FreshFoodAPI.JDOrderDeliveryStatus(jdOrderDeliveryStatusMsg) if err := globals2.FreshFoodAPI.JDOrderDeliveryStatus(jdOrderDeliveryStatusMsg); err != nil {
if err != nil {
globals.SugarLogger.Errorf("Error when calling JDOrderDeliveryStatus, error:%v", err)
return &jdapi.CallbackResponse{jdapi.ResponseCodeAccessFailed, err.Error(), ""} return &jdapi.CallbackResponse{jdapi.ResponseCodeAccessFailed, err.Error(), ""}
} }
@@ -154,9 +151,7 @@ func acceptOrder(order *jdapi.CallbackOrderMsg) {
func newOrder(order *jdapi.CallbackOrderMsg) error { func newOrder(order *jdapi.CallbackOrderMsg) error {
result, err := globals2.Jdapi.LegacyQuerySingleOrder(order.BillID) result, err := globals2.Jdapi.LegacyQuerySingleOrder(order.BillID)
acceptOrder(order) acceptOrder(order)
if err != nil { if err == nil {
globals.SugarLogger.Errorf("error when query jd order:%s, error:%v", order.BillID, err)
} else {
rec := &models.Jdorder{ rec := &models.Jdorder{
Id: order.ID, Id: order.ID,
} }
@@ -224,9 +219,8 @@ func normalOrderStatus(order *jdapi.CallbackOrderMsg) error {
rec.OrderStatus = utils.Str2Int(order.StatusID) rec.OrderStatus = utils.Str2Int(order.StatusID)
rec.OrderStatusTime = order.Timestamp rec.OrderStatusTime = order.Timestamp
err = globals2.FreshFoodAPI.JDOrderStatus(rec)
if err != nil { if err = globals2.FreshFoodAPI.JDOrderStatus(rec); err != nil {
globals.SugarLogger.Warnf("access freshfood failed, error:%v", err)
return err return err
} }