1

business/partner/purchase/mtwm/order_afs.go

@@ -3,6 +3,7 @@ package mtwm
 import (
 	"errors"
 	"fmt"
+	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler/defsch"
 	"git.rosy.net.cn/jx-callback/globals/api"
 	"net/url"
 	"strings"
@@ -152,11 +153,15 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
 		if err := partner.CurOrderManager.OnAfsOrderStatusChanged(orderStatus); err == nil {
 			// 订单回调全额退款接口时,将订单状态修改为取消
 			refundData := msg.Data.(*mtwmapi.CallbackRefundInfo)
-			if refundData.NotifyType == "agree" && msg.Cmd == mtwmapi.MsgTypeOrderRefund {
+			if refundData.NotifyType == mtwmapi.MsgTypeOrderAgree && msg.Cmd == mtwmapi.MsgTypeOrderRefund {
 				order, _ := partner.CurOrderManager.LoadOrder(orderStatus.RefVendorOrderID, model.VendorIDMTWM)
 				order.Status = model.OrderStatusCanceled
 				dao.UpdateEntity(dao.GetDB(), order, "Status")
 			}
+			// 新订单平台自动同意退单,某一些情况下产生的运单没退!这个处理一下!
+			if refundData.NotifyType == mtwmapi.MsgTypeOrderAgree && (msg.Cmd == mtwmapi.MsgTypeOrderRefund || msg.Cmd == mtwmapi.MsgTypeOrderAgree) {
+				defsch.FixedScheduler.CancelAll3rdWaybills(jxcontext.AdminCtx, orderStatus.RefVendorOrderID, orderStatus.VendorID, true)
+			}
 		}
 	}
 	return mtwmapi.Err2CallbackResponse(err, "")