- 美团外卖售后单中尽量使用refund_id参数（如果有值的话）

business/jxcallback/orderman/order_afs.go

@@ -311,7 +311,7 @@ func (c *OrderManager) UpdateAfsOrderFields(afsOrder *model.AfsOrder, fieldList
 
 func (c *OrderManager) setAfsOrderID(db *dao.DaoDB, orderStatus *model.OrderStatus) {
 	// globals.SugarLogger.Debugf("setAfsOrderID1 orderStatus:%v", utils.Format4Output(orderStatus, true))
-	if orderStatus.VendorOrderID == "" {
+	if dao.IsVendorThingIDEmpty(orderStatus.VendorOrderID) {
 		index := 1
 		if afsOrderList, err2 := dao.GetAfsOrders(db, orderStatus.RefVendorID, orderStatus.RefVendorOrderID, ""); err2 == nil {
 			if len(afsOrderList) > 0 {

business/partner/purchase/mtwm/order_afs.go

@@ -121,7 +121,6 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
 func (c *PurchaseHandler) callbackAfsMsg2Status(msg *mtwmapi.CallbackMsg) (orderStatus *model.OrderStatus) {
 	refundData := msg.Data.(*mtwmapi.CallbackRefundInfo)
 	orderStatus = &model.OrderStatus{
-		// VendorOrderID:    utils.Int64ToStr(refundData.OrderID),
 		VendorID:         model.VendorIDMTWM,
 		OrderType:        model.OrderTypeAfsOrder,
 		RefVendorOrderID: utils.Int64ToStr(refundData.OrderID),
@@ -131,6 +130,9 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msg *mtwmapi.CallbackMsg) (order
 		StatusTime:       utils.Timestamp2Time(refundData.Timestamp),
 		Remark:           refundData.Reason,
 	}
+	if refundData.RefundID > 0 {
+		orderStatus.VendorOrderID = utils.Int64ToStr(refundData.RefundID)
+	}
 	return orderStatus
 }