- OnWaybillStatusChanged与OnAfsOrderStatusChanged中的事务处理调整

business/jxcallback/orderman/order_afs.go

@@ -166,17 +166,17 @@ func (c *OrderManager) OnAfsOrderStatusChanged(orderStatus *model.OrderStatus) (
 	c.setAfsOrderID(db, orderStatus)
 	dao.Begin(db)
 	defer func() {
-		if r := recover(); r != nil || err != nil {
+		if r := recover(); r != nil {
 			dao.Rollback(db)
-			if r != nil {
-				panic(r)
-			}
+			panic(r)
 		}
 	}()
 	isDuplicated, afsOrder, err := c.addAfsOrderStatus(db, orderStatus)
 	if err != nil || isDuplicated {
 		if err == nil {
 			dao.Commit(db)
+		} else {
+			dao.Rollback(db)
 		}
 		return err
 	}