完成wish广告费用列表服务

Bailun.DC.Models/dc_base_finance_wish.cs

@@ -144,6 +144,12 @@ namespace Bailun.DC.Models
         /// </summary>		
         public int account_id { get; set; }
 
+
+        /// <summary>
+        /// 帐号名称
+        /// </summary>
+        public string account_name { get; set; }
+
         /// <summary>
         /// 
         /// </summary>		
@@ -174,6 +180,8 @@ namespace Bailun.DC.Models
         /// </summary>		
         public decimal daily_total_campaign_spend { get; set; }
 
+        public decimal daily_total_campaign_spend_rmb { get; set; }
+
         /// <summary>
         /// 
         /// </summary>		

Bailun.DC.Services/OrdersServices.cs

@@ -4546,7 +4546,7 @@ namespace Bailun.DC.Services
         public List<dc_base_finance_wish> ListWishAD(BtTableParameter parameter,int? companyid, string account_name, DateTime? start, DateTime? end, ref int total,bool isUSD)
         {
             var sqlparam = new DynamicParameters();
-            var sql = $"select t1.campaign_name,t2.account_name,t1.daily_total_campaign_spend,(t1.daily_total_campaign_spend*{(isUSD? "t1.other_to_usd_exchange_rate":"t1.other_to_cny_exchange_rate")}) daily_total_campaign_spend from dc_base_finance_wish t1 join dc_base_company_account t2 on t1.account_id=t2.account_id where 1=1 ";
+            var sql = $"select t1.campaign_name,t2.account_name,t1.daily_total_campaign_spend,(t1.daily_total_campaign_spend*{(isUSD? "t1.other_to_usd_exchange_rate":"t1.other_to_cny_exchange_rate")}) daily_total_campaign_spend_rmb,t1.record_time from dc_base_finance_wish t1 join dc_base_company_account t2 on t1.account_id=t2.account_id where 1=1 ";
 
             if (companyid.HasValue && companyid.Value > 0)
             {
@@ -4596,7 +4596,7 @@ namespace Bailun.DC.Services
         public dc_base_finance_wish ListWishADCount(int? companyid, string account_name, DateTime? start, DateTime? end, bool isUSD)
         {
             var sqlparam = new DynamicParameters();
-            var sql = $"select sum(t1.daily_total_campaign_spend) daily_total_campaign_spend,sum(t1.daily_total_campaign_spend*{(isUSD ? "t1.other_to_usd_exchange_rate" : "t1.other_to_cny_exchange_rate")}) daily_total_campaign_spend from dc_base_finance_wish t1 join dc_base_company_account t2 on t1.account_id=t2.account_id  where 1=1 ";
+            var sql = $"select sum(t1.daily_total_campaign_spend) daily_total_campaign_spend,sum(t1.daily_total_campaign_spend*{(isUSD ? "t1.other_to_usd_exchange_rate" : "t1.other_to_cny_exchange_rate")}) daily_total_campaign_spend_rmb from dc_base_finance_wish t1 join dc_base_company_account t2 on t1.account_id=t2.account_id  where 1=1 ";
 
             if (companyid.HasValue && companyid.Value > 0)
             {

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

@@ -2263,15 +2263,34 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <param name="account">帐号</param>
         /// <returns></returns>
         [BailunAuthentication(LoginMode.Enforce)]
-        public string WishADJson(BtTableParameter parameter, DateTime? start, DateTime? end, string account,)
+        public string WishADJson(BtTableParameter parameter, DateTime? start, DateTime? end, string account,string currency)
         {
             var total = 0;
             var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
+            var _service = new Services.OrdersServices();
 
-            var obj = new Services.OrdersServices().ListWishAD(parameter,companyid,account,start,end,ref total,)
-
+            var obj = _service.ListWishAD(parameter, companyid, account, start, end, ref total, currency.ToUpper() == "USD");
+            var countObj = _service.ListWishADCount(companyid, account, start, end, currency.ToUpper() == "USD");
+            var list = obj.Select(a => new {
+                a.account_name,
+                a.campaign_name,
+                a.daily_gmv,
+                daily_total_campaign_spend = a.daily_total_campaign_spend.ToString("N2"),
+                daily_total_campaign_spend_rmb = a.daily_total_campaign_spend_rmb.ToString("N2"),
+                record_time = a.record_time.ToString("yyyy-MM-dd"),
+            });
 
-            return "";
+            return JsonConvert.SerializeObject(new {
+                total = total,
+                rows = list,
+                count_row = new
+                {
+                    campaign_name = "总计",
+                    daily_total_campaign_spend = countObj.daily_total_campaign_spend.ToString("N2"),
+                    daily_total_campaign_spend_rmb = countObj.daily_total_campaign_spend_rmb.ToString("N2")
+                },
+                companyid
+            });
         }