From 2373c8836ff08c9978d77bf559521763e3c6691a Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 4 Apr 2023 00:59:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=90=8C=E6=AD=A5=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Server.Business/Sync/OrderSyncBusiness.cs | 16 ++++++++++++++--
 BBWY.Test/Program.cs                           | 12 +++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
index 88ebb880..0af8121b 100644
--- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
@@ -230,11 +230,23 @@ namespace BBWY.Server.Business
             var interfaceCanceledOrderIdList = validOrders.Where(orderJToken => orderJToken.Value<string>("orderState").Equals("TRADE_CANCELED"))
                                                                .Select(orderJToken => orderJToken.Value<string>("orderId"));  //接口查询结果中取消状态的订单Id
 
-            var dbOrderList = fsql.Select<Order>().Where(o => interfaceOrderIdList.Contains(o.Id)).ToList(o => new Order()
+
+            var dbOrderList = fsql.Select<Order>().Where(o => interfaceOrderIdList.Contains(o.Id)).ToList(o => new Order
             {
                 Id = o.Id,
                 OrderState = o.OrderState,
-                StorageType = o.StorageType
+                StorageType = o.StorageType,
+                BuyerRemark = o.BuyerRemark,
+                VenderRemark = o.VenderRemark,
+                ModifyTime = o.ModifyTime,
+                EndTime = o.EndTime,
+                WaybillNo = o.WaybillNo,
+                FreightPrice = o.FreightPrice,
+                OrderPayment = o.OrderPayment,
+                SellerPreferentialAmount = o.SellerPreferentialAmount,
+                OrderSellerPrice = o.OrderSellerPrice,
+                OrderTotalPrice = o.OrderTotalPrice,
+                StoreOrder = o.StoreOrder
             });  //数据库订单
             var dbOrderConsigneeList = fsql.Select<OrderConsignee>().Where(oc => interfaceOrderIdList.Contains(oc.OrderId)).ToList(); //数据库订单收货信息
             var dbOrderCostList = fsql.Select<OrderCost>().Where(oc => interfaceOrderIdList.Contains(oc.OrderId)).ToList();  //数据库订单成本信息
diff --git a/BBWY.Test/Program.cs b/BBWY.Test/Program.cs
index fcb6c24b..f111c6f1 100644
--- a/BBWY.Test/Program.cs
+++ b/BBWY.Test/Program.cs
@@ -1,4 +1,5 @@
 using Jd.Api;
+using Jd.Api.Request;
 using System;
 using System.Linq;
 using System.Security.Cryptography;
@@ -31,13 +32,14 @@ namespace BBWY.Test
             var appSecret = "8a42bc2301e8439b896e99f5475e0a9b";
 
             ////0e61c4a8ec3e4df4b5836e10884db9220yth 齐盛
-            var token = "2ace3023200c4ea9aa682bbf8bffee18jztm"; //布莱特玩具
+            //var token = "2ace3023200c4ea9aa682bbf8bffee18jztm"; //布莱特玩具
             //var token = "01f5be2cb4d741dda66bce2356941597mdfm"; //布莱特玩具 token2
             //var token = "01dc6f6e7fc34dcd99090d690312556cmdfk"; //齐盛
             //var token = "9fffa982da23446fb035499ae5622f49odjk"; //腾奇
             //var token = "c22ff4d37b6c4bbd82cd9e8d0dab42dbziyz"; //森王车品
             //var token = "44c19a1c1fbd4641957e6e8985ed1358jmtl"; //森王玩具
             //var token = "4a0ddc095e054c7aa90adcaccb14f83cwzgr";   //可比车品
+            var token = "50a4c0f5c55848b5a8a715709e8d6fe0jntb"; //卿卿玩具专营店
 
             //var dt1 = DateTime.Now;
             //List<string> list = new List<string>();
@@ -53,7 +55,15 @@ namespace BBWY.Test
 
 
             var jdClient = GetJdClient(appkey, appSecret);
+            var req = new AscFreightViewRequest();
 
+            req.buId = "11926867";
+            req.operatePin = "开发测试";
+            req.operateNick = "开发测试";
+            req.serviceId = 1701316861;
+            req.orderId = 264691201058;
+
+            var res = jdClient.Execute(req,token, DateTime.Now.ToLocalTime());
 
             Console.ReadKey();
         }