调整Ebay Uk站点配货比例统计报表

Bailun.DC.Models/Ebay/ebayUKLogistics.cs

@@ -18,29 +18,14 @@ namespace Bailun.DC.Models.Ebay
         public string origin_order_id { get; set; }
 
         /// <summary>
-        /// 物流单号
+        /// 平台分配发货仓库
         /// </summary>
-        public string tracking_order_id { get; set; }
+        public string logistics_warehouse_code { get; set; }
 
         /// <summary>
-        /// 发货状态
+        /// 订单预计发货渠道
         /// </summary>
-        public string shipping_status { get; set; }
-
-        /// <summary>
-        /// 发货仓库编码
-        /// </summary>
-        public string warehouse_code { get; set; }
-
-        /// <summary>
-        /// 物流渠道编号
-        /// </summary>
-        public string logistics_order_id { get; set; }
-
-        /// <summary>
-        /// 物流渠道名称
-        /// </summary>
-        public string logistics_order_name { get; set; }
+        public string logistics_method_code { get; set; }
 
     }
 }

Bailun.DC.Services/OrdersServices.cs

@@ -1824,14 +1824,11 @@ namespace Bailun.DC.Services
         public List<Models.Ebay.ebayUKLogistics> ListEbayUKLogistics(DateTime start, DateTime end)
         {
             var sqlparam = new DynamicParameters();
-            var sql = $@"select t2.seller_account,t1.* from (
-                                    select t1.origin_order_id,t1.tracking_order_id,shipping_status,warehouse_code,logistics_order_id,logistics_order_name 
-                                    from dc_base_oms_pick t1
-                                    join dc_ebay_report_uk_config t4 on t1.logistics_order_id=t4.config_value and t4.type>1
-                                    where t1.shipping_time>='{start.ToString("yyyy-MM-dd")}' and t1.shipping_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'
-                                    group by t1.origin_order_id,t1.tracking_order_id,shipping_status,warehouse_code,logistics_order_id,logistics_order_name) t1
-                                    join dc_base_oms_order t2 on t1.origin_order_id=t2.origin_order_id and t2.website='uk'  and t2.platform_type='Ebay' and t2.bailun_payment_status!='Canceled'
-                                    join dc_ebay_report_uk_config t3 on t2.seller_account=t3.config_value and t3.type=1";
+            var sql = $@"select t1.seller_account,t1.origin_order_id,t1.logistics_warehouse_code,t1.logistics_method_code from dc_base_oms_order t1
+                                    join dc_ebay_report_uk_config t2 on t2.type>1 and t1.logistics_method_code=t2.config_value
+                                    join dc_ebay_report_uk_config t3 on t3.type=1 and t1.seller_account=t3.config_value
+                                    where t1.platform_type='Ebay' and t1.website='uk' and t1.bailun_payment_status!='Canceled'
+                                    and t1.paid_time>='{start.ToString("yyyy-MM-dd")}' and t1.paid_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
 
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
             {
@@ -1840,7 +1837,7 @@ namespace Bailun.DC.Services
                     cn.Open();
                 }
 
-                var list = cn.Query<Models.Ebay.ebayUKLogistics>(sql).AsList();
+                var list = cn.Query<Models.Ebay.ebayUKLogistics>(sql,null,null,true,2*60).AsList();
 
                 return list;
             }

Bailun.DC.Web/Areas/Logistics/Controllers/HomeController.cs

@@ -41,13 +41,13 @@ namespace Bailun.DC.Web.Areas.Logistics.Controllers
                 var m = new Models.Ebay.mEBayUKReport();
                 m.seller_account = item.Key;
                 m.ordercount = item.Count();
-                m.zsurfacemailcount = item.Where(a => listconfig.Where(b => b.type == 2).Select(c => c.config_value).Contains(a.logistics_order_id)).Count();
-                m.zpackagecount = item.Where(a => listconfig.Where(b => b.type == 3).Select(c => c.config_value).Contains(a.logistics_order_id)).Count();
+                m.zsurfacemailcount = item.Where(a => listconfig.Where(b => b.type == 2).Select(c => c.config_value).Contains(a.logistics_method_code)).Count();
+                m.zpackagecount = item.Where(a => listconfig.Where(b => b.type == 3).Select(c => c.config_value).Contains(a.logistics_method_code)).Count();
                 m.zcount = m.zsurfacemailcount + m.zpackagecount;
                 m.percenz = decimal.Parse((((decimal)m.zcount / (decimal)m.ordercount)*100).ToString("#0.00"));
 
-                m.hsurfacemailcount = item.Where(a => listconfig.Where(b => b.type == 4).Select(c => c.config_value).Contains(a.logistics_order_id)).Count();
-                m.hpackagecount = item.Where(a => listconfig.Where(b => b.type == 5).Select(c => c.config_value).Contains(a.logistics_order_id)).Count();
+                m.hsurfacemailcount = item.Where(a => listconfig.Where(b => b.type == 4).Select(c => c.config_value).Contains(a.logistics_method_code)).Count();
+                m.hpackagecount = item.Where(a => listconfig.Where(b => b.type == 5).Select(c => c.config_value).Contains(a.logistics_method_code)).Count();
                 m.hcount = m.hsurfacemailcount + m.hpackagecount;
                 m.percenh = decimal.Parse((((decimal)m.hcount / (decimal)m.ordercount)*100).ToString("#0.00"));
 

Bailun.DC.Web/Areas/Logistics/Views/Home/EbayUkReport.cshtml

@@ -11,7 +11,7 @@
             <form id="toolbar">
                 <div class="form-inline" style="line-height:40px;">
                     <div class="form-group">
-                        <label>发货时间</label>
+                        <label>付款时间</label>
                         <input id="start" name="start" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"))" />至
                         <input id="end" name="end" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"))" />
                     </div>
@@ -122,11 +122,13 @@
                 return false;
             }
 
+            var index = layer.load();
             $.submit({
                 type: 'POST',
                 url: '@Url.Content("~/Logistics/Home/EbayUkReportJson")',
                 paramData: $("#toolbar").serialize(),
                 func: function (result) {
+                    layer.close(index);
                     if (result && result.length > 0) {
                         $('#tb').html('');
                         for (var i = 0; i < result.length; i++) {