1
This commit is contained in:
@@ -69,20 +69,31 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode
|
|||||||
}()
|
}()
|
||||||
|
|
||||||
isDuplicated, err := addOrderOrWaybillStatus(orderStatus, db)
|
isDuplicated, err := addOrderOrWaybillStatus(orderStatus, db)
|
||||||
|
if orderStatus.RefVendorOrderID == "4032000156853892856" {
|
||||||
|
globals.SugarLogger.Debugf("==SaveAfsOrder isDuplicated ***:= %v", err)
|
||||||
|
}
|
||||||
if err != nil || (isDuplicated && orderStatus.VendorID != model.VendorIDJX) {
|
if err != nil || (isDuplicated && orderStatus.VendorID != model.VendorIDJX) {
|
||||||
if err == nil {
|
if err == nil {
|
||||||
dao.Commit(db, txDB)
|
dao.Commit(db, txDB)
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if orderStatus.RefVendorOrderID == "4032000156853892856" {
|
||||||
|
globals.SugarLogger.Debugf("==SaveAfsOrder Commit ***:= %v", err)
|
||||||
|
}
|
||||||
existAfsOrder, err := c.loadAfsOrder(db, afsOrder.AfsOrderID, afsOrder.VendorID)
|
existAfsOrder, err := c.loadAfsOrder(db, afsOrder.AfsOrderID, afsOrder.VendorID)
|
||||||
|
if orderStatus.RefVendorOrderID == "4032000156853892856" {
|
||||||
|
globals.SugarLogger.Debugf("==SaveAfsOrder existAfsOrder ***:= %v", err)
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if !dao.IsNoRowsError(err) {
|
if !dao.IsNoRowsError(err) {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if orderStatus.RefVendorOrderID == "4032000156853892856" {
|
||||||
|
globals.SugarLogger.Debugf("==SaveAfsOrder existAfsOrder existAfsOrder ***:= %v", err)
|
||||||
|
globals.SugarLogger.Debugf("==SaveAfsOrder existAfsOrder existAfsOrder ***:= %s", utils.Format4Output(existAfsOrder, false))
|
||||||
|
}
|
||||||
if existAfsOrder != nil {
|
if existAfsOrder != nil {
|
||||||
if existAfsOrder.Status < model.AfsOrderStatusFinished {
|
if existAfsOrder.Status < model.AfsOrderStatusFinished {
|
||||||
// todo 可能导致状态回绕
|
// todo 可能导致状态回绕
|
||||||
|
|||||||
Reference in New Issue
Block a user