增加功能:Shopify 广告费

Bailun.DC.Services/OrdersServices.cs

@@ -6597,6 +6597,38 @@ namespace Bailun.DC.Services
             
         }
 
+        #endregion
+
+        #region Shopify
+
+        public decimal ShopifyAD(DateTime? start, DateTime? end, bool isUSD)
+        {
+            var sqlparam = new DynamicParameters();
+            var sql = $" select round(sum(fee * {(isUSD ? "1" : "cny_exchange_rate")}),2) as fee from dc_base_finance_shopify_fee where status = 0";
+
+            if (start.HasValue)
+            {
+                sql += " and bdate >= @bdate";
+                sqlparam.Add("bdate", start.Value.Date);
+            }
+
+            if (end.HasValue)
+            {
+                sql += " and edate < @edate";
+                sqlparam.Add("edate", end.Value.Date.AddDays(1));
+            }
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
+            {
+                if (cn.State == System.Data.ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                var obj = cn.QueryFirstOrDefault<decimal?>(sql, sqlparam, null, 2 * 60) ?? 0;
+                return obj;
+            }
+        }
 
         #endregion
 

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

@@ -1645,6 +1645,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             //Add by Allan at 20210608 for Ebay 新接口
             var ebayADFeeNew = new dc_base_ebay_transaction(); //Ebay 新广告费
             var ebayPutAwayNew = new dc_base_ebay_transaction(); //Ebay 上架费
+
+            decimal shopifyFee = 0; //Shopify 广告费
+
             var ADfeeTypeNew = new string[] {
                     "AD_FEE"
                 };
@@ -1832,6 +1835,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     ebayADFeeNew = _service.EbayADFeeNew(companyid, dtstart, dtend, ADfeeTypeNew, null, "", "", currency.ToUpper() == "USD", "", producttype, skusource, shippingstrategy, platform, website);
                     ebayPutAwayNew = _service.EbayADFeeNew(companyid, dtstart, dtend, PutAwayFeeTypeNew, null, "", "", currency.ToUpper() == "USD", "", producttype, skusource, shippingstrategy, platform, website);
                     //End Add
+
+                    shopifyFee = _service.ShopifyAD(dtstart, dtend, currency.ToUpper() == "USD");
                 }
                 else
                 {
@@ -1881,6 +1886,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     ebayADFeeNew = _service.EbayADFeeNew(companyid, dtstart, dtend, ADfeeTypeNew, null, "", "", currency.ToUpper() == "USD", "", producttype, skusource, shippingstrategy, platform, website);
                     ebayPutAwayNew = _service.EbayADFeeNew(companyid, dtstart, dtend, PutAwayFeeTypeNew, null, "", "", currency.ToUpper() == "USD", "", producttype, skusource, shippingstrategy, platform, website);
                     //End Add
+
+                    shopifyFee = _service.ShopifyAD(dtstart, dtend, currency.ToUpper() == "USD");
                 }
                 else
                 {
@@ -2051,6 +2058,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                         item.profit_total = (item.profit_total - item.adfee ?? 0);
                         item.profit_rate = (item.amount_sales - item.amount_prepaid) != 0 ? Math.Round((item.profit_total / (item.amount_sales - item.amount_prepaid)), 2) : 0;
                     }
+
+                    else if (item.platform_type.ToLower() == "shopify")  //Shopify广告费
+                    {
+                        item.adfee = shopifyFee;
+                    }
                 }
                 else if (statistictype == 1)
                 {

Bailun.DC.Web/Base/BaseController.cs

@@ -262,7 +262,7 @@ namespace Bailun.DC.Web.Base
                 paramdata = "",
                 hashcode = "",
                 filekey = "",
-
+                createtime = DateTime.Now,
                 datatype = datatype  //1=销售平台
             };