增加FBA的发货数据

Bailun.DC.Services/OrdersServices.cs

@@ -4543,20 +4543,20 @@ namespace Bailun.DC.Services
         /// <param name="total">符合条件的总记录数</param>
         /// <param name="isUSD">是否美元</param>
         /// <returns></returns>
-        public List<dc_base_finance_wish> ListWishAD(BtTableParameter parameter,int? companyid, int? account_id, DateTime? start, DateTime? end, ref int total,bool isUSD)
+        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 left 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 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)
             {
                 sql += " and t1.company_id="+companyid.Value;
             }
 
-            if (account_id.HasValue && account_id.Value > 0)
+            if (!string.IsNullOrEmpty(account_name))
             {
-                sql += " and t1.account_id=@account_id";
-                sqlparam.Add("account_id", account_id);
+                sql += " and t2.account_name=@account_name";
+                sqlparam.Add("account_name", account_name);
             }
 
             if (start.HasValue)
@@ -4593,20 +4593,20 @@ namespace Bailun.DC.Services
         /// <param name="end">结束时间</param>
         /// <param name="isUSD">是否美元</param>
         /// <returns></returns>
-        public dc_base_finance_wish ListWishADCount(int? companyid, int? account_id, DateTime? start, DateTime? end, bool isUSD)
+        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 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 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)
             {
                 sql += " and t1.company_id=" + companyid.Value;
             }
 
-            if (account_id.HasValue && account_id.Value > 0)
+            if (!string.IsNullOrEmpty(account_name))
             {
-                sql += " and t1.account_id=@account_id";
-                sqlparam.Add("account_id", account_id);
+                sql += " and t2.account_name=@account_name";
+                sqlparam.Add("account_name", account_name);
             }
 
             if (start.HasValue)

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

@@ -2263,8 +2263,13 @@ 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,)
         {
+            var total = 0;
+            var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
+
+            var obj = new Services.OrdersServices().ListWishAD(parameter,companyid,account,start,end,ref total,)
+
 
             return "";
         }