From 556ce853daa73f2eb7f424c303979ff89ed218aa Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 9 Sep 2019 10:47:28 +0800
Subject: [PATCH] =?UTF-8?q?-=20updateOrderOtherInfo=E4=B8=AD=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E5=A4=84=E7=90=86=E4=BA=AC=E8=A5=BF=E8=87=AA=E8=90=A5?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 79529c38c..3973c1abf 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -361,16 +361,21 @@ func (c *OrderManager) updateOrderOtherInfo(order *model.GoodsOrder, db *dao.Dao
 	globals.SugarLogger.Debugf("updateOrderOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID)
 
 	payPercentage := 0
-	storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID)
-	if err != nil {
-		globals.SugarLogger.Warnf("updateOrderOtherInfo GetStoreDetailByVendorStoreID orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
-		if !dao.IsNoRowsError(err) {
-			return err
+	if order.VendorID != model.VendorIDJX {
+		storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID)
+		if err != nil {
+			globals.SugarLogger.Warnf("updateOrderOtherInfo GetStoreDetailByVendorStoreID orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
+			if !dao.IsNoRowsError(err) {
+				return err
+			}
+			err = nil
+		} else {
+			order.JxStoreID = storeDetail.Store.ID
+			payPercentage = storeDetail.PayPercentage
 		}
-		err = nil
 	} else {
-		order.JxStoreID = storeDetail.Store.ID
-		payPercentage = storeDetail.PayPercentage
+		order.JxStoreID = order.StoreID
+		payPercentage = 100
 	}
 	if err = c.updateOrderSkuOtherInfo(order, db, payPercentage); err == nil {
 		jxutils.RefreshOrderSkuRelated(order)