From c9208e7f697e73ed0e47b10d7bf2c92805541de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 29 Jun 2023 10:58:19 +0800
Subject: [PATCH] 1

---
 business/partner/purchase/tao_vegetable/order.go | 6 +++---
 controllers/taobao_vegetable.go                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go
index 812ffca41..8f87e3401 100644
--- a/business/partner/purchase/tao_vegetable/order.go
+++ b/business/partner/purchase/tao_vegetable/order.go
@@ -307,9 +307,9 @@ func (c *PurchaseHandler) onOrderMsg(orderStatus, orderId string, orderCallback
 	if orderStatus == tao_vegetable.OrderStatusOnSaleCancel {
 		onSale := orderCallback.(*tao_vegetable.OnSaleCancel)
 		//msg.PublicModel = onSale.PublicModel
-		msg.MerchantCode = onSale.MerchantCode
-		msg.StoreId = onSale.StoreId
-		msg.BizOrderId = onSale.BizOrderId
+		msg.MerchantCode = onSale.PartCancelRequest.MerchantCode
+		msg.StoreId = onSale.PartCancelRequest.StoreId
+		msg.BizOrderId = onSale.PartCancelRequest.BizOrderId
 		msg.OrderStatus = tao_vegetable.OrderStatusOnSaleCancel
 	}
 	status := c.callbackOrderMsg2Status(msg)
diff --git a/controllers/taobao_vegetable.go b/controllers/taobao_vegetable.go
index ee6255327..fe925ecb4 100644
--- a/controllers/taobao_vegetable.go
+++ b/controllers/taobao_vegetable.go
@@ -239,7 +239,7 @@ func (c *TaoBaoVegetableController) CancelOnSaleRefundOrder() {
 		return
 	}
 
-	callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusOnSaleCancel, utils.Int64ToStr(afsOrder.BizOrderId), afsOrder)
+	callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusOnSaleCancel, utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), afsOrder)
 	c.Data["json"] = callbackResponse
 	c.ServeJSON()
 	return