diff --git a/BBWY.Client/Views/PackTask/PrintWindow.xaml b/BBWY.Client/Views/PackTask/PrintWindow.xaml index cd2c9821..860acbbe 100644 --- a/BBWY.Client/Views/PackTask/PrintWindow.xaml +++ b/BBWY.Client/Views/PackTask/PrintWindow.xaml @@ -45,13 +45,13 @@ - + - + diff --git a/BBWY.Client/Views/PackTask/PrintWindow.xaml.cs b/BBWY.Client/Views/PackTask/PrintWindow.xaml.cs index 0eb7a853..ce4d0ab1 100644 --- a/BBWY.Client/Views/PackTask/PrintWindow.xaml.cs +++ b/BBWY.Client/Views/PackTask/PrintWindow.xaml.cs @@ -9,6 +9,8 @@ using System.Threading.Tasks; using System.Windows; using System.Collections.ObjectModel; using BBWY.Client.Extensions; +using System.Reflection; +using System.IO; namespace BBWY.Client.Views.PackTask { @@ -20,21 +22,17 @@ namespace BBWY.Client.Views.PackTask public PrintWindow() { InitializeComponent(); - this.Loaded += PrintWindow_Loaded; - - - } + InitPrintList(); + this.DataContext = this; - private void PrintWindow_Loaded(object sender, RoutedEventArgs e) - { - LoadPrints(); } - /// /// 获取打印机名称 /// - private void LoadPrints() + public void InitPrintList() { + + PrintList = new ObservableCollection(); var printingNames = PrinterSettings.InstalledPrinters;//获取本机的打印机数据 int index = -1; int selectIndex = 0; @@ -49,12 +47,30 @@ namespace BBWY.Client.Views.PackTask { selectIndex = index; } - cbPrints.Items.Add(name); + PrintList.Add(name); + } + try + { + var applicationPath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); + string printNames = System.IO.Path.Combine(applicationPath, "handPrintBarCerName.init"); + if (File.Exists(printNames)) + { + PrintName = File.ReadAllText(printNames); + } + else + { + if (PrintList.Count > 0) + { + PrintName = PrintList[0].ToString(); + } + } } - if (cbPrints.Items.Count > selectIndex) + catch (Exception) { - cbPrints.SelectedIndex = selectIndex; + + } + } @@ -81,43 +97,59 @@ namespace BBWY.Client.Views.PackTask cer.Visibility = Visibility.Collapsed; bar.Visibility = Visibility.Visible; } - this.DataContext = this; + } - public CertificateModel[] CertificateModel { get; set; } + private CertificateModel[] certificateModel; + public CertificateModel[] CertificateModel { get => certificateModel; set { Set(ref certificateModel, value); } } - public BarCodeModel BarCodeModel { get; set; } + private BarCodeModel barCodeModel; + public BarCodeModel BarCodeModel { get=> barCodeModel; set {Set(ref barCodeModel,value); } } - private void BButton_Click(object sender, RoutedEventArgs e) - { - int printCount = 0; - try - { - printCount = Convert.ToInt32(tbCount.Text); - } - catch - { - new TipsWindow("请输入打印份数", 1).ShowDialog(); - return; - } - string printName = cbPrints.Text;//选择的要打印的打印机名称 + /// + /// 打印机列表 + /// + public ObservableCollection PrintList { get; set; } + public string PrintName { get; set; } + public int PrintCount { get => printCount; set { Set(ref printCount, value); } } + private int printCount = 1; + + private void BButton_Click(object sender, RoutedEventArgs e) + { Task.Factory.StartNew(() => { if (BarCodeModel != null) { - PrintData(printCount, printName,BarCodeModel); + PrintData(PrintCount, PrintName,BarCodeModel); //MyPrintHelper.PrintBarcode(ref args, BarCodeModel, font); } if (CertificateModel != null&& CertificateModel.Count()>0) { foreach (var cer in CertificateModel) { - PrintData(printCount, printName,null,cer); + PrintData(PrintCount, PrintName,null,cer); System.Threading.Thread.Sleep(100); } } + + var applicationPath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); + string printNames = System.IO.Path.Combine(applicationPath, "handPrintBarCerName.init"); + try + { + if (File.Exists(printNames)) + { + File.Delete(printNames); + } + } + catch + { + + + } + + File.WriteAllText(printNames, PrintName); }); } diff --git a/BBWY.Client/Views/PackagingTask/PrintPackDetailWindow.xaml.cs b/BBWY.Client/Views/PackagingTask/PrintPackDetailWindow.xaml.cs index 54b0767c..c543d504 100644 --- a/BBWY.Client/Views/PackagingTask/PrintPackDetailWindow.xaml.cs +++ b/BBWY.Client/Views/PackagingTask/PrintPackDetailWindow.xaml.cs @@ -93,13 +93,6 @@ namespace BBWY.Client.Views.PackagingTask } private void BButton_Click(object sender, System.Windows.RoutedEventArgs e) { - - - - - - - if (PrintName.IsNullOrEmpty()) { MessageBox.Show("请选择打印设备"); diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs index a592b94d..7e1bc996 100644 --- a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs @@ -132,6 +132,7 @@ namespace BBWY.Server.Business.Sync var insertList = new List(); foreach (var j in jArray) { + var r0 = j["retrievalType0"]; insertList.Add(new JDPopularizeAdGroup() { Id = idGenerator.NewLong(), @@ -142,11 +143,38 @@ namespace BBWY.Server.Business.Sync AdGroupId = j.Value("adGroupId"), AdGroupName = j.Value("adGroupName"), Date = DateTime.ParseExact(j.Value("date"), "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture), - Cost = j["retrievalType0"].Value("cost"), - Clicks = j["retrievalType0"].Value("clicks") ?? 0, - Impressions = j["retrievalType0"].Value("impressions") ?? 0, - TotalCartCnt = j["retrievalType0"].Value("totalCartCnt") ?? 0, - TotalOrderCnt = j["retrievalType0"].Value("totalOrderCnt") ?? 0 + Cost = r0.Value("cost"), + Clicks = r0.Value("clicks") ?? 0, + Impressions = r0.Value("impressions") ?? 0, + TotalCartCnt = r0.Value("totalCartCnt") ?? 0, + TotalOrderCnt = r0.Value("totalOrderCnt") ?? 0, + TotalOrderCVS = r0.Value("totalOrderCVS") ?? 0M, + CouponCnt = r0.Value("couponCnt") ?? 0, + CPA = r0.Value("CPA") ?? 0.00M, + CPC = r0.Value("CPC") ?? 0.00M, + CPM = r0.Value("CPM") ?? 0.00M, + CTR = r0.Value("CTR") ?? 0.00M, + DepthPassengerCnt = r0.Value("depthPassengerCnt") ?? 0, + DirectCartCnt = r0.Value("directCartCnt") ?? 0, + DirectOrderCnt = r0.Value("directOrderCnt") ?? 0, + DirectOrderSum = r0.Value("directOrderSum") ?? 0M, + GoodsAttentionCnt = r0.Value("goodsAttentionCnt") ?? 0, + IndirectCartCnt = r0.Value("indirectCartCnt") ?? 0, + IndirectOrderCnt = r0.Value("indirectOrderCnt") ?? 0, + IndirectOrderSum = r0.Value("indirectOrderSum") ?? 0, + NewCustomersCnt = r0.Value("newCustomersCnt") ?? 0, + OrderDate = DateTime.ParseExact(r0.Value("orderDate"), "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture), + Pin = r0.Value("pin"), + PreorderCnt = r0.Value("preorderCnt") ?? 0, + ShopAttentionCnt = r0.Value("shopAttentionCnt") ?? 0, + TotalCartCost = r0.Value("totalCartCost") ?? 0M, + TotalOrderROI = r0.Value("totalOrderROI") ?? 0M, + TotalOrderSum = r0.Value("totalOrderSum") ?? 0M, + TotalPresaleOrderCnt = r0.Value("totalPresaleOrderCnt") ?? 0, + TotalPresaleOrderSum = r0.Value("totalPresaleOrderSum") ?? 0M, + VisitorCnt = r0.Value("visitorCnt") ?? 0, + VisitPageCnt = r0.Value("visitPageCnt") ?? 0, + VisitTimeAverage = r0.Value("visitTimeAverage") ?? 0M }); } if (insertList.Count > 0) diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs index 00e3594b..03cc414f 100644 --- a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs @@ -159,7 +159,7 @@ namespace BBWY.Server.Business.Sync nLogManager.GetLogger($"创意维度-{shopName}").Info($"创意名称识别失败 adId {adId} adName {adName} 提取的[sku]与创意Id相同"); continue; } - + var r0 = j["retrievalType0"]; insertList.Add(new JDPopularizeAdSku() { Id = idGenerator.NewLong(), @@ -170,15 +170,44 @@ namespace BBWY.Server.Business.Sync AdGroupId = j.Value("adGroupId"), AdId = long.Parse(adId), AdName = adName, - Date = DateTime.ParseExact(j.Value("date"), "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture), - Cost = j["retrievalType0"].Value("cost"), - Clicks = j["retrievalType0"].Value("clicks") ?? 0, - Impressions = j["retrievalType0"].Value("impressions") ?? 0, - TotalCartCnt = j["retrievalType0"].Value("totalCartCnt") ?? 0, - TotalOrderCnt = j["retrievalType0"].Value("totalOrderCnt") ?? 0, + Date = DateTime.ParseExact(r0.Value("date"), "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture), + Cost = r0.Value("cost"), + Clicks = r0.Value("clicks") ?? 0, + Impressions = r0.Value("impressions") ?? 0, + TotalCartCnt = r0.Value("totalCartCnt") ?? 0, + TotalOrderCnt = r0.Value("totalOrderCnt") ?? 0, Sku = sku, - VisitorCnt = j["retrievalType0"].Value("visitorCnt") ?? 0, - TotalOrderSum = j["retrievalType0"].Value("totalOrderSum") + VisitorCnt = r0.Value("visitorCnt") ?? 0, + TotalOrderSum = r0.Value("totalOrderSum"), + TotalOrderCVS = r0.Value("totalOrderCVS") ?? 0M, + CouponCnt = r0.Value("couponCnt") ?? 0, + CPA = r0.Value("CPA") ?? 0.00M, + CPC = r0.Value("CPC") ?? 0.00M, + CPM = r0.Value("CPM") ?? 0.00M, + CTR = r0.Value("CTR") ?? 0.00M, + DepthPassengerCnt = r0.Value("depthPassengerCnt") ?? 0, + DirectCartCnt = r0.Value("directCartCnt") ?? 0, + DirectOrderCnt = r0.Value("directOrderCnt") ?? 0, + DirectOrderSum = r0.Value("directOrderSum") ?? 0M, + GoodsAttentionCnt = r0.Value("goodsAttentionCnt") ?? 0, + IndirectCartCnt = r0.Value("indirectCartCnt") ?? 0, + IndirectOrderCnt = r0.Value("indirectOrderCnt") ?? 0, + IndirectOrderSum = r0.Value("indirectOrderSum") ?? 0, + NewCustomersCnt = r0.Value("newCustomersCnt") ?? 0, + OrderDate = DateTime.ParseExact(r0.Value("orderDate"), "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture), + Pin = r0.Value("pin"), + PreorderCnt = r0.Value("preorderCnt") ?? 0, + ShopAttentionCnt = r0.Value("shopAttentionCnt") ?? 0, + TotalCartCost = r0.Value("totalCartCost") ?? 0M, + TotalOrderROI = r0.Value("totalOrderROI") ?? 0M, + TotalPresaleOrderCnt = r0.Value("totalPresaleOrderCnt") ?? 0, + TotalPresaleOrderSum = r0.Value("totalPresaleOrderSum") ?? 0M, + VisitPageCnt = r0.Value("visitPageCnt") ?? 0, + VisitTimeAverage = r0.Value("visitTimeAverage") ?? 0M, + AdCreativeType = r0.Value("adCreativeType"), + AdCustomTitle = r0.Value("adCustomTitle"), + MaterialId = r0.Value("MaterialId") ?? 0, + MaterialSize = r0.Value("materialSize"), }); //Console.WriteLine(insertList.Count()); } diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs index 63eec634..ef9049e9 100644 --- a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs @@ -154,7 +154,38 @@ namespace BBWY.Server.Business.Sync Clicks = j.Value("clicks") ?? 0, Impressions = j.Value("impressions") ?? 0, TotalCartCnt = j.Value("totalCartCnt") ?? 0, - TotalOrderCnt = j.Value("totalOrderCnt") ?? 0 + TotalOrderCnt = j.Value("totalOrderCnt") ?? 0, + CampaignPutType = j.Value("campaignPutType"), + CampaignType = j.Value("campaignType"), + CampaignTypeExpand = j.Value("campaignTypeExpand"), + CouponCnt = j.Value("couponCnt") ?? 0, + CPA = j.Value("CPA") ?? 0.00M, + CPC = j.Value("CPC") ?? 0.00M, + CPM = j.Value("CPM") ?? 0.00M, + CTR = j.Value("CTR") ?? 0.00M, + DepthPassengerCnt = j.Value("depthPassengerCnt") ?? 0, + DirectCartCnt = j.Value("directCartCnt") ?? 0, + DirectOrderCnt = j.Value("directOrderCnt") ?? 0, + DirectOrderSum = j.Value("directOrderSum") ?? 0M, + GoodsAttentionCnt = j.Value("goodsAttentionCnt") ?? 0, + IndirectCartCnt = j.Value("indirectCartCnt") ?? 0, + IndirectOrderCnt = j.Value("indirectOrderCnt") ?? 0, + IndirectOrderSum = j.Value("indirectOrderSum") ?? 0, + NewCustomersCnt = j.Value("newCustomersCnt") ?? 0, + OrderDate = DateTime.ParseExact(j.Value("orderDate"), "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture), + Pin = j.Value("pin"), + PreorderCnt = j.Value("preorderCnt") ?? 0, + PutType = j.Value("putType"), + ShopAttentionCnt = j.Value("shopAttentionCnt") ?? 0, + TotalCartCost = j.Value("totalCartCost") ?? 0M, + TotalOrderCVS = j.Value("totalOrderCVS") ?? 0M, + TotalOrderROI = j.Value("totalOrderROI") ?? 0M, + TotalOrderSum = j.Value("totalOrderSum") ?? 0M, + TotalPresaleOrderCnt = j.Value("totalPresaleOrderCnt") ?? 0, + TotalPresaleOrderSum = j.Value("totalPresaleOrderSum") ?? 0M, + VisitorCnt = j.Value("visitorCnt") ?? 0, + VisitPageCnt = j.Value("visitPageCnt") ?? 0, + VisitTimeAverage = j.Value("visitTimeAverage") ?? 0M }); } if (insertList.Count > 0) diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs index 4c7a957d..5f49a135 100644 --- a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs @@ -149,7 +149,33 @@ namespace BBWY.Server.Business.Sync TotalCartCnt = j.Value("totalCartCnt") ?? 0, TotalOrderCnt = j.Value("totalOrderCnt") ?? 0, TotalOrderSum = j.Value("totalOrderSum"), - VisitorCnt = 0 + VisitorCnt = 0, + CTR = j.Value("CTR") ?? 0.00M, + DepthPassengerCnt = j.Value("depthPassengerCnt") ?? 0, + CPM = j.Value("CPM") ?? 0.00M, + SkuBrandId = j.Value("skuBrandId"), + PreorderCnt = j.Value("preorderCnt") ?? 0, + IndirectOrderCnt = j.Value("indirectOrderCnt") ?? 0, + DirectOrderCnt = j.Value("directOrderCnt") ?? 0, + IndirectCartCnt = j.Value("indirectCartCnt") ?? 0, + VisitPageCnt = j.Value("visitPageCnt") ?? 0, + VisitTimeAverage = j.Value("visitTimeAverage") ?? 0M, + TotalPresaleOrderSum = j.Value("totalPresaleOrderSum") ?? 0M, + TotalCartCost = j.Value("totalCartCost") ?? 0M, + DirectCartCnt = j.Value("directCartCnt") ?? 0, + SkuCid3 = j.Value("skuCid3"), + CouponCnt = j.Value("couponCnt") ?? 0, + SkuBrandName = j.Value("skuBrandName"), + NewCustomersCnt = j.Value("newCustomersCnt") ?? 0, + TotalOrderROI = j.Value("totalOrderROI") ?? 0M, + IndirectOrderSum = j.Value("indirectOrderSum") ?? 0, + DirectOrderSum = j.Value("directOrderSum") ?? 0M, + GoodsAttentionCnt = j.Value("goodsAttentionCnt") ?? 0, + TotalOrderCVS = j.Value("totalOrderCVS") ?? 0M, + CPC = j.Value("CPC") ?? 0.00M, + TotalPresaleOrderCnt = j.Value("totalPresaleOrderCnt") ?? 0, + ShopAttentionCnt = j.Value("shopAttentionCnt") ?? 0, + OrderDate = DateTime.ParseExact(j.Value("orderDate"), "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture) }).ToList(); fsql.Insert(insertList).ExecuteAffrows(); } diff --git a/BBWY.Server.Model/Db/JD/JDPopularizeAdGroup.cs b/BBWY.Server.Model/Db/JD/JDPopularizeAdGroup.cs index b7aa57f2..a8718bf6 100644 --- a/BBWY.Server.Model/Db/JD/JDPopularizeAdGroup.cs +++ b/BBWY.Server.Model/Db/JD/JDPopularizeAdGroup.cs @@ -1,4 +1,4 @@ -using FreeSql.DataAnnotations; +using FreeSql.DataAnnotations; using System; namespace BBWY.Server.Model.Db @@ -11,56 +11,149 @@ namespace BBWY.Server.Model.Db public partial class JDPopularizeAdGroup { - [Column(IsPrimary = true)] + [Column(DbType = "bigint", IsPrimary = true)] public long Id { get; set; } /// /// 单元Id /// - + [Column(DbType = "bigint")] public long? AdGroupId { get; set; } + /// + /// 单元名称 + /// [Column(StringLength = 100)] public string AdGroupName { get; set; } /// /// 业务线(快车:2 京速推:134217728) /// - + [Column(DbType = "int")] public int? BusinessType { get; set; } /// /// 计划Id /// - + [Column(DbType = "bigint")] public long? CampaignId { get; set; } /// /// 点击数 /// - [Column(Name = "clicks")] - public int? Clicks { get; set; } + [Column(Name = "clicks", DbType = "int")] + public int? Clicks { get; set; } = 0; /// /// 总花费 /// [Column(DbType = "decimal(18,2)")] - public decimal? Cost { get; set; } + public decimal? Cost { get; set; } = 0.00M; + + /// + /// 领券数 + /// + [Column(Name = "couponCnt", DbType = "int")] + public int? CouponCnt { get; set; } = 0; + + /// + /// CPA + /// + [Column(DbType = "decimal(18,2)")] + public decimal? CPA { get; set; } = 0.00M; + + /// + /// 平均点击成本 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? CPC { get; set; } = 0.00M; + + /// + /// 千次展现成本 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? CPM { get; set; } = 0.00M; [Column(DbType = "datetime")] public DateTime? CreateTime { get; set; } + /// + /// 点击率 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? CTR { get; set; } = 0.00M; + /// /// 计费日期 /// [Column(DbType = "datetime")] public DateTime? Date { get; set; } + /// + /// 深度进店数 + /// + [Column(Name = "depthPassengerCnt", DbType = "int")] + public int? DepthPassengerCnt { get; set; } = 0; + + /// + /// 直接购物车数 + /// + [Column(Name = "directCartCnt", DbType = "int")] + public int? DirectCartCnt { get; set; } = 0; + + /// + /// 直接订单行 + /// + [Column(Name = "directOrderCnt", DbType = "int")] + public int? DirectOrderCnt { get; set; } = 0; + + /// + /// 直接订单金额 + /// + [Column(Name = "directOrderSum", DbType = "decimal(18,2)")] + public decimal? DirectOrderSum { get; set; } = 0.00M; + + /// + /// 商品关注数 + /// + [Column(Name = "goodsAttentionCnt", DbType = "int")] + public int? GoodsAttentionCnt { get; set; } = 0; + /// /// 展现次数 /// - [Column(Name = "impressions")] - public int? Impressions { get; set; } + [Column(Name = "impressions", DbType = "int")] + public int? Impressions { get; set; } = 0; + + /// + /// 间接购物车数 + /// + [Column(Name = "indirectCartCnt", DbType = "int")] + public int? IndirectCartCnt { get; set; } = 0; + + /// + /// 间接订单行 + /// + [Column(Name = "indirectOrderCnt", DbType = "int")] + public int? IndirectOrderCnt { get; set; } = 0; + + /// + /// 间接订单金额 + /// + [Column(Name = "indirectOrderSum", DbType = "decimal(18,2)")] + public decimal? IndirectOrderSum { get; set; } = 0.00M; + + /// + /// 下单新客数 + /// + [Column(Name = "newCustomersCnt", DbType = "int")] + public int? NewCustomersCnt { get; set; } = 0; + + /// + /// 下单日期 + /// + [Column(Name = "orderDate", DbType = "datetime")] + public DateTime? OrderDate { get; set; } /// /// 账号归属 @@ -68,20 +161,86 @@ namespace BBWY.Server.Model.Db [Column(Name = "pin")] public string Pin { get; set; } + /// + /// 预约数 + /// + [Column(Name = "preorderCnt", DbType = "int")] + public int? PreorderCnt { get; set; } = 0; + + /// + /// 店铺关注数 + /// + [Column(Name = "shopAttentionCnt", DbType = "int")] + public int? ShopAttentionCnt { get; set; } = 0; + [Column(DbType = "bigint")] public long? ShopId { get; set; } /// /// 总加购人数 /// - [Column(Name = "totalCartCnt")] - public int? TotalCartCnt { get; set; } + [Column(Name = "totalCartCnt", DbType = "int")] + public int? TotalCartCnt { get; set; } = 0; + + /// + /// 总加购成本 + /// + [Column(Name = "totalCartCost", DbType = "decimal(18,2)")] + public decimal? TotalCartCost { get; set; } = 0.00M; /// /// 总订单数 /// - [Column(Name = "totalOrderCnt")] - public int? TotalOrderCnt { get; set; } + [Column(Name = "totalOrderCnt", DbType = "int")] + public int? TotalOrderCnt { get; set; } = 0; + + /// + /// 点击转化率 + /// + [Column(Name = "totalOrderCVS", DbType = "decimal(18,2)")] + public decimal? TotalOrderCVS { get; set; } = 0.00M; + + /// + /// ROI + /// + [Column(Name = "totalOrderROI", DbType = "decimal(18,2)")] + public decimal? TotalOrderROI { get; set; } = 0.00M; + + /// + /// 总订单金额 + /// + [Column(Name = "totalOrderSum", DbType = "decimal(18,2)")] + public decimal? TotalOrderSum { get; set; } = 0.00M; + + /// + /// 预售订单行 + /// + [Column(Name = "totalPresaleOrderCnt", DbType = "int")] + public int? TotalPresaleOrderCnt { get; set; } = 0; + + /// + /// 预售订单金额 + /// + [Column(Name = "totalPresaleOrderSum", DbType = "decimal(18,2)")] + public decimal? TotalPresaleOrderSum { get; set; } = 0.00M; + + /// + /// 访客数 + /// + [Column(Name = "visitorCnt", DbType = "int")] + public int? VisitorCnt { get; set; } = 0; + + /// + /// 访问页面数 + /// + [Column(Name = "visitPageCnt", DbType = "int")] + public int? VisitPageCnt { get; set; } = 0; + + /// + /// 访问时长 + /// + [Column(Name = "visitTimeAverage", DbType = "decimal(18,2)")] + public decimal? VisitTimeAverage { get; set; } = 0.00M; } diff --git a/BBWY.Server.Model/Db/JD/JDPopularizeAdSku.cs b/BBWY.Server.Model/Db/JD/JDPopularizeAdSku.cs index 6303915b..69baf11e 100644 --- a/BBWY.Server.Model/Db/JD/JDPopularizeAdSku.cs +++ b/BBWY.Server.Model/Db/JD/JDPopularizeAdSku.cs @@ -1,4 +1,4 @@ -using FreeSql.DataAnnotations; +using FreeSql.DataAnnotations; using System; namespace BBWY.Server.Model.Db @@ -11,62 +11,179 @@ namespace BBWY.Server.Model.Db public partial class JDPopularizeAdSku { - [Column(IsPrimary = true)] + [Column(DbType = "bigint", IsPrimary = true)] public long Id { get; set; } /// - /// 单元Id + /// 文档无解释 + /// + [Column(Name = "adCreativeType", StringLength = 50)] + public string AdCreativeType { get; set; } = "0"; + + /// + /// adCustomTitle无文档解释 /// + [Column(Name = "adCustomTitle")] + public string AdCustomTitle { get; set; } + /// + /// 单元Id + /// + [Column(DbType = "bigint")] public long? AdGroupId { get; set; } /// /// 创意Id /// - + [Column(DbType = "bigint")] public long? AdId { get; set; } + /// + /// 创意名称 + /// [Column(StringLength = 100)] public string AdName { get; set; } /// /// 业务线(快车:2 京速推:134217728) /// - + [Column(DbType = "int")] public int? BusinessType { get; set; } /// /// 计划Id /// - + [Column(DbType = "bigint")] public long? CampaignId { get; set; } /// /// 点击数 /// - [Column(Name = "clicks")] - public int? Clicks { get; set; } + [Column(Name = "clicks", DbType = "int")] + public int? Clicks { get; set; } = 0; /// /// 总花费 /// [Column(DbType = "decimal(18,2)")] - public decimal? Cost { get; set; } + public decimal? Cost { get; set; } = 0.00M; + + /// + /// 领券数 + /// + [Column(Name = "couponCnt", DbType = "int")] + public int? CouponCnt { get; set; } = 0; + + /// + /// CPA + /// + [Column(DbType = "decimal(18,2)")] + public decimal? CPA { get; set; } = 0.00M; + + /// + /// 平均点击成本 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? CPC { get; set; } = 0.00M; + + /// + /// 千次展现成本 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? CPM { get; set; } = 0.00M; [Column(DbType = "datetime")] public DateTime? CreateTime { get; set; } + /// + /// 点击率 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? CTR { get; set; } = 0.00M; + /// /// 计费日期 /// [Column(DbType = "datetime")] public DateTime? Date { get; set; } + /// + /// 深度进店数 + /// + [Column(Name = "depthPassengerCnt", DbType = "int")] + public int? DepthPassengerCnt { get; set; } = 0; + + /// + /// 直接购物车数 + /// + [Column(Name = "directCartCnt", DbType = "int")] + public int? DirectCartCnt { get; set; } = 0; + + /// + /// 直接订单行 + /// + [Column(Name = "directOrderCnt", DbType = "int")] + public int? DirectOrderCnt { get; set; } = 0; + + /// + /// 直接订单金额 + /// + [Column(Name = "directOrderSum", DbType = "decimal(18,2)")] + public decimal? DirectOrderSum { get; set; } = 0.00M; + + /// + /// 商品关注数 + /// + [Column(Name = "goodsAttentionCnt", DbType = "int")] + public int? GoodsAttentionCnt { get; set; } = 0; + /// /// 展现次数 /// - [Column(Name = "impressions")] - public int? Impressions { get; set; } + [Column(Name = "impressions", DbType = "int")] + public int? Impressions { get; set; } = 0; + + /// + /// 间接购物车数 + /// + [Column(Name = "indirectCartCnt", DbType = "int")] + public int? IndirectCartCnt { get; set; } = 0; + + /// + /// 间接订单行 + /// + [Column(Name = "indirectOrderCnt", DbType = "int")] + public int? IndirectOrderCnt { get; set; } = 0; + + /// + /// 间接订单金额 + /// + [Column(Name = "indirectOrderSum", DbType = "decimal(18,2)")] + public decimal? IndirectOrderSum { get; set; } = 0.00M; + + /// + /// materialId无文档解释 + /// + [Column(Name = "materialId", DbType = "bigint")] + public long? MaterialId { get; set; } = 0; + + /// + /// materialSize文档无解释 + /// + [Column(Name = "materialSize", StringLength = 100)] + public string MaterialSize { get; set; } + + /// + /// 下单新客数 + /// + [Column(Name = "newCustomersCnt", DbType = "int")] + public int? NewCustomersCnt { get; set; } = 0; + + /// + /// 下单日期 + /// + [Column(Name = "orderDate", DbType = "datetime")] + public DateTime? OrderDate { get; set; } /// /// 账号归属 @@ -74,38 +191,111 @@ namespace BBWY.Server.Model.Db [Column(Name = "pin")] public string Pin { get; set; } + /// + /// 预约数 + /// + [Column(Name = "preorderCnt", DbType = "int")] + public int? PreorderCnt { get; set; } = 0; + + [Column(StringLength = 50)] + public string ProductId { get; set; } + + /// + /// 店铺关注数 + /// + [Column(Name = "shopAttentionCnt", DbType = "int")] + public int? ShopAttentionCnt { get; set; } = 0; + [Column(DbType = "bigint")] public long? ShopId { get; set; } [Column(StringLength = 50)] public string Sku { get; set; } - [Column(StringLength = 50)] - public string ProductId { get; set; } + /// + /// 品牌ID + /// + [Column(Name = "skuBrandId", StringLength = 50)] + public string SkuBrandId { get; set; } + + /// + /// sku品牌名称 + /// + [Column(Name = "skuBrandName", StringLength = 50)] + public string SkuBrandName { get; set; } + + /// + /// SKU三级类目Id + /// + [Column(Name = "skuCid3", StringLength = 50)] + public string SkuCid3 { get; set; } /// /// 总加购人数 /// - [Column(Name = "totalCartCnt")] - public int? TotalCartCnt { get; set; } + [Column(Name = "totalCartCnt", DbType = "int")] + public int? TotalCartCnt { get; set; } = 0; + + /// + /// 总加购成本 + /// + [Column(Name = "totalCartCost", DbType = "decimal(18,2)")] + public decimal? TotalCartCost { get; set; } = 0.00M; /// /// 总订单数 /// - [Column(Name = "totalOrderCnt")] - public int? TotalOrderCnt { get; set; } + [Column(Name = "totalOrderCnt", DbType = "int")] + public int? TotalOrderCnt { get; set; } = 0; + + /// + /// 点击转化率 + /// + [Column(Name = "totalOrderCVS", DbType = "decimal(18,2)")] + public decimal? TotalOrderCVS { get; set; } = 0.00M; + + /// + /// ROI + /// + [Column(Name = "totalOrderROI", DbType = "decimal(18,2)")] + public decimal? TotalOrderROI { get; set; } = 0.00M; /// /// 总订单金额 /// - [Column(Name = "totalOrderSum")] - public decimal TotalOrderSum { get; set; } + [Column(Name = "totalOrderSum", DbType = "decimal(11,2)")] + public decimal? TotalOrderSum { get; set; } = 0.00M; + + /// + /// 预售订单行 + /// + [Column(Name = "totalPresaleOrderCnt", DbType = "int")] + public int? TotalPresaleOrderCnt { get; set; } = 0; + + /// + /// 预售订单金额 + /// + [Column(Name = "totalPresaleOrderSum", DbType = "decimal(18,2)")] + public decimal? TotalPresaleOrderSum { get; set; } = 0.00M; /// /// 访客数 /// - [Column(Name = "visitorCnt")] - public int VisitorCnt { get; set; } + [Column(Name = "visitorCnt", DbType = "int")] + public int? VisitorCnt { get; set; } = 0; + + /// + /// 访问页面数 + /// + [Column(Name = "visitPageCnt", DbType = "int")] + public int? VisitPageCnt { get; set; } = 0; + + /// + /// 访问时长 + /// + [Column(Name = "visitTimeAverage", DbType = "decimal(18,2)")] + public decimal? VisitTimeAverage { get; set; } = 0.00M; + } } diff --git a/BBWY.Server.Model/Db/JD/JDPopularizeCampaign.cs b/BBWY.Server.Model/Db/JD/JDPopularizeCampaign.cs index 946dd97e..bf6e19bb 100644 --- a/BBWY.Server.Model/Db/JD/JDPopularizeCampaign.cs +++ b/BBWY.Server.Model/Db/JD/JDPopularizeCampaign.cs @@ -1,4 +1,4 @@ -using FreeSql.DataAnnotations; +using FreeSql.DataAnnotations; using System; namespace BBWY.Server.Model.Db @@ -11,28 +11,50 @@ namespace BBWY.Server.Model.Db public partial class JDPopularizeCampaign { - [Column(IsPrimary = true)] + [Column(DbType = "bigint", IsPrimary = true)] public long Id { get; set; } /// /// 业务线(快车:2 京速推:134217728) /// - + [Column(DbType = "int")] public int? BusinessType { get; set; } /// /// 计划Id /// + [Column(DbType = "bigint")] public long? CampaignId { get; set; } + /// + /// 计划名称 + /// [Column(StringLength = 100)] public string CampaignName { get; set; } + /// + /// 文档无解释 + /// + [Column(Name = "campaignPutType", DbType = "int")] + public int? CampaignPutType { get; set; } + + /// + /// 计划类型 + /// + [Column(Name = "campaignType", DbType = "int")] + public int? CampaignType { get; set; } = 0; + + /// + /// 计划类型 + /// + [Column(Name = "campaignTypeExpand", DbType = "int")] + public int? CampaignTypeExpand { get; set; } = 0; + /// /// 点击数 /// - [Column(Name = "clicks")] - public int? Clicks { get; set; } + [Column(Name = "clicks", DbType = "int")] + public int? Clicks { get; set; } = 0; /// /// 总花费 @@ -40,20 +62,110 @@ namespace BBWY.Server.Model.Db [Column(DbType = "decimal(18,2)")] public decimal? Cost { get; set; } + /// + /// 领券数 + /// + [Column(Name = "couponCnt", DbType = "int")] + public int? CouponCnt { get; set; } = 0; + + /// + /// CPA + /// + [Column(DbType = "decimal(18,2)")] + public decimal? CPA { get; set; } = 0.00M; + + /// + /// 平均点击成本 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? CPC { get; set; } = 0.00M; + + /// + /// 千次展现成本 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? CPM { get; set; } = 0.00M; + [Column(DbType = "datetime")] public DateTime? CreateTime { get; set; } + /// + /// 点击率 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? CTR { get; set; } = 0.00M; + /// /// 计费日期 /// [Column(DbType = "datetime")] public DateTime? Date { get; set; } + /// + /// 深度进店数 + /// + [Column(Name = "depthPassengerCnt", DbType = "int")] + public int? DepthPassengerCnt { get; set; } = 0; + + /// + /// 直接购物车数 + /// + [Column(Name = "directCartCnt", DbType = "int")] + public int? DirectCartCnt { get; set; } = 0; + + /// + /// 直接订单行 + /// + [Column(Name = "directOrderCnt", DbType = "int")] + public int? DirectOrderCnt { get; set; } = 0; + + /// + /// 直接订单金额 + /// + [Column(Name = "directOrderSum", DbType = "decimal(18,2)")] + public decimal? DirectOrderSum { get; set; } = 0.00M; + + /// + /// 商品关注数 + /// + [Column(Name = "goodsAttentionCnt", DbType = "int")] + public int? GoodsAttentionCnt { get; set; } = 0; + /// /// 展现次数 /// - [Column(Name = "impressions")] - public int? Impressions { get; set; } + [Column(Name = "impressions", DbType = "int")] + public int? Impressions { get; set; } = 0; + + /// + /// 间接购物车数 + /// + [Column(Name = "indirectCartCnt", DbType = "int")] + public int? IndirectCartCnt { get; set; } = 0; + + /// + /// 间接订单行 + /// + [Column(Name = "indirectOrderCnt", DbType = "int")] + public int? IndirectOrderCnt { get; set; } = 0; + + /// + /// 间接订单金额 + /// + [Column(Name = "indirectOrderSum", DbType = "decimal(18,2)")] + public decimal? IndirectOrderSum { get; set; } = 0.00M; + + /// + /// 下单新客数 + /// + [Column(Name = "newCustomersCnt", DbType = "int")] + public int? NewCustomersCnt { get; set; } = 0; + + /// + /// 下单日期 + /// + [Column(Name = "orderDate", DbType = "datetime")] + public DateTime? OrderDate { get; set; } /// /// 账号归属 @@ -61,20 +173,92 @@ namespace BBWY.Server.Model.Db [Column(Name = "pin")] public string Pin { get; set; } + /// + /// 预约数 + /// + [Column(Name = "preorderCnt", DbType = "int")] + public int? PreorderCnt { get; set; } = 0; + + /// + /// 文档无解释 + /// + [Column(Name = "putType", StringLength = 100)] + public string PutType { get; set; } + + /// + /// 店铺关注数 + /// + [Column(Name = "shopAttentionCnt", DbType = "int")] + public int? ShopAttentionCnt { get; set; } = 0; + [Column(DbType = "bigint")] public long? ShopId { get; set; } /// /// 总加购人数 /// - [Column(Name = "totalCartCnt")] - public int? TotalCartCnt { get; set; } + [Column(Name = "totalCartCnt", DbType = "int")] + public int? TotalCartCnt { get; set; } = 0; + + /// + /// 总加购成本 + /// + [Column(Name = "totalCartCost", DbType = "decimal(18,2)")] + public decimal? TotalCartCost { get; set; } = 0.00M; /// /// 总订单数 /// - [Column(Name = "totalOrderCnt")] - public int? TotalOrderCnt { get; set; } + [Column(Name = "totalOrderCnt", DbType = "int")] + public int? TotalOrderCnt { get; set; } = 0; + + /// + /// 点击转化率 + /// + [Column(Name = "totalOrderCVS", DbType = "decimal(18,2)")] + public decimal? TotalOrderCVS { get; set; } = 0.00M; + + /// + /// ROI + /// + [Column(Name = "totalOrderROI", DbType = "decimal(18,2)")] + public decimal? TotalOrderROI { get; set; } = 0.00M; + + /// + /// 总订单金额 + /// + [Column(Name = "totalOrderSum", DbType = "decimal(18,2)")] + public decimal? TotalOrderSum { get; set; } = 0.00M; + + /// + /// 预售订单行 + /// + [Column(Name = "totalPresaleOrderCnt", DbType = "int")] + public int? TotalPresaleOrderCnt { get; set; } = 0; + + /// + /// 预售订单金额 + /// + [Column(Name = "totalPresaleOrderSum", DbType = "decimal(18,2)")] + public decimal? TotalPresaleOrderSum { get; set; } = 0.00M; + + /// + /// 访客数 + /// + [Column(Name = "visitorCnt", DbType = "int")] + public int? VisitorCnt { get; set; } = 0; + + /// + /// 访问页面数 + /// + [Column(Name = "visitPageCnt", DbType = "int")] + public int? VisitPageCnt { get; set; } = 0; + + /// + /// 访问时长 + /// + [Column(Name = "visitTimeAverage", DbType = "decimal(18,2)")] + public decimal? VisitTimeAverage { get; set; } = 0.00M; }