From e721482608fce71a33fe52e2a5fd4ee28d7dc282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 29 Jul 2020 11:43:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E8=AE=A2=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jd/order.go | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index d6b301726..f13e25557 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -155,17 +155,21 @@ func (c *PurchaseHandler) onOrderInfoChangeMsg(vendorOrgCode string, msg *jdapi.
 
 func updateOrderBySettleMent(order *model.GoodsOrder, orderSettlement *jdapi.OrderSettlementInfo) {
 	if orderSettlement != nil {
-		// order.WaybillTipMoney = orderSettlement.VenderPaidTips
 		order.TotalShopMoney = orderSettlement.SettlementAmount
 		order.PmSubsidyMoney = orderSettlement.PlatOrderGoodsDiscountMoney + orderSettlement.PlatSkuGoodsDiscountMoney
 		if order.TotalShopMoney > 0 {
-			order2, err := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID)
-			if order2 != nil && err == nil {
-				storeDetail, err := partner.CurOrderManager.LoadStoreDetail(jxutils.GetSaleStoreIDFromOrder(order2), order.VendorID)
+			if jxutils.GetSaleStoreIDFromOrder(order) != 0 {
+				storeDetail, err := partner.CurOrderManager.LoadStoreDetail(jxutils.GetSaleStoreIDFromOrder(order), order.VendorID)
 				if storeDetail != nil && err == nil {
 					jxutils.RefreshOrderEarningPrice2(order, storeDetail.PayPercentage)
-				} else {
-					globals.SugarLogger.Warnf("updateOrderBySettleMent,%v,%v,%v", order.VendorOrderID, orderSettlement.SettlementAmount)
+				}
+			} else {
+				order2, err := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID)
+				if order2 != nil && err == nil {
+					storeDetail, err := partner.CurOrderManager.LoadStoreDetail(jxutils.GetSaleStoreIDFromOrder(order2), order.VendorID)
+					if storeDetail != nil && err == nil {
+						jxutils.RefreshOrderEarningPrice2(order, storeDetail.PayPercentage)
+					}
 				}
 			}
 		} else {