From a2252e64877c1e334311a1173010cb0a04287814 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 28 Oct 2019 13:44:06 +0800
Subject: [PATCH] =?UTF-8?q?updateOrderOtherInfo=E4=B8=AD=E4=B8=8D=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E5=A4=84=E7=90=86VendorIDJX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 40 ++++++++-------------------
 business/model/dao/store.go           | 16 ++++-------
 2 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 8f7bee87c..b9dcf5fd7 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -385,37 +385,19 @@ func (c *OrderManager) updateOrderOtherInfo(order *model.GoodsOrder, db *dao.Dao
 	globals.SugarLogger.Debugf("updateOrderOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID)
 
 	payPercentage := 0
-	if order.VendorID != model.VendorIDJX {
-		storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID)
-		if err != nil {
-			if !dao.IsNoRowsError(err) {
-				globals.SugarLogger.Warnf("updateOrderOtherInfo GetStoreDetailByVendorStoreID orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
-				return err
-			}
-			if time.Now().Sub(order.OrderCreatedAt) < 1*time.Hour {
-				globals.SugarLogger.Infof("updateOrderOtherInfo [运营]订单在京西与平台都找不到京西门店信息,订单:%s,平台门店ID:%s,平台:%s", order.VendorOrderID, order.VendorStoreID, model.VendorChineseNames[order.VendorID])
-			}
-			err = nil
-		} else {
-			order.JxStoreID = storeDetail.Store.ID
-			payPercentage = storeDetail.PayPercentage
+	storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID)
+	if err != nil {
+		if !dao.IsNoRowsError(err) {
+			globals.SugarLogger.Warnf("updateOrderOtherInfo GetStoreDetailByVendorStoreID orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
+			return err
 		}
+		if time.Now().Sub(order.OrderCreatedAt) < 1*time.Hour {
+			globals.SugarLogger.Infof("updateOrderOtherInfo [运营]订单在京西与平台都找不到京西门店信息,订单:%s,平台门店ID:%s,平台:%s", order.VendorOrderID, order.VendorStoreID, model.VendorChineseNames[order.VendorID])
+		}
+		err = nil
 	} else {
-		store := &model.Store{}
-		store.ID = order.StoreID
-		if err = dao.GetEntity(dao.GetDB(), store); err != nil {
-			if !dao.IsNoRowsError(err) {
-				globals.SugarLogger.Warnf("updateOrderOtherInfo GetEntity orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
-				return err
-			}
-			if time.Now().Sub(order.OrderCreatedAt) < 1*time.Hour {
-				globals.SugarLogger.Infof("updateOrderOtherInfo b, [运营]订单在京西与平台都找不到京西门店信息,订单:%s,平台门店ID:%s,平台:%s", order.VendorOrderID, order.VendorStoreID, model.VendorChineseNames[order.VendorID])
-			}
-			err = nil
-		} else {
-			payPercentage = store.PayPercentage
-		}
-		order.JxStoreID = order.StoreID
+		order.JxStoreID = storeDetail.Store.ID
+		payPercentage = storeDetail.PayPercentage
 	}
 	if err = c.updateOrderSkuOtherInfo(order, db, payPercentage); err == nil {
 		jxutils.RefreshOrderSkuRelated(order)
diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index 7aae7ec61..f6d45fc59 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -101,6 +101,10 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto
 	if err = GetRow(db, storeDetail, sql, sqlParams...); err == nil {
 		storeDetail.PricePercentagePackObj = PricePercentagePack2Obj(storeDetail.PricePercentagePackStr)
 		storeDetail.FreightDeductionPackObj = FreightDeductionPack2Obj(storeDetail.FreightDeductionPackStr)
+		if vendorID == model.VendorIDJX {
+			storeDetail.VendorStatus = storeDetail.Status
+			storeDetail.PricePercentage = 100
+		}
 		return storeDetail, nil
 	}
 	return nil, err
@@ -114,16 +118,8 @@ func GetStoreDetailByVendorStoreID(db *DaoDB, vendorStoreID string, vendorID int
 	if vendorID != model.VendorIDJX {
 		return getStoreDetail(db, 0, vendorID, vendorStoreID)
 	}
-	store := &model.Store{}
-	store.ID = int(utils.Str2Int64WithDefault(vendorStoreID, 0))
-	if err = GetEntity(db, store); err == nil {
-		// todo 还要补全其它参数
-		storeDetail = &StoreDetail{
-			Store:           *store,
-			VendorStoreID:   vendorStoreID,
-			VendorStatus:    store.Status,
-			PricePercentage: 100,
-		}
+	if storeDetail, err = getStoreDetail(db, int(utils.Str2Int64WithDefault(vendorStoreID, 0)), vendorID, ""); err == nil {
+		storeDetail.VendorStoreID = vendorStoreID
 	}
 	return storeDetail, err
 }