From cd2855a047b1042db598cf723aa42c3ac2571721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 5 Jul 2023 14:04:22 +0800
Subject: [PATCH] 1

---
 .../partner/purchase/tao_vegetable/order.go   |  6 ++--
 .../purchase/tao_vegetable/order_afs.go       | 31 ++++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go
index 9c7239d4b..63fe4b705 100644
--- a/business/partner/purchase/tao_vegetable/order.go
+++ b/business/partner/purchase/tao_vegetable/order.go
@@ -54,8 +54,8 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
 		StoreId:    utils.String2Pointer(vendorStoreID),
 		BizOrderId: utils.Int64ToPointer(vendorOrderID),
 	}}
-
-	orderDetail, err := getAPI(vendorOrgCode, 0, vendorStoreID).QueryOrderDetail(requestParam)
+	api := getAPI(vendorOrgCode, 0, vendorStoreID)
+	orderDetail, err := api.QueryOrderDetail(requestParam)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -79,7 +79,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
 		InvoiceTitle:     "",
 		InvoiceTaxerID:   "",
 		InvoiceEmail:     "",
-		VendorOrgCode:    vendorOrgCode,
+		VendorOrgCode:    api.GetVendorOrgCode(),
 		UserID:           *orderDetail.OpenUid,
 	}
 
diff --git a/business/partner/purchase/tao_vegetable/order_afs.go b/business/partner/purchase/tao_vegetable/order_afs.go
index b44540f81..4d6a99fcd 100644
--- a/business/partner/purchase/tao_vegetable/order_afs.go
+++ b/business/partner/purchase/tao_vegetable/order_afs.go
@@ -262,6 +262,21 @@ func (c *PurchaseHandler) GetAfsStatusFromVendorStatus(notifyType string) int {
 func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.AfsOrder, approveType int, reason string) (err error) {
 	db := dao.GetDB()
 	if approveType == partner.AfsApproveTypeRefused {
+		param := &request3156.AlibabaTclsAelophyRefundDisagreeRequest{
+			RefundId:     utils.String2Pointer(order.AfsOrderID),
+			RejectReason: utils.String2Pointer(reason),
+			OrderFrom:    utils.Int64ToPointer(utils.Str2Int64(tao_vegetable.TaoVegetableChannelCode)),
+		}
+		err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromAfsOrder(order), order.VendorStoreID).DisAgreeUserCancel(param)
+		if err != nil {
+			order.Status = model.AfsOrderStatusFailed
+			order.VendorStatus = "老板拒绝"
+			order.ReasonDesc += "," + reason
+			dao.UpdateEntity(dao.GetDB(), order, "Status", "ReasonDesc", "VendorStatus")
+		}
+	} else if approveType == partner.AfsApproveTypeRefusedToRefundMoney {
+		return errors.New("此平台暂时不支持")
+	} else {
 		// 加载子订单号
 		orderDetail, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, model.VendorIDTaoVegetable)
 		// 加载退款商品
@@ -300,21 +315,7 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod
 			param.AuditMemo = utils.String2Pointer(*param.AuditMemo + fmt.Sprintf(",%s", reason))
 		}
 		err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromAfsOrder(order), order.VendorStoreID).AgreeUserCancel(param)
-	} else if approveType == partner.AfsApproveTypeRefusedToRefundMoney {
-		return errors.New("此平台暂时不支持")
-	} else {
-		param := &request3156.AlibabaTclsAelophyRefundDisagreeRequest{
-			RefundId:     utils.String2Pointer(order.AfsOrderID),
-			RejectReason: utils.String2Pointer(reason),
-			OrderFrom:    utils.Int64ToPointer(utils.Str2Int64(tao_vegetable.TaoVegetableChannelCode)),
-		}
-		err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromAfsOrder(order), order.VendorStoreID).DisAgreeUserCancel(param)
-		if err != nil {
-			order.Status = model.AfsOrderStatusFailed
-			order.VendorStatus = "老板拒绝"
-			order.ReasonDesc += "," + reason
-			dao.UpdateEntity(dao.GetDB(), order, "Status", "ReasonDesc", "VendorStatus")
-		}
+
 	}
 	return err
 }