From baa7d3acfae47a66de6d3860995f642119f70e33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 4 Sep 2020 10:06:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E8=A5=BF=E4=BA=AC=E4=B8=9C=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order_afs.go     |  8 +++++++-
 business/partner/purchase/jdshop/order_afs.go | 12 +++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/business/jxcallback/orderman/order_afs.go b/business/jxcallback/orderman/order_afs.go
index 2bc5f0b1b..1c5ca6fbf 100644
--- a/business/jxcallback/orderman/order_afs.go
+++ b/business/jxcallback/orderman/order_afs.go
@@ -262,7 +262,13 @@ func (c *OrderManager) updateAfsOrderSkuOtherInfo(db *dao.DaoDB, order *model.Af
 		}
 	}
 	if len(vendorSkuIDs) > 0 {
-		l, err := dao.GetStoreSkuPriceAndWeight(db, order.VendorStoreID, order.VendorID, vendorSkuIDs)
+		var vendorStoreID string
+		if order.VendorID == model.VendorIDJDShop {
+			vendorStoreID = model.JdShopMainVendorStoreID
+		} else {
+			vendorStoreID = order.VendorStoreID
+		}
+		l, err := dao.GetStoreSkuPriceAndWeight(db, vendorStoreID, order.VendorID, vendorSkuIDs)
 		if err != nil {
 			globals.SugarLogger.Warnf("updateAfsOrderSkuOtherInfo orderID:%s failed with err:%v", order.VendorOrderID, err)
 			return err
diff --git a/business/partner/purchase/jdshop/order_afs.go b/business/partner/purchase/jdshop/order_afs.go
index d0cb7b0ce..529484e88 100644
--- a/business/partner/purchase/jdshop/order_afs.go
+++ b/business/partner/purchase/jdshop/order_afs.go
@@ -6,8 +6,6 @@ import (
 	"math"
 	"time"
 
-	"git.rosy.net.cn/jx-callback/business/jxutils"
-
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
@@ -62,11 +60,11 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G
 	}
 	orderStatus := buildOrderStatus(ctx, order, reason)
 	afsOrder := &model.AfsOrder{
-		VendorID:         order.VendorID,
-		AfsOrderID:       orderStatus.VendorOrderID,
-		VendorOrderID:    orderStatus.RefVendorOrderID,
-		VendorStoreID:    order.VendorStoreID,
-		StoreID:          jxutils.GetSaleStoreIDFromOrder(order),
+		VendorID:      order.VendorID,
+		AfsOrderID:    orderStatus.VendorOrderID,
+		VendorOrderID: orderStatus.RefVendorOrderID,
+		// VendorStoreID:    order.VendorStoreID,
+		// StoreID:          jxutils.GetSaleStoreIDFromOrder(order),
 		AfsCreatedAt:     time.Now(),
 		VendorAppealType: "",
 		AppealType:       model.AfsAppealTypeRefund,