diff --git a/BBWYB.Client/Models/APIModel/Response/Order/OrderCostResponse.cs b/BBWYB.Client/Models/APIModel/Response/Order/OrderCostResponse.cs index 2f0142b..be7896b 100644 --- a/BBWYB.Client/Models/APIModel/Response/Order/OrderCostResponse.cs +++ b/BBWYB.Client/Models/APIModel/Response/Order/OrderCostResponse.cs @@ -22,7 +22,7 @@ namespace BBWYB.Client.Models - public DateTime CreateTime { get; set; } + public DateTime? CreateTime { get; set; } /// /// 发货快递费 @@ -32,7 +32,7 @@ namespace BBWYB.Client.Models /// /// 是否手动编辑过成本 /// - public bool IsManualEdited { get; set; } = false; + public bool? IsManualEdited { get; set; } = false; /// /// 平台扣点金额 diff --git a/BBWYB.Client/Models/APIModel/Response/Order/OrderPurchaseInfoResponse.cs b/BBWYB.Client/Models/APIModel/Response/Order/OrderPurchaseInfoResponse.cs new file mode 100644 index 0000000..328dbf7 --- /dev/null +++ b/BBWYB.Client/Models/APIModel/Response/Order/OrderPurchaseInfoResponse.cs @@ -0,0 +1,23 @@ +using System; + +namespace BBWYB.Client.Models +{ + public partial class OrderPurchaseInfoResponse + { + public DateTime? CreateTime { get; set; } + + public string PurchaseAccountId { get; set; } + + public string PurchaseAccountName { get; set; } + + public PurchaseMethod? PurchaseMethod { get; set; } + + + public string PurchaseOrderId { get; set; } + + public Platform? PurchasePlatform { get; set; } + + public string PurchaserName { get; set; } + + } +} diff --git a/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs b/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs index 990cd64..463c3bd 100644 --- a/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs +++ b/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs @@ -136,6 +136,9 @@ namespace BBWYB.Client.Models /// 订单成本 /// public OrderCostResponse OrderCost { get; set; } + + public OrderPurchaseInfoResponse OrderPurchaseInfo { get; set; } + /// /// 订单成本明细列表 /// diff --git a/BBWYB.Client/Models/MappingProfile.cs b/BBWYB.Client/Models/MappingProfile.cs index 942d611..a23e4de 100644 --- a/BBWYB.Client/Models/MappingProfile.cs +++ b/BBWYB.Client/Models/MappingProfile.cs @@ -6,7 +6,7 @@ namespace BBWYB.Client.Models { public MappingProfile() { - + CreateMap().ForMember(t => t.TeamId, opt => opt.MapFrom(f => f.DepartmentId)) .ForMember(t => t.TeamName, opt => opt.MapFrom(f => f.DepartmentName)) .ForMember(t => t.Name, opt => opt.MapFrom(f => f.UserName)); @@ -22,6 +22,7 @@ namespace BBWYB.Client.Models CreateMap(); CreateMap(); CreateMap(); + CreateMap(); } } } diff --git a/BBWYB.Client/Models/Order/Order.cs b/BBWYB.Client/Models/Order/Order.cs index 751ba61..fcc5c68 100644 --- a/BBWYB.Client/Models/Order/Order.cs +++ b/BBWYB.Client/Models/Order/Order.cs @@ -148,6 +148,8 @@ namespace BBWYB.Client.Models /// public OrderCost OrderCost { get; set; } + public OrderPurchaseInfo OrderPurchaseInfo { get; set; } + public IList ItemList { get; set; } /// diff --git a/BBWYB.Client/Models/Order/OrderPurchaseInfo.cs b/BBWYB.Client/Models/Order/OrderPurchaseInfo.cs new file mode 100644 index 0000000..7b7ca63 --- /dev/null +++ b/BBWYB.Client/Models/Order/OrderPurchaseInfo.cs @@ -0,0 +1,6 @@ +namespace BBWYB.Client.Models +{ + public class OrderPurchaseInfo : OrderPurchaseInfoResponse + { + } +} diff --git a/BBWYB.Client/ViewModels/BaseVM.cs b/BBWYB.Client/ViewModels/BaseVM.cs index 36dfb03..4a36021 100644 --- a/BBWYB.Client/ViewModels/BaseVM.cs +++ b/BBWYB.Client/ViewModels/BaseVM.cs @@ -1,6 +1,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using System; +using System.Windows; using System.Windows.Input; namespace BBWYB.Client.ViewModels { @@ -12,11 +13,26 @@ namespace BBWYB.Client.ViewModels public ICommand UnloadCommand { get; set; } + public ICommand CopyTextCommand { get; set; } + public BaseVM() { VMId = Guid.NewGuid(); LoadCommand = new RelayCommand(Load); UnloadCommand = new RelayCommand(Unload); + CopyTextCommand = new RelayCommand(s => + { + try + { + Clipboard.SetText(s); + } + catch (Exception ex) + { + Console.ForegroundColor = ConsoleColor.Red; + Console.WriteLine(ex); + Console.ResetColor(); + } + }); } public virtual void Refresh() diff --git a/BBWYB.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs b/BBWYB.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs new file mode 100644 index 0000000..d982d2d --- /dev/null +++ b/BBWYB.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs @@ -0,0 +1,93 @@ +using BBWYB.Client.APIServices; +using BBWYB.Client.Models; +using BBWYB.Common.Models; +using CommunityToolkit.Mvvm.Input; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Input; + +namespace BBWYB.Client.ViewModels +{ + public class ChoosePurchaseSchemeViewModel : BaseVM, IDenpendency + { + private PurchaseService purchaseService; + private GlobalContext globalContext; + private Order order; + private bool noPurchaser; + + public IList PurchaserList { get; set; } + public bool NoPurchaser { get => noPurchaser; set { SetProperty(ref noPurchaser, value); } } + + //public ICommand DeleteCommand { get; set; } + //public ICommand EditCommand { get; set; } + public ICommand PreviewPurchaseCommand { get; set; } + + + + public ChoosePurchaseSchemeViewModel(PurchaseService purchaseService, GlobalContext globalContext) + { + this.purchaseService = purchaseService; + this.globalContext = globalContext; + this.PurchaserList = new ObservableCollection(); + //DeleteCommand = new RelayCommand(Delete); + //EditCommand = new RelayCommand(Edit); + PreviewPurchaseCommand = new RelayCommand(PreviewPurchase); + } + + protected override void Load() + { + PurchaserList.Clear(); + Task.Factory.StartNew(() => LoadPurchaser()); + } + + protected override void Unload() + { + this.order = null; + this.NoPurchaser = false; + PurchaserList.Clear(); + } + + public void SetData(Order order) + { + this.order = order; + } + + public void LoadPurchaser() + { + var skuIdList = order.ItemList.Select(osku => osku.SkuId).ToList(); + var purchaserResponse = purchaseService.GetSharePurchaser(skuIdList, globalContext.User.Shop.ShopId); + if (!purchaserResponse.Success) + { + App.Current.Dispatcher.Invoke(() => MessageBox.Show(purchaserResponse.Msg, "获取采购商")); + return; + } + NoPurchaser = (purchaserResponse.Data?.Count() ?? 0) == 0; + if (purchaserResponse.Data != null && purchaserResponse.Data.Count() > 0) + { + App.Current.Dispatcher.Invoke(() => + { + foreach (var p in purchaserResponse.Data) PurchaserList.Add(p); + }); + } + + } + + public void PreviewPurchase(Purchaser purchaser) + { + var purchaseAccount = globalContext.User.Shop.PurchaseAccountList.FirstOrDefault(pa => pa.PurchasePlatformId == purchaser.Platform); + if (purchaseAccount == null) + { + MessageBox.Show($"缺少{purchaser.Platform}的采购账号", "提示"); + return; + } + + var p = new _1688Purchase(order, purchaser, purchaseAccount); + p.ShowDialog(); + GalaSoft.MvvmLight.Messaging.Messenger.Default.Send(null, "ChoosePurchaseScheme_Close"); + + } + } +} diff --git a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs index 309aba1..38eb84c 100644 --- a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs +++ b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs @@ -106,37 +106,37 @@ namespace BBWYB.Client.ViewModels //if (response.Data.Items == null || response.Data.Items.Count() == 0) // return; - response.Data.Items = new List() - { - new OrderResponse() - { - Id = "3213213121", - StartTime = DateTime.Now, - OrderState = Models.OrderState.等待采购, - OrderSellerPrice=100, - OrderCost = new OrderCostResponse(){ - DeliveryExpressFreight=50, - Profit=100, - TotalCost=120, - PurchaseAmount=150 - }, - BuyerRemark="12312fffff", - Consignee = new ConsigneeResponse(){ - Mobile="18996038927", - Province="重庆", - ContactName="山鸡" - }, - ItemList = new List(){ - new OrderSkuResponse(){ - ItemTotal=2, - Logo="https://img13.360buyimg.com/n9/s80x80_jfs/t1/87954/9/35896/95921/6431716fFa3d09cae/e1f687d25af0ddf1.jpg", - Price=15, - ProductId="10023985258330", - SkuId="10072665703169", Title="特大绿色托盘熊50CM" - } - } - } - }; + //response.Data.Items = new List() + //{ + // new OrderResponse() + // { + // Id = "3213213121", + // StartTime = DateTime.Now, + // OrderState = Models.OrderState.等待采购, + // OrderSellerPrice=100, + // OrderCost = new OrderCostResponse(){ + // DeliveryExpressFreight=50, + // Profit=100, + // TotalCost=120, + // PurchaseAmount=150 + // }, + // BuyerRemark="12312fffff", + // Consignee = new ConsigneeResponse(){ + // Mobile="18996038927", + // Province="重庆", + // ContactName="山鸡" + // }, + // ItemList = new List(){ + // new OrderSkuResponse(){ + // ItemTotal=2, + // Logo="https://img13.360buyimg.com/n9/s80x80_jfs/t1/87954/9/35896/95921/6431716fFa3d09cae/e1f687d25af0ddf1.jpg", + // Price=15, + // ProductId="10023985258330", + // SkuId="10072665703169", Title="特大绿色托盘熊50CM" + // } + // } + // } + //}; var list = response.Data.Items.Map>(); App.Current.Dispatcher.Invoke(() => diff --git a/BBWYB.Client/Views/Order/ChoosePurchaseScheme.xaml b/BBWYB.Client/Views/Order/ChoosePurchaseScheme.xaml new file mode 100644 index 0000000..71b830d --- /dev/null +++ b/BBWYB.Client/Views/Order/ChoosePurchaseScheme.xaml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BBWYB.Client/Views/Order/ChoosePurchaseScheme.xaml.cs b/BBWYB.Client/Views/Order/ChoosePurchaseScheme.xaml.cs new file mode 100644 index 0000000..5d1423e --- /dev/null +++ b/BBWYB.Client/Views/Order/ChoosePurchaseScheme.xaml.cs @@ -0,0 +1,28 @@ +using CommunityToolkit.Mvvm.Messaging; +using SJ.Controls; + +namespace BBWYB.Client.Views.Order +{ + /// + /// ChoosePurchaseScheme.xaml 的交互逻辑 + /// + public partial class ChoosePurchaseScheme : BWindow + { + public ChoosePurchaseScheme() + { + InitializeComponent(); + this.Loaded += ChoosePurchaseScheme_Loaded; + this.Unloaded += ChoosePurchaseScheme_Unloaded; + } + + private void ChoosePurchaseScheme_Unloaded(object sender, System.Windows.RoutedEventArgs e) + { + WeakReferenceMessenger.Default.UnregisterAll(this); + } + + private void ChoosePurchaseScheme_Loaded(object sender, System.Windows.RoutedEventArgs e) + { + //Messenger.Default.Register(this, "ChoosePurchaseScheme_Close", (x) => this.Close()); + } + } +} diff --git a/BBWYB.Client/Views/Order/OrderList.xaml b/BBWYB.Client/Views/Order/OrderList.xaml index 94b7f4b..a53334f 100644 --- a/BBWYB.Client/Views/Order/OrderList.xaml +++ b/BBWYB.Client/Views/Order/OrderList.xaml @@ -320,7 +320,7 @@ - + @@ -383,7 +383,7 @@ - + @@ -454,12 +454,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -491,7 +518,7 @@ - + @@ -522,175 +549,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -739,18 +597,14 @@ - - - - - + HorizontalAlignment="Center"/> + - - - @@ -804,9 +655,6 @@ - - - diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs index 7dd03ad..1031dc8 100644 --- a/BBWYB.Server.Business/Order/OrderBusiness.cs +++ b/BBWYB.Server.Business/Order/OrderBusiness.cs @@ -16,13 +16,15 @@ namespace BBWYB.Server.Business } - private ISelect GetOrderListQueryConditions(QueryOrderRequest request) + private ISelect GetOrderListQueryConditions(QueryOrderRequest request) { - var select = fsql.Select().LeftJoin((o, ocs, oct) => o.Id == ocs.OrderId) - .LeftJoin((o, ocs, oct) => o.Id == oct.OrderId); + var select = fsql.Select() + .LeftJoin((o, ocs, oct, op) => o.Id == ocs.OrderId) + .LeftJoin((o, ocs, oct, op) => o.Id == oct.OrderId) + .LeftJoin((o, ocs, oct, op) => o.Id == op.OrderId); if (!string.IsNullOrEmpty(request.OrderId)) { - select = select.Where((o, ocs, oct) => o.Id == request.OrderId); + select = select.Where((o, ocs, oct, op) => o.Id == request.OrderId); } else { @@ -31,27 +33,27 @@ namespace BBWYB.Server.Business var childSelect = fsql.Select().As("osku") .WhereIf(!string.IsNullOrEmpty(request.Sku), osku => osku.SkuId == request.Sku) .WhereIf(!string.IsNullOrEmpty(request.ProductId), osku => osku.ProductId == request.ProductId); - select = select.Where((o, ocs, oct) => childSelect.Where(osku => osku.OrderId == o.Id).Any()); + select = select.Where((o, ocs, oct, op) => childSelect.Where(osku => osku.OrderId == o.Id).Any()); } - select = select.WhereIf(request.OrderState != null, (o, ocs, oct) => o.OrderState == request.OrderState) - .WhereIf(request.StartDate != null, (o, ocs, oct) => o.StartTime >= request.StartDate) - .WhereIf(request.EndDate != null, (o, ocs, oct) => o.StartTime <= request.EndDate) - .WhereIf(!string.IsNullOrEmpty(request.ClientOrderId), (o, ocs, oct) => o.ClientOrderId == request.ClientOrderId) - .WhereIf(!string.IsNullOrEmpty(request.SourceShopName), (o, ocs, oct) => o.SourceShopName == request.SourceShopName) - .WhereIf(!string.IsNullOrEmpty(request.SourceSku), (o, ocs, oct) => o.SourceSku == request.SourceSku); + select = select.WhereIf(request.OrderState != null, (o, ocs, oct, op) => o.OrderState == request.OrderState) + .WhereIf(request.StartDate != null, (o, ocs, oct, op) => o.StartTime >= request.StartDate) + .WhereIf(request.EndDate != null, (o, ocs, oct, op) => o.StartTime <= request.EndDate) + .WhereIf(!string.IsNullOrEmpty(request.ClientOrderId), (o, ocs, oct, op) => o.ClientOrderId == request.ClientOrderId) + .WhereIf(!string.IsNullOrEmpty(request.SourceShopName), (o, ocs, oct, op) => o.SourceShopName == request.SourceShopName) + .WhereIf(!string.IsNullOrEmpty(request.SourceSku), (o, ocs, oct, op) => o.SourceSku == request.SourceSku); } - select = select.WhereIf(request.ShopId != null, (o, ocs, oct) => o.ShopId == request.ShopId); + select = select.WhereIf(request.ShopId != null, (o, ocs, oct, op) => o.ShopId == request.ShopId); //select = select.Where((o, ocs, oct) => o.ShopId == searchOrderRequest.ShopId); return select; } - private Expression> GetOrderListField() + private Expression> GetOrderListField() { - return (o, ocs, oct) => new Model.Db.Order() + return (o, ocs, oct, op) => new Order() { Id = o.Id, BuyerRemark = o.BuyerRemark, @@ -84,21 +86,22 @@ namespace BBWYB.Server.Business County = ocs.County, Town = ocs.Town, City = ocs.City, - //IsDecode = ocs.IsDecode, Mobile = ocs.Mobile, TelePhone = ocs.TelePhone, DeliveryExpressFreight = oct.DeliveryExpressFreight, PlatformCommissionAmount = oct.PlatformCommissionAmount, PlatformCommissionRatio = oct.PlatformCommissionRatio, - //PreferentialAmount = oct.PreferentialAmount, Profit = oct.Profit, PurchaseAmount = oct.PurchaseAmount, IsManualEdited = oct.IsManualEdited, - //SDCommissionAmount = oct.SDCommissionAmount, - //SDOrderAmount = oct.SDOrderAmount, - //RefundAmount = oct.RefundAmount, - //RefundPurchaseAmount = oct.RefundPurchaseAmount, + + PurchaseAccountId = op.PurchaseAccountId, + PurchaseAccountName = op.PurchaseAccountName, + PurchaseMethod = op.PurchaseMethod, + PurchaseOrderId = op.PurchaseOrderId, + PurchasePlatform = op.PurchasePlatform, + PurchaserName = op.PurchaserName }; } @@ -107,7 +110,7 @@ namespace BBWYB.Server.Business if (request.EndDate != null) request.EndDate = request.EndDate.Value.Date.AddDays(1).AddSeconds(-1); - var select = GetOrderListQueryConditions(request).OrderByDescending((o, ocs, oct) => o.StartTime) + var select = GetOrderListQueryConditions(request).OrderByDescending((o, ocs, oct, op) => o.StartTime) .Count(out var total) .Page(request.PageIndex, request.PageSize); diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 97e2c89..911d480 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -141,6 +141,8 @@ namespace BBWYB.Server.Business List insertOrderCostDetails = new List(); IInsert insertOrderCost = null; IUpdate updateOrderCost = null; + IInsert insertOrderPurchaseInfo = null; + IUpdate updateOrderPurchaseInfo = null; foreach (var orderSku in orderSkus) { @@ -171,7 +173,7 @@ namespace BBWYB.Server.Business PurchaseOrderId = purchaseOrderSimpleInfo.OrderId, SkuAmount = currentOrderSkuProductAmount, SkuId = orderSku.SkuId, - StorageAmount = 0, + StorageAmount = 0 //UnitCost = purchaseOrder.UnitCost, //TotalCost = currentOrderSkuProductAmount + currentOrderSkuFreightAmount//purchaseOrder.UnitCost * orderSku.ItemTotal.Value }; @@ -206,6 +208,28 @@ namespace BBWYB.Server.Business } #endregion + #region 订单采购信息 + var orderPurchaserInfo = new OrderPurchaseInfo() + { + OrderId = request.OrderId, + CreateTime = DateTime.Now, + PurchaseAccountId = request.PurchaseAccountId, + PurchaseAccountName = request.PurchaseAccountName, + PurchaseMethod = Enums.PurchaseMethod.线上采购, + PurchaseOrderId = createOrderResponse.OrderId, + PurchasePlatform = request.Platform, + PurchaserName = request.PurchaserName + }; + + if (!isRepurchase) + { + insertOrderPurchaseInfo = fsql.Insert(orderPurchaserInfo); + } + else + { + updateOrderPurchaseInfo = fsql.Update().SetSource(orderPurchaserInfo).IgnoreColumns(a => new { a.CreateTime }); + } + #endregion fsql.Transaction(() => { @@ -213,6 +237,8 @@ namespace BBWYB.Server.Business fsql.Insert(insertOrderCostDetails).ExecuteAffrows(); updateOrderCost?.ExecuteAffrows(); insertOrderCost?.ExecuteAffrows(); + insertOrderPurchaseInfo?.ExecuteAffrows(); + updateOrderPurchaseInfo?.ExecuteAffrows(); fsql.Update(request.OrderId).SetIf(dbOrder.OrderState == Enums.OrderState.等待采购, o => o.OrderState, Model.Enums.OrderState.待出库) .Set(o => o.IsPurchased, true) .ExecuteAffrows(); diff --git a/BBWYB.Server.Model/Db/Order/Order.cs b/BBWYB.Server.Model/Db/Order/Order.cs index 9acdb14..f614eb6 100644 --- a/BBWYB.Server.Model/Db/Order/Order.cs +++ b/BBWYB.Server.Model/Db/Order/Order.cs @@ -218,6 +218,20 @@ namespace BBWYB.Server.Model.Db public string Town { get; set; } #endregion + #region 采购信息 + + public string PurchaseAccountId { get; set; } + public string PurchaseAccountName { get; set; } + + public Enums.PurchaseMethod? PurchaseMethod { get; set; } + + public string PurchaseOrderId { get; set; } + + public Enums.Platform? PurchasePlatform { get; set; } + + public string PurchaserName { get; set; } + #endregion + } } diff --git a/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs b/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs new file mode 100644 index 0000000..bad26a4 --- /dev/null +++ b/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs @@ -0,0 +1,36 @@ +using FreeSql.DataAnnotations; + +namespace BBWYB.Server.Model.Db +{ + + [Table(Name = "orderpurchaseinfo", DisableSyncStructure = true)] + public partial class OrderPurchaseInfo + { + + [Column(StringLength = 50, IsPrimary = true, IsNullable = false)] + public string OrderId { get; set; } + + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + [Column(StringLength = 100)] + public string PurchaseAccountId { get; set; } + + [Column(StringLength = 100)] + public string PurchaseAccountName { get; set; } + + [Column(MapType = typeof(int?))] + public Enums.PurchaseMethod? PurchaseMethod { get; set; } + + [Column(StringLength = 100)] + public string PurchaseOrderId { get; set; } + + [Column(MapType = typeof(int?))] + public Enums.Platform? PurchasePlatform { get; set; } + + [Column(StringLength = 100)] + public string PurchaserName { get; set; } + + } + +} diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CreateOrderRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CreateOrderRequest.cs index d802ef8..cfee326 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CreateOrderRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/CreateOrderRequest.cs @@ -10,5 +10,11 @@ /// 店铺订单Id /// public string OrderId { get; set; } + + public string PurchaseAccountId { get; set; } + + public string PurchaseAccountName { get; set; } + + public string PurchaserName { get; set; } } } diff --git a/BBWYB.Server.Model/Dto/Response/Order/OrderPurchaseInfoResponse.cs b/BBWYB.Server.Model/Dto/Response/Order/OrderPurchaseInfoResponse.cs new file mode 100644 index 0000000..0e2ffa0 --- /dev/null +++ b/BBWYB.Server.Model/Dto/Response/Order/OrderPurchaseInfoResponse.cs @@ -0,0 +1,8 @@ +using BBWYB.Server.Model.Db; + +namespace BBWYB.Server.Model.Dto +{ + public class OrderPurchaseInfoResponse : OrderPurchaseInfo + { + } +} diff --git a/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs b/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs index 04d9ea1..fa0f9bc 100644 --- a/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs @@ -133,6 +133,12 @@ /// 订单成本 /// public OrderCostResponse OrderCost { get; set; } + + /// + /// 订单采购信息 + /// + public OrderPurchaseInfoResponse OrderPurchaseInfo { get; set; } + /// /// 订单成本明细列表 /// diff --git a/BBWYB.Server.Model/MappingProfiles.cs b/BBWYB.Server.Model/MappingProfiles.cs index 9d95b86..c3f6dfb 100644 --- a/BBWYB.Server.Model/MappingProfiles.cs +++ b/BBWYB.Server.Model/MappingProfiles.cs @@ -45,7 +45,13 @@ namespace BBWYB.Server.Model .ForPath(t => t.OrderCost.PlatformCommissionAmount, opt => opt.MapFrom(f => f.PlatformCommissionAmount ?? 0)) .ForPath(t => t.OrderCost.PlatformCommissionRatio, opt => opt.MapFrom(f => f.PlatformCommissionRatio ?? 0)) .ForPath(t => t.OrderCost.PreferentialAmount, opt => opt.MapFrom(f => f.PreferentialAmount)) - .ForPath(t => t.OrderCost.IsManualEdited, opt => opt.MapFrom(f => f.IsManualEdited)); + .ForPath(t => t.OrderCost.IsManualEdited, opt => opt.MapFrom(f => f.IsManualEdited)) + .ForPath(t => t.OrderPurchaseInfo.PurchasePlatform, opt => opt.MapFrom(f => f.PurchasePlatform)) + .ForPath(t => t.OrderPurchaseInfo.PurchaserName, opt => opt.MapFrom(f => f.PurchaserName)) + .ForPath(t => t.OrderPurchaseInfo.PurchaseAccountName, opt => opt.MapFrom(f => f.PurchaseAccountName)) + .ForPath(t => t.OrderPurchaseInfo.PurchaseAccountId, opt => opt.MapFrom(f => f.PurchaseAccountId)) + .ForPath(t => t.OrderPurchaseInfo.PurchaseMethod, opt => opt.MapFrom(f => f.PurchaseMethod)) + .ForPath(t => t.OrderPurchaseInfo.PurchaseOrderId, opt => opt.MapFrom(f => f.PurchaseOrderId)); //CreateMap();