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

- don't treat no rows as error.

Browse Source
This commit is contained in:
gazebo
2018-07-19 22:15:13 +08:00
parent cb6fd8b850
commit 486eee8bcd
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/controller/mtps/waybill.go
View File

@@ -204,7 +204,7 @@ func (c *WaybillController) getDeliveryID(order *model.GoodsOrder, db orm.Ormer)
OrderId: utils.Str2Int64(order.VendorOrderID), OrderId: utils.Str2Int64(order.VendorOrderID),
} }
err = utils.CallFuncLogError(func() error { err = utils.CallFuncLogError(func() error {
err2 := db.Read(order, "OrderId") err2 := db.Read(jxorder, "OrderId")
return err2 return err2
}, "getDeliveryID") }, "getDeliveryID")
return int64(jxorder.Id), err return int64(jxorder.Id), err

3
legacy/jd/controller/order.go
View File

@@ -208,6 +208,9 @@ func normalOrderStatus(msg *jdapi.CallbackOrderMsg) (err error) {
err = db.Read(rec, "JdOrderId") err = db.Read(rec, "JdOrderId")
if err != nil { if err != nil {
globals.SugarLogger.Warnf("error when accessing db err:%v, rec:%v", err, rec) globals.SugarLogger.Warnf("error when accessing db err:%v, rec:%v", err, rec)
if err == orm.ErrNoRows {
err = nil // 如果没有查到，不当成错误
}
} else { } else {
if rec.OrderStatus == int(utils.Str2Int64(msg.StatusID)) { if rec.OrderStatus == int(utils.Str2Int64(msg.StatusID)) {
globals.SugarLogger.Infof("Duplicate message msg:%v", msg) globals.SugarLogger.Infof("Duplicate message msg:%v", msg)