pengcong001
/
bbwyb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

updatebug
shanji 2 years ago
parent
781bcee268
commit
5f7ba02aa6
2 changed files with 71 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      BBWYB.Client/APIServices/PurchaseOrderService.cs
  2. 131
      BBWYB.Client/ViewModels/Purchase/OnlinePurchaseViewModel.cs

31
BBWYB.Client/APIServices/PurchaseOrderService.cs
View File

@ -59,9 +59,10 @@ namespace BBWYB.Client.APIServices
/// 预览订单
/// </summary>
/// <param name="consignee"></param>
/// <param name="purchaseSchemeProductSkuList"></param>
/// <param name="productSkuWithSchemeList"></param>
/// <param name="purchaseOrderMode"></param>
/// <returns></returns>
public ApiResponse<PreviewOrderResponse> PreviewPurchaseOrder(Consignee consignee, IList<ProductSkuWithScheme> productSkuWithSchemeList, Platform purchasePlatform, PurchaseOrderMode purchaseOrderMode)
public ApiResponse<PreviewOrderResponse> PreviewPurchaseOrder(Consignee consignee, IList<ProductSkuWithScheme> productSkuWithSchemeList, PurchaseOrderMode purchaseOrderMode)
{
var cargoParamGroupList = CombineCargoParamGroup(productSkuWithSchemeList);
return SendRequest<PreviewOrderResponse>(globalContext.BBYWApiHost, "api/PurchaseOrder/PreviewPurchaseOrder", new
@ -77,47 +78,31 @@ namespace BBWYB.Client.APIServices
/// 创建采购单
/// </summary>
/// <param name="consignee"></param>
/// <param name="purchaseSchemeProductSkuList"></param>
/// <param name="purchasePlatform"></param>
/// <param name="purchaseAccount"></param>
/// <param name="productSkuWithSchemeList"></param>
/// <param name="purchaseOrderMode"></param>
/// <param name="remark"></param>
/// <param name="orderId"></param>
/// <param name="shopId"></param>
/// <param name="purchaserName"></param>
/// <param name="extensions"></param>
/// <returns></returns>
public ApiResponse<object> FastCreateOrder(Consignee consignee,
IList<PurchaseSchemeProductSku> purchaseSchemeProductSkuList,
IList<ProductSkuWithScheme> productSkuWithSchemeList,
PurchaseOrderMode purchaseOrderMode,
string remark,
string orderId,
long shopId,
string extensions)
{
var cargoParamGroupList = CombineCargoParamGroup(productSkuWithSchemeList);
return SendRequest<object>(globalContext.BBYWApiHost, "api/purchaseOrder/CreatePurchaseOrder", new
{
purchaseOrderMode,
consignee,
CargoParamList = purchaseSchemeProductSkuList.Select(sku => new
{
ProductId = sku.PurchaseProductId,
SkuId = sku.PurchaseSkuId,
SpecId = sku.PurchaseSkuSpecId,
Quantity = sku.ItemTotal,
BelongSkuId = sku.SkuId
}),
Platform = purchasePlatform,
purchaseAccount.AppKey,
purchaseAccount.AppSecret,
purchaseAccount.AppToken,
SaveResponseLog = true,
cargoParamGroupList,
globalContext.User.Shop.PurchaseAccountList,
remark,
orderId,
shopId,
purchaseAccountId = purchaseAccount.Id,
purchaseAccountName = purchaseAccount.AccountName,
purchaserName,
extensions
}, null, HttpMethod.Post);
}

131
BBWYB.Client/ViewModels/Purchase/OnlinePurchaseViewModel.cs
View File

@ -111,8 +111,6 @@ namespace BBWYB.Client.ViewModels
public void SetData(Order order, IList<PurchaseScheme> schemeList)
{
this.order = order;
//this.purchaser = purchaser;
//this.purchaseAccount = purchaseAccount;
this.schemeList = schemeList;
this.ContactName = order.Consignee.ContactName;
this.Address = order.Consignee.Address;
@ -229,35 +227,35 @@ namespace BBWYB.Client.ViewModels
return;
}
//IsLoading = true;
//Task.Factory.StartNew(() => purchaseOrderService.PreviewPurchaseOrder(new Consignee()
//{
// Address = Address,
// City = City,
// ContactName = ContactName,
// County = County,
// Mobile = Mobile,
// Province = Province,
// TelePhone = Mobile,
// Town = Town
//}, PurchaseSchemeProductSkuList, purchaseAccount.PurchasePlatformId, purchaseAccount, PurchaseOrderMode))
// .ContinueWith(t =>
// {
// IsLoading = false;
// var r = t.Result;
// if (!r.Success)
// {
// ProductAmount = FreightAmount = TotalAmount = 0;
// extensions = string.Empty;
// App.Current.Dispatcher.Invoke(() => MessageBox.Show(r.Msg, "预览订单报价"));
// return;
// }
// ProductAmount = r.Data.ProductAmount;
// FreightAmount = r.Data.FreightAmount;
// TotalAmount = r.Data.TotalAmount;
// //tradeMode = r.Data.OrderTradeType?.Code;
// extensions = r.Data.Extensions;
// });
IsLoading = true;
Task.Factory.StartNew(() => purchaseOrderService.PreviewPurchaseOrder(new Consignee()
{
Address = Address,
City = City,
ContactName = ContactName,
County = County,
Mobile = Mobile,
Province = Province,
TelePhone = Mobile,
Town = Town
}, ProductSkuWithSchemeList, PurchaseOrderMode))
.ContinueWith(t =>
{
IsLoading = false;
var r = t.Result;
if (!r.Success)
{
ProductAmount = FreightAmount = TotalAmount = 0;
extensions = string.Empty;
App.Current.Dispatcher.Invoke(() => MessageBox.Show(r.Msg, "预览订单报价"));
return;
}
ProductAmount = r.Data.ProductAmount;
FreightAmount = r.Data.FreightAmount;
TotalAmount = r.Data.TotalAmount;
//tradeMode = r.Data.OrderTradeType?.Code;
extensions = r.Data.Extensions;
});
}
private void FastCreateOrder()
@ -286,43 +284,40 @@ namespace BBWYB.Client.ViewModels
return;
}
//IsLoading = true;
//Task.Factory.StartNew(() => purchaseOrderService.FastCreateOrder(new Consignee()
//{
// Address = Address,
// City = City,
// ContactName = ContactName,
// County = County,
// Mobile = Mobile,
// Province = Province,
// TelePhone = Mobile,
// Town = Town
//}, PurchaseSchemeProductSkuList,
// purchaseAccount.PurchasePlatformId,
// purchaseAccount,
// PurchaseOrderMode,
// PrucahseRemark,
// order.Id,
// globalContext.User.Shop.ShopId,
// purchaseSchemeList[0].PurchaserName,
// extensions)).ContinueWith(t =>
// {
// IsLoading = false;
// var r = t.Result;
// if (!r.Success)
// {
// App.Current.Dispatcher.Invoke(() => MessageBox.Show(r.Msg, "下单"));
// return;
// }
// //刷新订单列表
// //orderListViewModel.RefreshOrder(order.Id);
// orderVM.RefreshOrder(order.Id);
// //关闭当前窗口
// //GalaSoft.MvvmLight.Messaging.Messenger.Default.Send<object>(null, "OnlinePurchase_Close");
// WeakReferenceMessenger.Default.Send(new Message_OnlinePurchase_Close(null));
// });
IsLoading = true;
Task.Factory.StartNew(() => purchaseOrderService.FastCreateOrder(new Consignee()
{
Address = Address,
City = City,
ContactName = ContactName,
County = County,
Mobile = Mobile,
Province = Province,
TelePhone = Mobile,
Town = Town
}, ProductSkuWithSchemeList,
PurchaseOrderMode,
PrucahseRemark,
order.Id,
globalContext.User.Shop.ShopId,
extensions)).ContinueWith(t =>
{
IsLoading = false;
var r = t.Result;
if (!r.Success)
{
App.Current.Dispatcher.Invoke(() => MessageBox.Show(r.Msg, "下单"));
return;
}
//刷新订单列表
//orderListViewModel.RefreshOrder(order.Id);
orderVM.RefreshOrder(order.Id);
//关闭当前窗口
//GalaSoft.MvvmLight.Messaging.Messenger.Default.Send<object>(null, "OnlinePurchase_Close");
WeakReferenceMessenger.Default.Send(new Message_OnlinePurchase_Close(null));
});
}
private void PreviewOrder()

Write Preview
Loading…
Cancel
Save