aa

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, "")