From 25ff61ba13b045288f8cf2156009792c5081a3d2 Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Fri, 10 Jun 2022 16:58:18 +0800 Subject: [PATCH 1/2] 1 --- BBWY.Client/APIServices/OrderService.cs | 10 +++++++++- .../ViewModels/Order/OrderListViewModel.cs | 9 ++++++++- BBWY.Server.Business/Order/OrderBusiness.cs | 6 +++++- .../Request/Order/SDCalculationCostRequest.cs | 20 +++++++++++++++++++ 4 files changed, 42 insertions(+), 3 deletions(-) diff --git a/BBWY.Client/APIServices/OrderService.cs b/BBWY.Client/APIServices/OrderService.cs index 867985e8..5745a981 100644 --- a/BBWY.Client/APIServices/OrderService.cs +++ b/BBWY.Client/APIServices/OrderService.cs @@ -127,6 +127,10 @@ namespace BBWY.Client.APIServices decimal sdCommissionAmount, decimal deliveryExpressFreight, SDType sdType, + string sdKey, + PayBillType? sdPayChannel, + string sdPaybillNo, + string sdOperator, string flag, string venderRemark, decimal platformCommissionRatio) @@ -141,6 +145,10 @@ namespace BBWY.Client.APIServices sdCommissionAmount, deliveryExpressFreight, platformCommissionRatio, + sdKey, + sdPayChannel, + sdPaybillNo, + sdOperator, Platform = globalContext.User.Shop.Platform, AppKey = globalContext.User.Shop.AppKey, AppSecret = globalContext.User.Shop.AppSecret, @@ -154,7 +162,7 @@ namespace BBWY.Client.APIServices /// /// /// - public ApiResponse RelationPurchaseOrder(OrderDropShipping orderDropShipping, IList relationPurchaseOrderSkuList,decimal platformCommissionRatio) + public ApiResponse RelationPurchaseOrder(OrderDropShipping orderDropShipping, IList relationPurchaseOrderSkuList, decimal platformCommissionRatio) { return SendRequest(globalContext.BBYWApiHost, "api/order/RelationPurchaseOrder", new { diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index 23c190e8..2619f803 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs @@ -380,13 +380,20 @@ namespace BBWY.Client.ViewModels var sdType = sd.SDType; var flag = sd.Flag; var venderRemark = sd.VenderRemark; - + var sdKey = sd.SDKey; + var sdPayChannel = sd.PayChannel; + var sdPaybillNo = sd.SdPayBillNo; + var sdOperator = sd.SdOperator; IsLoading = true; Task.Factory.StartNew(() => orderService.SDCalculationCost(orderId, isSetStorageType, sdCommissionAmount, deliveryExpressFreight, sdType.Value, + sdKey, + sdPayChannel, + sdPaybillNo, + sdOperator, flag, venderRemark, globalContext.User.Shop.PlatformCommissionRatio ?? 0.05M)) diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index 3f361f54..cad00925 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -642,7 +642,11 @@ namespace BBWY.Server.Business orderUpdate = fsql.Update(sdCalculationCostRequest.OrderId).Set(o => o.SDType, sdCalculationCostRequest.SDType) .Set(o => o.Flag, sdCalculationCostRequest.Flag) - .Set(o => o.VenderRemark, sdCalculationCostRequest.VenderRemark); + .Set(o => o.VenderRemark, sdCalculationCostRequest.VenderRemark) + .Set(o => o.SDKey, sdCalculationCostRequest.SDKey) + .Set(o => o.SDPayBillNo, sdCalculationCostRequest.SDPayBillNo) + .Set(o => o.SDOperator, sdCalculationCostRequest.SDOperator) + .SetIf(sdCalculationCostRequest.SDPayChannel != null, o => o.SDPayChannel, sdCalculationCostRequest.SDPayChannel); if (sdCalculationCostRequest.IsSetStorageType) orderUpdate = orderUpdate.Set(o => o.StorageType, Enums.StorageType.SD); diff --git a/BBWY.Server.Model/Dto/Request/Order/SDCalculationCostRequest.cs b/BBWY.Server.Model/Dto/Request/Order/SDCalculationCostRequest.cs index 156d442b..2e630d9d 100644 --- a/BBWY.Server.Model/Dto/Request/Order/SDCalculationCostRequest.cs +++ b/BBWY.Server.Model/Dto/Request/Order/SDCalculationCostRequest.cs @@ -12,6 +12,26 @@ public Enums.SDType SDType { get; set; } + /// + /// 刷单关键词 + /// + public string SDKey { get; set; } + + /// + /// 刷单支付渠道 + /// + public Enums.PayChannelType? SDPayChannel { get; set; } + + /// + /// 刷单交易账单号 + /// + public string SDPayBillNo { get; set; } + + /// + /// 刷单人 + /// + public string SDOperator { get; set; } + /// /// 刷单佣金 /// From e6f61f928d3e92eeae92a4dfccbce018e03a0d18 Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Fri, 10 Jun 2022 17:30:56 +0800 Subject: [PATCH 2/2] 10019 --- BBWY.Client/Views/MainWindow.xaml | 2 +- BBWY.Server.Business/Order/OrderBusiness.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml index 2d1bb93f..4fffc59f 100644 --- a/BBWY.Client/Views/MainWindow.xaml +++ b/BBWY.Client/Views/MainWindow.xaml @@ -26,7 +26,7 @@ - + diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index cad00925..93c49700 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -294,6 +294,10 @@ namespace BBWY.Server.Business WaybillNo = o.WaybillNo, Flag = o.Flag, SDType = o.SDType, + SDKey = o.SDKey, + SDOperator = o.SDOperator, + SDPayBillNo = o.SDPayBillNo, + SDPayChannel = o.SDPayChannel, ContactName = ocs.ContactName, Address = ocs.Address,