From 6e2caa1273f030213141de20db9752bd32d975e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 22 Jul 2024 19:29:42 +0800
Subject: [PATCH] 1

---
 business/jxcallback/orderman/order_afs.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/business/jxcallback/orderman/order_afs.go b/business/jxcallback/orderman/order_afs.go
index c76a047b5..9d2105ebb 100644
--- a/business/jxcallback/orderman/order_afs.go
+++ b/business/jxcallback/orderman/order_afs.go
@@ -84,16 +84,16 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode
 	}
 
 	if existAfsOrder != nil {
-		if afsOrder.Status != existAfsOrder.Status && existAfsOrder.Status >= model.AfsOrderStatusFinished {
-			return nil
+		if existAfsOrder.Status < model.AfsOrderStatusFinished {
+			// todo 可能导致状态回绕
+			existAfsOrder.Status = afsOrder.Status
+			existAfsOrder.VendorStatus = afsOrder.VendorStatus
+			if _, err = dao.UpdateEntity(db, existAfsOrder, "Status", "VendorStatus", "AfsFinishedAt"); err != nil {
+				return err
+			}
+			afsOrder = existAfsOrder
 		}
-		// todo 可能导致状态回绕
-		existAfsOrder.Status = afsOrder.Status
-		existAfsOrder.VendorStatus = afsOrder.VendorStatus
-		if _, err = dao.UpdateEntity(db, existAfsOrder, "Status", "VendorStatus", "AfsFinishedAt"); err != nil {
-			return err
-		}
-		afsOrder = existAfsOrder
+
 	} else {
 		// 全退都要先全删除再建
 		if afsOrder.RefundType == model.AfsTypeFullRefund {