diff --git a/BBWY.Client/BBWY.Client.csproj b/BBWY.Client/BBWY.Client.csproj index 0293431a..da12e8d8 100644 --- a/BBWY.Client/BBWY.Client.csproj +++ b/BBWY.Client/BBWY.Client.csproj @@ -1,4 +1,4 @@ - + WinExe diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs index 0a9f19e6..0aac43f0 100644 --- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs @@ -17,6 +17,8 @@ namespace BBWY.Server.Business { public class JDBusiness : PlatformSDKBusiness { + public override Enums.Platform Platform => Enums.Platform.京东; + private ILogger logger; private readonly string searchFields = "orderId,venderId,orderType,payType,orderTotalPrice,orderSellerPrice,orderPayment,freightPrice,orderState,orderStateRemark,orderRemark,orderStartTime,orderEndTime,modified,consigneeInfo,itemInfoList,couponDetailList,taxFee,venderRemark,pin,waybill,storeOrder,storeId,sellerDiscount"; @@ -31,7 +33,6 @@ namespace BBWY.Server.Business { "Purple","5"} }; - public override Enums.Platform Platform => Enums.Platform.京东; public JDBusiness(IMemoryCache memoryCache, ILogger logger) : base(memoryCache) { this.logger = logger; } diff --git a/BBWY.Server.Business/PlatformSDK/PDDBusiness.cs b/BBWY.Server.Business/PlatformSDK/PDDBusiness.cs index a20fbbae..6f1f0e4f 100644 --- a/BBWY.Server.Business/PlatformSDK/PDDBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/PDDBusiness.cs @@ -1,10 +1,14 @@ -using System; +using Microsoft.Extensions.Caching.Memory; +using System; using System.Collections.Generic; using System.Text; namespace BBWY.Server.Business { - internal class PDDBusiness + public class PDDBusiness : PlatformSDKBusiness { + public PDDBusiness(IMemoryCache memoryCache) : base(memoryCache) + { + } } } diff --git a/BBWY.Server.Business/PlatformSDK/TaoBaoBusiness.cs b/BBWY.Server.Business/PlatformSDK/TaoBaoBusiness.cs index 16e90bfe..c143488c 100644 --- a/BBWY.Server.Business/PlatformSDK/TaoBaoBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/TaoBaoBusiness.cs @@ -1,10 +1,17 @@ -using System; +using BBWY.Server.Model; +using Microsoft.Extensions.Caching.Memory; +using System; using System.Collections.Generic; using System.Text; namespace BBWY.Server.Business { - internal class TaoBaoBusiness + public class TaoBaoBusiness : PlatformSDKBusiness { + public override Enums.Platform Platform => Enums.Platform.淘宝; + + public TaoBaoBusiness(IMemoryCache memoryCache) : base(memoryCache) + { + } } } diff --git a/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs index 279a7b25..572812b1 100644 --- a/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs +++ b/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs @@ -133,7 +133,8 @@ namespace BBWY.Server.Business PurchaserLocation = p.Location, DefaultCost = ps.DefaultCost, RealCost = ps.RealCost, - CreateTime = ps.CreateTime + CreateTime = ps.CreateTime, + PurchasePlatform = ps.PurchasePlatform }); if (purchaseSchemeList.Count > 0) { diff --git a/BBWY.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs b/BBWY.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs index 425d9de4..e4514feb 100644 --- a/BBWY.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs +++ b/BBWY.Server.Model/Db/PurchaseScheme/PurchaseScheme.cs @@ -46,6 +46,9 @@ namespace BBWY.Server.Model.Db public long ShopId { get; set; } + [Column(MapType = typeof(int), DbType = "int(1)")] + public Enums.Platform PurchasePlatform { get; set; } + [Column(IsIgnore = true)] public List PurchaseSchemeProductList { get; set; } } diff --git a/BBWY.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs index fa7b3df8..01a2bc02 100644 --- a/BBWY.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs +++ b/BBWY.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs @@ -24,6 +24,11 @@ namespace BBWY.Server.Model.Dto /// 采购商发货地 /// public string PurchaserLocation { get; set; } + /// + /// 采购平台 + /// + public Enums.Platform PurchasePlatform { get; set; } = Enums.Platform.阿里巴巴; + public IList PurchaseSchemeProductList { get; set; } } }