1记住后台登陆的用户信息

2店铺统计展示
3可选预售设置失败下架

AllBase/AllBase.csproj

@@ -159,6 +159,7 @@
     <Compile Include="CommonPassword.cs" />
     <Compile Include="ConvertExtension.cs" />
     <Compile Include="EnumHelper.cs" />
+    <Compile Include="Extension\Extensions.cs" />
     <Compile Include="Extension\JTokenExtension.cs" />
     <Compile Include="Extension\LinqExtension.cs" />
     <Compile Include="FileBase.cs" />

AllBase/BaseClass.cs

@@ -27,7 +27,7 @@ namespace AllBase
         /// <summary>
         /// 版本ID
         /// </summary>
-        public static int VersionCount = 832;
+        public static int VersionCount = 836;
         //public static int VersionCount = 613;
 
         /// <summary>

AllBase/Extension/Extensions.cs

@@ -0,0 +1,101 @@
+using NaiBa.Util.Extension;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Extension
+{
+    public static class Extensions
+    {
+        public static long? ParseToNullableLong(this object obj)
+        {
+            if (obj == null)
+                return null;
+
+            try
+            {
+                string str = obj.ParseToString();
+                if (string.IsNullOrEmpty(str))
+                {
+                    return null;
+                }
+                return long.Parse(str);
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        public static int? ParseToNullableInt(this object str)
+        {
+            if (str == null)
+                return null;
+
+            try
+            {
+                return Convert.ToInt32(str);
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        public static decimal? ParseToNullableDecimal(this object str)
+        {
+            try
+            {
+                if (str == null)
+                    return null;
+                return decimal.Parse(str.ToString());
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        public static DateTime? ParseToNullableDateTime(this string str)
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(str))
+                {
+                    return null;
+                }
+                if (str.Contains("-") || str.Contains("/"))
+                {
+                    return DateTime.Parse(str);
+                }
+                else
+                {
+                    int length = str.Length;
+                    switch (length)
+                    {
+                        case 4:
+                            return DateTime.ParseExact(str, "yyyy", System.Globalization.CultureInfo.CurrentCulture);
+                        case 6:
+                            return DateTime.ParseExact(str, "yyyyMM", System.Globalization.CultureInfo.CurrentCulture);
+                        case 8:
+                            return DateTime.ParseExact(str, "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture);
+                        case 10:
+                            return DateTime.ParseExact(str, "yyyyMMddHH", System.Globalization.CultureInfo.CurrentCulture);
+                        case 12:
+                            return DateTime.ParseExact(str, "yyyyMMddHHmm", System.Globalization.CultureInfo.CurrentCulture);
+                        case 14:
+                            return DateTime.ParseExact(str, "yyyyMMddHHmmss", System.Globalization.CultureInfo.CurrentCulture);
+                        default:
+                            return DateTime.ParseExact(str, "yyyyMMddHHmmss", System.Globalization.CultureInfo.CurrentCulture);
+                    }
+                }
+            }
+            catch
+            {
+                return null;
+            }
+        }
+    }
+}

AllBase/Model/Config/WxShopMainStatistics.cs

@@ -73,6 +73,10 @@ namespace AllBase.Model.Config
         public string Notes { get; set; }
         public string GroupName { get; set; }
 
+        public int? ProdCount { get; set; }
+        public decimal? curScoreValue {get;set;}
+        public DateTime lastRefreshDate { get; set; } = DateTime.MinValue;
+
         /// <summary>
         /// 主页店铺信息
         /// </summary>
@@ -90,6 +94,8 @@ namespace AllBase.Model.Config
         /// </summary>
         public WxShopSaleStatisticsInfo WxShopSaleInfo30Day { get; set; } = new WxShopSaleStatisticsInfo();
 
+        public WxAmount WxShopAmount { get; set; } = new WxAmount();
+
         public string err_msg;
     }
 
@@ -128,4 +134,29 @@ namespace AllBase.Model.Config
 
         public DateTime LastRefreshDate { get; set; }
     }
+
+    public class WxAmount
+    {
+        /// <summary>
+        /// 总货款
+        /// </summary>
+        public int? totalAmount { get; set; }
+        /// <summary>
+        /// 可提现
+        /// </summary>
+        public int? availableAmount { get; set; }
+        /// <summary>
+        /// 待结算
+        /// </summary>
+        public int? pendingAmount { get; set; }
+
+        public int? tempFrozenAmount { get; set; }
+
+        /// <summary>
+        /// 保证金，在另一个接口获取
+        /// </summary>
+        public int? DepositBalance { get; set; }
+
+        public DateTime LastRefreshDate { get; set; }
+    }
 }

AllBase/Model/Result/ShopLoginInfo.cs

@@ -90,12 +90,13 @@ namespace AllBase.Model.Result
             }
         }
         public string GroupName { get; set; }
+        public DateTime AddTime { get; set; }
         public string LastRefreshDate { get; set; }
         public string AccessToken { get { return CurrentAuthInfo?.AccessToken; } }
         public string RefreshToken { get { return CurrentAuthInfo?.RefreshToken; } }
         public string AppKey { get { return CurrentAuthInfo?.AppKey; } }
-        public DateTime AddTime { get { return CurrentAuthInfo?.AddTime == null ? new DateTime() : CurrentAuthInfo.AddTime; } }
-        public DateTime ExpiresTime { get { return CurrentAuthInfo?.ExpiresTime == null ? new DateTime() : CurrentAuthInfo.ExpiresTime; } }
+        public DateTime AuthAddTime { get { return CurrentAuthInfo?.AddTime == null ? new DateTime() : CurrentAuthInfo.AddTime; } }
+        public DateTime AuthExpiresTime { get { return CurrentAuthInfo?.ExpiresTime == null ? new DateTime() : CurrentAuthInfo.ExpiresTime; } }
         /// <summary>
         /// 店铺运费模板
         /// </summary>