接口增加返回昨日itemno订单利润率

Bailun.DC.Models/mItemNoProfitRate.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models
+{
+    /// <summary>
+    /// 获取itemno的20天利润率和1天利润率
+    /// </summary>
+    public class mItemNoProfitRate
+    {
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public DateTime day { get; set; }
+
+        public string item_id { get; set; }
+
+        /// <summary>
+        /// 20天广告订单利润率
+        /// </summary>
+        public decimal rate_order_ad { get; set; }
+
+        /// <summary>
+        /// 20天自然订单利润率
+        /// </summary>
+        public decimal rate_order { get; set; }
+
+        /// <summary>
+        /// 20天全部订单利润率
+        /// </summary>
+        public decimal rate_all { get; set; }
+
+        /// <summary>
+        /// 1天广告订单利润率
+        /// </summary>
+        public decimal rate_order_ad_1day { get; set; }
+
+        /// <summary>
+        /// 1天自然订单利润率
+        /// </summary>
+        public decimal rate_order_1day { get; set; }
+
+        /// <summary>
+        /// 1天全部订单利润率
+        /// </summary>
+        public decimal rate_all_1day { get; set; }
+
+    }
+}

Bailun.DC.Services/OrdersServices.cs

@@ -7498,7 +7498,7 @@ namespace Bailun.DC.Services
         /// <param name="itemid"></param>
         /// <param name="day"></param>
         /// <returns></returns>
-        public List<dc_daily_item_profit_rate> ListItemNoProfitRate(List<string> itemid, DateTime day)
+        public List<mItemNoProfitRate> ListItemNoProfitRate(List<string> itemid, DateTime day)
         {
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
             {
@@ -7508,8 +7508,16 @@ namespace Bailun.DC.Services
                 }
 
 
-                var sql = $@"select * from dc_daily_item_profit_rate where day='{day.ToString("yyyy-MM-dd")}' and item_id in ('{string.Join("','", itemid)}')";
-                return cn.Query<dc_daily_item_profit_rate>(sql).ToList();
+                var sql = $@"select t1.day,t1.item_id,t1.rate_order_ad,t1.rate_order,t1.rate_all,t2.rate_order_ad as rate_order_ad_1day,t2.rate_order as rate_order_1day,t2.rate_all as rate_all_1day from dc_daily_item_profit_rate t1 
+                    left join dc_daily_item_oneday_profit_rate t2 on t1.item_id=t2.item_id and t1.day=t2.day
+                     where t1.day='{day.ToString("yyyy-MM-dd")}'";
+
+                if(itemid.Count>0)
+                {
+                    sql+= $@" and t1.item_id in ('{string.Join("','", itemid)}')";
+                }
+
+                return cn.Query<mItemNoProfitRate>(sql).ToList();
             }
 
         }

Bailun.DC.Web/Controllers/ApiController.cs

@@ -949,22 +949,11 @@ namespace Bailun.DC.Web.Controllers
         [HttpPost]
         public JsonResult GetItemNoProfitRate(string itemids)
         {
-            if(string.IsNullOrEmpty(itemids))
-            {
-                return Json(new
-                {
-                    success = false,
-                    msg = "itemids不能为空"
-                });
-            }
+            var arr = new List<string>();
 
-            var arr = itemids.Split(",").Where(a => !string.IsNullOrEmpty(a)).ToList();
-            if(arr.Count==0)
+            if (!string.IsNullOrEmpty(itemids))
             {
-                return Json(new { 
-                    success = false,
-                    msg = "itemids不能为空"
-                });
+                arr = itemids.Split(",").Where(a => !string.IsNullOrEmpty(a)).ToList();
             }
 
             var obj = new Services.OrdersServices().ListItemNoProfitRate(arr, DateTime.Now.AddDays(-1));