报价记录日志

手动关联订单默认采购账号名称

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -308,7 +308,7 @@ namespace BBWY.Client.ViewModels
 
                 if (chooseDFType.DFType == DFType.关联订单)
                 {
-                    var relationPurchaseOrder = new RelationPurchaseOrder(orderId, null, order.ItemList.Select(osku => new RelationPurchaseOrderSku()
+                    var relationPurchaseOrder = new RelationPurchaseOrder(orderId, globalContext.User.Shop.PurchaseAccountList, null, order.ItemList.Select(osku => new RelationPurchaseOrderSku()
                     {
                         Logo = osku.Logo,
                         ProductId = osku.ProductId,
@@ -393,7 +393,7 @@ namespace BBWY.Client.ViewModels
                 return;
             if (order.StorageType == StorageType.代发)
             {
-                var relationPurchaseOrder = new RelationPurchaseOrder(order.Id, order.OrderDropShipping, order.ItemList.Select(osku => new RelationPurchaseOrderSku()
+                var relationPurchaseOrder = new RelationPurchaseOrder(order.Id, globalContext.User.Shop.PurchaseAccountList, order.OrderDropShipping, order.ItemList.Select(osku => new RelationPurchaseOrderSku()
                 {
                     Logo = osku.Logo,
                     ProductId = osku.ProductId,

BBWY.Client/Views/Order/RelationPurchaseOrder.xaml.cs

@@ -15,11 +15,11 @@ namespace BBWY.Client.Views.Order
 
         public IList<RelationPurchaseOrderSku> RelationPurchaseOrderSkuList { get; set; }
 
-        public RelationPurchaseOrder(string orderId, OrderDropShipping orderDropShipping, IList<RelationPurchaseOrderSku> relationPurchaseOrderSkuList)
+        public RelationPurchaseOrder(string orderId, IList<PurchaseAccount> purchaseAccountList, OrderDropShipping orderDropShipping, IList<RelationPurchaseOrderSku> relationPurchaseOrderSkuList)
         {
             InitializeComponent();
             this.DataContext = this;
-            OrderDropShipping = new OrderDropShipping() { OrderId = orderId };
+            OrderDropShipping = new OrderDropShipping() { OrderId = orderId, BuyerAccount = purchaseAccountList?.FirstOrDefault()?.AccountName };
             if (orderDropShipping != null)
             {
                 OrderDropShipping.BuyerAccount = orderDropShipping.BuyerAccount;

BBWY.Server.Business/PlatformSDK/_1688Business.cs

@@ -76,6 +76,8 @@ namespace BBWY.Server.Business
 
         public override PreviewOrderResponse PreviewOrder(PreviewOrderReuqest previewOrderReuqest)
         {
+            logger.Info($"PreviewOrder {JsonConvert.SerializeObject(previewOrderReuqest)}");
+
             var client = GetSyncAPIClient(previewOrderReuqest.AppKey, previewOrderReuqest.AppSecret);
             RequestPolicy reqPolicy = new RequestPolicy();
             reqPolicy.HttpMethod = "POST";

BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -355,6 +355,8 @@ namespace BBWY.Server.Business
                 CreateTime = DateTime.Now,
                 DeliveryFreight = 0,
                 PurchaseAmount = purchaseOrderSimpleInfo.TotalAmount,
+                SkuAmount = purchaseOrderSimpleInfo.ProductAmount,
+                PurchaseFreight = purchaseOrderSimpleInfo.FreightAmount,
                 PurchaseOrderId = createOrderResponse.PurchaseOrderId,
                 PurchasePlatform = createOnlinePurchaseOrderRequest.Platform
             };