From 367315ad39e96711a9a442e2473ed2ae98bc03b6 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 29 Jul 2019 15:29:23 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E7=BE=8E=E5=9B=A2?=
 =?UTF-8?q?=E5=95=86=E5=AE=B6=E4=B8=BB=E5=8A=A8=E5=8F=91=E8=B5=B7=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E5=8D=95=E6=97=B6=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=B0=B1?=
 =?UTF-8?q?=E6=98=AF=E5=90=8C=E6=84=8F=E7=8A=B6=E6=80=81=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/mtwm/order_afs.go | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go
index d3b67cdee..f0874836f 100644
--- a/business/partner/purchase/mtwm/order_afs.go
+++ b/business/partner/purchase/mtwm/order_afs.go
@@ -9,6 +9,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
@@ -48,10 +49,22 @@ func (c *PurchaseHandler) OnAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
 	return retVal
 }
 
+// todo 对于退款与部分退款，order.go与这个文件中对于状态的处理不一致
 func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwmapi.CallbackResponse) {
 	var err error
 	orderStatus := c.callbackAfsMsg2Status(msg)
-	if orderStatus.Status == model.AfsOrderStatusWait4Approve || orderStatus.Status == model.AfsOrderStatusNew {
+	needCallNew := orderStatus.Status == model.AfsOrderStatusWait4Approve || orderStatus.Status == model.AfsOrderStatusNew
+	if !needCallNew {
+		_, err := partner.CurOrderManager.LoadAfsOrder(orderStatus.VendorOrderID, orderStatus.VendorID)
+		if err != nil {
+			if dao.IsNoRowsError(err) {
+				needCallNew = true
+			}
+			return mtwmapi.Err2CallbackResponse(err, "")
+		}
+	}
+
+	if needCallNew {
 		var afsOrder *model.AfsOrder
 		refundData := msg.Data.(*mtwmapi.CallbackRefundInfo)
 		if msg.Cmd == mtwmapi.MsgTypeOrderPartialRefund {