From 8c5d4abe7e1616118642e892254448b01bddb2ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 6 Apr 2021 11:18:42 +0800
Subject: [PATCH] aa

---
 business/jxcallback/orderman/order.go        | 14 ++++++++------
 business/partner/purchase/jdshop/callback.go |  2 +-
 business/partner/purchase/jdshop/jds.go      |  8 ++++++++
 business/partner/purchase/jdshop/order.go    |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 0e2011a0c..39ca914b2 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1890,7 +1890,8 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
 		if orderE != nil {
 			continue
 		}
-		orderDetail, err := api.JdShopAPI.OrderDetail(utils.Int64ToStr(jdsOrder.OrderID))
+
+		orderDetail, err := jdshop.GetAPI("2").OrderDetail(utils.Int64ToStr(jdsOrder.OrderID))
 		if err != nil {
 			globals.SugarLogger.Debugf("jds OrderDetail error: %v", err.Error())
 			continue
@@ -1916,10 +1917,10 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
 			DeliveryType:     model.OrderDeliveryTypeStoreSelf,
 			StatusTime:       utils.Str2Time(jdsOrder.OrderCreateTime + ":00"),
 			OrderSeq:         0,
-			VendorOrgCode:    "1",
+			VendorOrgCode:    "2",
 		}
 		//获取真实手机号
-		fakeMobile, err := api.JdShopAPI.PhoneSensltiveInfo(order.VendorOrderID2, orderDetail.MobileKey)
+		fakeMobile, err := jdshop.GetAPI("2").PhoneSensltiveInfo(order.VendorOrderID2, orderDetail.MobileKey)
 		if err != nil {
 			globals.SugarLogger.Debugf("jds PhoneSensltiveInfo error: %v", err.Error())
 			continue
@@ -1950,12 +1951,13 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
 			order.BusinessType = model.BusinessTypeDingshida
 			order.ExpectedDeliveredTime = utils.Str2Time(orderDetail.ExpectedDeliveredTime)
 			order.PickDeadline = order.ExpectedDeliveredTime.Add(-time.Hour)
-		} else if jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusWaittingExport {
+		} else {
 			order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour)
 			order.BusinessType = model.BusinessTypeImmediate
-		} else {
-			globals.SugarLogger.Errorf("未知的京东商城订单状态！status : %v", jdsOrder.OrderStatus)
 		}
+		// else {
+		// 	globals.SugarLogger.Errorf("未知的京东商城订单状态！status : %v", jdsOrder.OrderStatus)
+		// }
 
 		//结算类型
 		storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.StoreID, model.VendorIDJDShop, "")
diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go
index ad084a1dc..7ee6160f0 100644
--- a/business/partner/purchase/jdshop/callback.go
+++ b/business/partner/purchase/jdshop/callback.go
@@ -314,7 +314,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 	if order.ExpectedDeliveredTime.Sub(order.OrderCreatedAt) <= time.Hour+time.Minute {
 		order.BusinessType = model.BusinessTypeImmediate
 	}
-	buildOrderTo102919(order)
+	// buildOrderTo102919(order)
 	return order, err
 }
 
diff --git a/business/partner/purchase/jdshop/jds.go b/business/partner/purchase/jdshop/jds.go
index 904a6c89b..82061cb8c 100644
--- a/business/partner/purchase/jdshop/jds.go
+++ b/business/partner/purchase/jdshop/jds.go
@@ -47,6 +47,14 @@ func getAPI(appOrgCode string) (apiObj *jdshopapi.API) {
 	return apiObj
 }
 
+func GetAPI(appOrgCode string) (apiObj *jdshopapi.API) {
+	apiObj = partner.CurAPIManager.GetAPI(model.VendorIDJDShop, appOrgCode).(*jdshopapi.API)
+	if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie2", model.ConfigTypeCookie, ""); err == nil {
+		apiObj.SetCookieWithStr(configs[0].Value)
+	}
+	return apiObj
+}
+
 func (p *PurchaseHandler) GetVendorID() int {
 	return model.VendorIDJDShop
 }
diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go
index 6cd278e70..02f223f7b 100644
--- a/business/partner/purchase/jdshop/order.go
+++ b/business/partner/purchase/jdshop/order.go
@@ -157,7 +157,7 @@ func (p *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.Goods
 }
 
 func (p *PurchaseHandler) GetJdsOrders(ctx *jxcontext.Context, orderCreatedStart, orderCreatedEnd string, current, pageSize int) (orderResult *jdshopapi.AllOrdersResult, err error) {
-	orderResult, err = api.JdShopAPI.AllOrders(&jdshopapi.AllOrdersParam{
+	orderResult, err = getAPI("2").AllOrders(&jdshopapi.AllOrdersParam{
 		Current:              current,
 		PageSize:             pageSize,
 		OrderCreateDateRange: []string{orderCreatedStart, orderCreatedEnd},