diff --git a/BBWY.Client/APIServices/PurchaseOrderService.cs b/BBWY.Client/APIServices/PurchaseOrderService.cs index d9a4ef0a..0e9d964e 100644 --- a/BBWY.Client/APIServices/PurchaseOrderService.cs +++ b/BBWY.Client/APIServices/PurchaseOrderService.cs @@ -94,6 +94,8 @@ namespace BBWY.Client.APIServices /// /// /// + /// + /// /// public ApiResponse FastCreateOrder(Consignee consignee, IList purchaseSchemeProductSkuList, @@ -107,6 +109,7 @@ namespace BBWY.Client.APIServices long purchaseAccountId, string buyerAccount, string sellerAccount, + string purchaserId, decimal platformCommissionRatio) { return SendRequest(globalContext.BBYWApiHost, "api/purchaseOrder/NewFastCreateOrder", new @@ -133,6 +136,7 @@ namespace BBWY.Client.APIServices purchaseAccountId, buyerAccount, sellerAccount, + purchaserId, platformCommissionRatio }, null, HttpMethod.Post); } diff --git a/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs b/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs index 4c6cdbc4..abf9e715 100644 --- a/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs +++ b/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs @@ -69,5 +69,7 @@ namespace BBWY.Client.Models /// public string ErrorMessage { get; set; } + public string Remark { get; set; } + } } diff --git a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs index 56c3174a..abbc036b 100644 --- a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs +++ b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs @@ -200,7 +200,7 @@ namespace BBWY.Client.ViewModels }; IsLoading = true; var shopList = SelectedDepartment.ShopList.Where(s => s.IsSelected).ToList(); - var sDate = StartDate; + var sDate = StartDate.AddDays(-5); var eDate = EndDate; Task.Factory.StartNew(() => { @@ -408,8 +408,8 @@ namespace BBWY.Client.ViewModels { var array = line.CSVstrToArry(); var sourceMerchantOrderNo = array[2].FormatString(); - if (!string.IsNullOrEmpty(sourceMerchantOrderNo) && sourceMerchantOrderNo.StartsWith("XP")) - continue; //暂时不支持此类商户单号 + //if (!string.IsNullOrEmpty(sourceMerchantOrderNo)) + // continue; //暂时不支持此类商户单号 var expenditureAmount = decimal.Parse(array[7].FormatString()); if (expenditureAmount == 0) //支出为0的账单不参与审计 @@ -426,7 +426,8 @@ namespace BBWY.Client.ViewModels ProductName = array[3].FormatString(), PayTime = DateTime.Parse(array[4].FormatString()), OppositeAccount = array[5].FormatString(), - ExpenditureAmount = Math.Abs(expenditureAmount) + ExpenditureAmount = Math.Abs(expenditureAmount), + Remark = array[11] }; payBill.MerchantOrderNo = payBill.SourceMerchantOrderNo; if (payBill.SourceMerchantOrderNo.StartsWith("T50060NP")) diff --git a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs index 8b2a825a..9714d59e 100644 --- a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs +++ b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs @@ -320,6 +320,7 @@ namespace BBWY.Client.ViewModels purchaseAccount.Id, purchaseAccount.AccountName, purchaseSchemeList[0].PurchaserName, + purchaser.Id, globalContext.User.Shop.PlatformCommissionRatio ?? 0.05M)).ContinueWith(t => { IsLoading = false; diff --git a/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml b/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml index 47c8158c..9c2d9661 100644 --- a/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml +++ b/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml @@ -156,10 +156,19 @@ - + + + + + + + + + diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml index b147d247..3cbac7b1 100644 --- a/BBWY.Client/Views/MainWindow.xaml +++ b/BBWY.Client/Views/MainWindow.xaml @@ -26,7 +26,7 @@ - + diff --git a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 54a5f0f6..dcaacd6c 100644 --- a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -308,7 +308,8 @@ namespace BBWY.Server.Business SingleOperationAmount = 0, SingleSkuAmount = currentOrderSkuProductAmount / orderSku.ItemTotal.Value, SingleFreight = currentOrderSkuFreightAmount / orderSku.ItemTotal.Value, - StorageType = Enums.StorageType.代发 + StorageType = Enums.StorageType.代发, + PurchaserId = createOnlinePurchaseOrderRequest.PurchaserId }; insertPurchaseOrders.Add(purchaseOrder); #endregion diff --git a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs index 6acfa8f2..50bcb946 100644 --- a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs +++ b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs @@ -82,6 +82,12 @@ namespace BBWY.Server.Model.Db public long? ShopId { get; set; } + /// + /// 采购商Id + /// + [Column(StringLength = 20)] + public string PurchaserId { get; set; } + /// /// 单件Sku成本 /// diff --git a/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs index 5854ff12..6fee8dd6 100644 --- a/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs +++ b/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs @@ -35,5 +35,11 @@ public string SellerAccount { get; set; } public decimal PlatformCommissionRatio { get; set; } + + + /// + /// 采购商Id + /// + public string PurchaserId { get; set; } } } diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs index 6e767a6f..4b485901 100644 --- a/BBWY.Server.Model/Enums.cs +++ b/BBWY.Server.Model/Enums.cs @@ -10,7 +10,8 @@ 淘宝 = 0, 京东 = 1, 阿里巴巴 = 2, - 拼多多 = 3 + 拼多多 = 3, + 微信 = 4 } ///