From b86ee6373f46f98a070dd2b47c0c1074ffed81f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 10 Apr 2023 16:21:46 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/order_afs.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/business/jxcallback/orderman/order_afs.go b/business/jxcallback/orderman/order_afs.go index d1b68f93e..e9f5d8777 100644 --- a/business/jxcallback/orderman/order_afs.go +++ b/business/jxcallback/orderman/order_afs.go @@ -71,16 +71,17 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode panic(r) } }() - globals.SugarLogger.Debugf("orderStatus 2 := %s", utils.Format4Output(orderStatus, false)) - isDuplicated, err := addOrderOrWaybillStatus(orderStatus, db) - globals.SugarLogger.Debugf("isDuplicated 1 := %s", utils.Format4Output(isDuplicated, false)) - globals.SugarLogger.Debugf("err 1 := %s", utils.Format4Output(err, false)) - if err != nil || isDuplicated { - if err == nil { - dao.Commit(db, txDB) + + if orderStatus.VendorID != model.VendorIDJX { + isDuplicated, err := addOrderOrWaybillStatus(orderStatus, db) + if err != nil || isDuplicated { + if err == nil { + dao.Commit(db, txDB) + } + return err } - return err } + var existAfsOrder *model.AfsOrder if existAfsOrder, err = c.loadAfsOrder(db, afsOrder.AfsOrderID, afsOrder.VendorID); err != nil { globals.SugarLogger.Debugf("loadAfsOrder 1 := %s", utils.Format4Output(existAfsOrder, false))