平台利润统计的退款数据改为从订单表取

Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs

@@ -1408,14 +1408,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     item.profit_rate = Math.Round((item.profit_total / item.amount_sales), 2);
                 }
                 
-                item.amount_refund = 0;
-                item.amount_refund_rate = 0;
-                var objRefund = listRefund.Where(a => a.platform_type == item.platform_type).FirstOrDefault();
-                if (objRefund != null)
-                {
-                    item.amount_refund = objRefund.amount_refund;
-                    item.amount_refund_rate = (item.amount_sales>0?item.amount_refund/item.amount_sales:0);
-                }
+                //item.amount_refund = 0;
+                //item.amount_refund_rate = 0;
+                //var objRefund = listRefund.Where(a => a.platform_type == item.platform_type).FirstOrDefault();
+                //if (objRefund != null)
+                //{
+                //    item.amount_refund = objRefund.amount_refund;
+                //    item.amount_refund_rate = (item.amount_sales>0?item.amount_refund/item.amount_sales:0);
+                //}
 
                 //利润减去退款
                 item.profit_total = (item.profit_total - item.amount_refund);
@@ -2221,6 +2221,31 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             return File(ms, "text/csv", filename + ".csv");
         }
 
+        /// <summary>
+        /// Wish 广告费
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult WishAD()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// Wish广告费数据
+        /// </summary>
+        /// <param name="parameter"></param>
+        /// <param name="start">开始时间</param>
+        /// <param name="end">结束时间</param>
+        /// <param name="account">帐号</param>
+        /// <returns></returns>
+        [BailunAuthentication(LoginMode.Enforce)]
+        public string WishADJson(BtTableParameter parameter, DateTime? start, DateTime? end, string account)
+        {
+
+            return "";
+        }
+
+
         #endregion
 
         #region Paypal费