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

- log msg refactor, add orderID to all logs.

Browse Source
This commit is contained in:
gazebo
2018-07-22 16:44:44 +08:00
parent 0cb34fe089
commit 7ae0944fc9
14 changed files with 57 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/controller/waybill.go
View File

@@ -35,7 +35,7 @@ func (w *WaybillController) LoadPendingWaybills() []*model.Waybill {
`, time.Now().Add(-pendingOrderGapMax), model.WaybillStatusEndBegin,
time.Now().Add(-pendingOrderGapMax), model.WaybillStatusEndBegin).QueryRows(&bills)
if err != nil {
globals.SugarLogger.Warnf("init load pending waybills error:%v", err)
globals.SugarLogger.Warnf("LoadPendingWaybills load pending waybills error:%v", err)
return nil
}
return bills
@@ -47,15 +47,16 @@ func (w *WaybillController) onWaybillNew(bill *model.Waybill, db orm.Ormer) (isD
bill.ID = 0
bill.WaybillCreatedAt = bill.StatusTime
bill.WaybillFinishedAt = utils.DefaultTimeValue
globals.SugarLogger.Debugf("onWaybillNew bill:%v", bill)
created, _, err2 := db.ReadOrCreate(bill, "VendorWaybillID", "WaybillVendorID")
if err = err2; err == nil {
if !created {
bill.DuplicatedCount++
db.Update(bill, "DuplicatedCount")
globals.SugarLogger.Infof("duplicated bill:%v vendorID:%d, msg received", bill.VendorWaybillID, bill.WaybillVendorID)
globals.SugarLogger.Infof("onWaybillNew duplicated bill:%v msg received", bill)
}
} else {
globals.SugarLogger.Warnf("create bill:%v, error:%v", bill, err)
globals.SugarLogger.Warnf("onWaybillNew create bill:%v, error:%v", bill, err)
}
}
return isDuplicated, err
@@ -106,7 +107,7 @@ func (w *WaybillController) addWaybillStatus(bill *model.Waybill, db orm.Ormer,
utils.CallFuncLogError(func() error {
_, err = db.QueryTable("waybill").Filter("vendor_waybill_id", bill.VendorWaybillID).Filter("waybill_vendor_id", bill.WaybillVendorID).Update(params)
return err
}, "update waybill status, bill:%v", bill)
}, "addWaybillStatus update waybill status, bill:%v", bill)
}
return isDuplicated, err
}