Browse Source

关联订单v2接口bug

qianyi
shanji 3 years ago
parent
commit
299a266cac
  1. 5
      BBWY.Client/Models/Order/OrderDropShipping.cs
  2. 1
      BBWY.Client/Views/Order/RelationPurchaseOrder.xaml.cs
  3. 13
      BBWY.Server.Business/Order/OrderBusiness.cs

5
BBWY.Client/Models/Order/OrderDropShipping.cs

@ -1,4 +1,5 @@
using System; using Newtonsoft.Json;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
@ -38,6 +39,7 @@ namespace BBWY.Client.Models
} }
} }
[JsonIgnore]
public string PurchaseFreightStr public string PurchaseFreightStr
{ {
get => purchaseFreightStr; set get => purchaseFreightStr; set
@ -67,6 +69,7 @@ namespace BBWY.Client.Models
OnPurchaseAmountChanged?.Invoke(); OnPurchaseAmountChanged?.Invoke();
} }
[JsonIgnore]
public Action OnPurchaseAmountChanged { get; set; } public Action OnPurchaseAmountChanged { get; set; }
public object Clone() public object Clone()

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

@ -86,6 +86,7 @@ namespace BBWY.Client.Views.Order
AddOrderDropShippingCommand = new RelayCommand(() => OrderDropShippingList.Add(new OrderDropShipping() AddOrderDropShippingCommand = new RelayCommand(() => OrderDropShippingList.Add(new OrderDropShipping()
{ {
OrderId = this.OrderId,
BuyerAccount = PurchaseAccountList.FirstOrDefault()?.AccountName, BuyerAccount = PurchaseAccountList.FirstOrDefault()?.AccountName,
OnPurchaseAmountChanged = OnPurchaseAmountChanged OnPurchaseAmountChanged = OnPurchaseAmountChanged
})); }));

13
BBWY.Server.Business/Order/OrderBusiness.cs

@ -1054,12 +1054,21 @@ namespace BBWY.Server.Business
{ {
deletePurchaseOrder.ExecuteAffrows(); deletePurchaseOrder.ExecuteAffrows();
deleteOrderCostDetail.ExecuteAffrows(); deleteOrderCostDetail.ExecuteAffrows();
foreach (var updateOrderSku in updateOrderSkuList) foreach (var update in updateOrderSkuList)
updateOrderSku.ExecuteAffrows(); update.ExecuteAffrows();
fsql.Insert(insertPurchaseOrderList).ExecuteAffrows(); fsql.Insert(insertPurchaseOrderList).ExecuteAffrows();
fsql.Insert(insertOrderCostDetailList).ExecuteAffrows(); fsql.Insert(insertOrderCostDetailList).ExecuteAffrows();
insertOrderCost?.ExecuteAffrows(); insertOrderCost?.ExecuteAffrows();
updateOrderCost?.ExecuteAffrows(); updateOrderCost?.ExecuteAffrows();
if (insertOrderDropShippingList.Count() > 0)
fsql.Insert(insertOrderDropShippingList).ExecuteAffrows();
if (updateOrderDropShippingList.Count() > 0)
{
foreach (var update in updateOrderDropShippingList)
{
fsql.Update<OrderDropShipping>().SetSource(update).IgnoreColumns(new string[] { "CreateTime", "ShopId" });
}
}
if (dbOrder.StorageType != Enums.StorageType.) if (dbOrder.StorageType != Enums.StorageType.)
{ {

Loading…
Cancel
Save