Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Common/Plugin/ConvertHelper.cs

@@ -215,6 +215,29 @@ namespace Mall.Common
             return timeStr;
         }
 
+
+        /// <summary>
+        /// 获取时间格式(yyyy-MM)
+        /// </summary>
+        /// <param name="time"></param>
+        /// <returns></returns>
+        public static string FormatYearMonth(this object time)
+        {
+            string timeStr = "";
+            if (time != null)
+            {
+                try
+                {
+                    timeStr = Convert.ToDateTime(time.ToString()).ToString("yyyy-MM");
+                }
+                catch
+                {
+
+                }
+            }
+            return timeStr;
+        }
+
         /// <summary>
         /// 获取时间格式
         /// </summary>

Mall.WebApi/Controllers/Product/ProductController.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using Mall.AOP;
 using Mall.Common.API;
+using Mall.Common.Enum.Goods;
+using Mall.Common.Plugin;
 using Mall.Model.Extend.Product;
-using Mall.Module.User;
+using Mall.Module.Product;
 using Mall.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
-using Mall.Common.Plugin;
-using Mall.Common.Enum.User;
-using Mall.CacheManager.User;
 using Newtonsoft.Json.Linq;
-using Mall.Common;
-using Mall.Module.Product;
-using Mall.AOP;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Configuration.Json;
-using Mall.Common.Enum.Goods;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Mall.WebApi.Controllers.MallBase
 {
@@ -1831,7 +1824,7 @@ namespace Mall.WebApi.Controllers.MallBase
                     model?.goodsLogo,
                     model?.GoodsEduType,
                     model?.MaterialId,
-                    RelevanceList= model?.RelevanceList.Select(qitem => new { qitem.RelevanceId, qitem.RelevanceName, qitem.RelevancePrice, qitem.Unit })
+                    RelevanceList = model?.RelevanceList.Select(qitem => new { qitem.RelevanceId, qitem.RelevanceName, qitem.RelevancePrice, qitem.Unit })
                 };
             }
             return ApiResult.Success("", obj);
@@ -3247,5 +3240,91 @@ namespace Mall.WebApi.Controllers.MallBase
             return result ? ApiResult.Success("") : ApiResult.Failed("加入到商品列表失败");
         }
         #endregion
+
+        /// <summary>
+        /// 把分享平台的商品加入商品列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult CreateSkuCalendar()
+        {
+            List<object> list = new List<object>();
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            string startDate = parms.GetStringValue("StartDate");
+            string endDate = parms.GetStringValue("EndDate");
+
+            if (string.IsNullOrEmpty(startDate))
+            {
+                startDate = Common.ConvertHelper.FormatDate(DateTime.Now);
+                endDate = Common.ConvertHelper.FormatDate(DateTime.Now.AddMonths(1));
+            }
+
+            DateTime start = Convert.ToDateTime(startDate);
+            DateTime end = Convert.ToDateTime(endDate);
+            List<StockItem> stockList = new List<StockItem>();
+            int days = (end - start).Days;
+            DateTime todayDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+            for (var i = 0; i <= days; i++)
+            {
+                var newDateTime = start.AddDays(i);
+                stockList.Add(new StockItem()
+                {
+                    Year = newDateTime.Year,
+                    Month = newDateTime.Month,
+                    Day = newDateTime.Day,
+                    DayStr = Common.ConvertHelper.FormatDate(newDateTime),
+                    YearMonth = Common.ConvertHelper.FormatYearMonth(newDateTime),
+                    IsEdit = newDateTime > todayDate
+                });
+            }
+
+            var yearMonthList = stockList
+                ?.GroupBy(qitem => new { qitem.Year, qitem.Month, qitem.YearMonth })
+                ?.Select(qitem => new { qitem.Key.Year, qitem.Key.Month, qitem.Key.YearMonth });
+            foreach (var rItem in yearMonthList)
+            {
+                list.Add(new
+                {
+                    rItem.YearMonth,
+                    DateList = stockList?.Where(qitem => qitem.Year == rItem.Year && qitem.Month == rItem.Month)?.ToList() ?? new List<StockItem>()
+                });
+            }
+            return ApiResult.Success(data: list);
+        }
+    }
+
+    /// <summary>
+    /// 库存项
+    /// </summary>
+    public class StockItem
+    {
+        /// <summary>
+        /// 年
+        /// </summary>
+        public int Year { get; set; }
+
+        /// <summary>
+        /// 月
+        /// </summary>
+        public int Month { get; set; }
+
+        /// <summary>
+        /// 日
+        /// </summary>
+        public int Day { get; set; }
+
+        /// <summary>
+        /// yyyy-MM
+        /// </summary>
+        public string YearMonth { get; set; }
+
+        /// <summary>
+        /// 天
+        /// </summary>
+        public string DayStr { get; set; }
+
+        /// <summary>
+        /// 是否可编辑
+        /// </summary>
+        public  bool IsEdit { get; set; }
     }
 }
\ No newline at end of file