Merge branch 'develop'

CoreCms.Net.Auth/AuthorizationSetup.cs

@@ -82,7 +82,7 @@ namespace CoreCms.Net.Auth
                 ValidateAudience = true, //是否验证Audience
                 ValidAudience = audience,//订阅人
                 ValidateLifetime = true,//是否验证失效时间
-                ClockSkew = TimeSpan.FromSeconds(60),
+                ClockSkew = TimeSpan.FromSeconds(4),
                 RequireExpirationTime = true,
             };
 
@@ -166,7 +166,7 @@ namespace CoreCms.Net.Auth
                 issuer,//发行人
                 audience,//听众
                 signingCredentials,//签名凭据
-                expiration: TimeSpan.FromSeconds(60 * 60 * 24)//接口的过期时间
+                expiration: TimeSpan.FromSeconds(60 * 60 * 24 * 30)//接口的过期时间
                 );
             #endregion
 
@@ -187,7 +187,7 @@ namespace CoreCms.Net.Auth
                 ValidateAudience = true, //是否验证Audience
                 ValidAudience = audience,//订阅人
                 ValidateLifetime = true, //是否验证失效时间
-                ClockSkew = TimeSpan.FromSeconds(60),
+                ClockSkew = TimeSpan.FromSeconds(4),
                 RequireExpirationTime = true,
             };
 

CoreCms.Net.Auth/CoreCms.Net.Auth.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.6" />
+	  <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.9" />
 	  <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
   </ItemGroup>
 

CoreCms.Net.Auth/Policys/ApiResponseForClientHandler.cs

@@ -42,7 +42,7 @@ namespace CoreCms.Net.Auth.Policys
             jm.status = false;
             jm.code = 14007;
             jm.data = 14007;
-            jm.msg = "很抱歉，授权失效，请重新登录!";
+            jm.msg = "很抱歉，授权失效401，请重重试!";
             await Response.WriteAsync(JsonConvert.SerializeObject(jm));
         }
 
@@ -56,7 +56,7 @@ namespace CoreCms.Net.Auth.Policys
             jm.status = false;
             jm.code = 14007;
             jm.data = 14007;
-            jm.msg = "很抱歉，授权失效，请重新登录!";
+            jm.msg = "很抱歉，授权失效403，请重重试!";
             await Response.WriteAsync(JsonConvert.SerializeObject(jm));
 
         }

CoreCms.Net.Auth/Policys/JwtToken.cs

@@ -43,7 +43,7 @@ namespace CoreCms.Net.Auth.Policys
             var encodedJwt = new JwtSecurityTokenHandler().WriteToken(jwt);
 
             //打包返回前台
-            var responseJson = new
+            var responseJson = new JwtTokenResponseJson
             {
                 success = true,
                 token = encodedJwt,
@@ -53,4 +53,18 @@ namespace CoreCms.Net.Auth.Policys
             return responseJson;
         }
     }
+
+    /// <summary>
+    /// JwtToken生成返回
+    /// </summary>
+    public class JwtTokenResponseJson
+    {
+        public bool success { get; set; }
+        public string token { get; set; }
+        public double expires_in { get; set; }
+        public string token_type { get; set; }
+
+    }
+
+
 }

CoreCms.Net.Auth/Policys/PermissionForAdminHandler.cs

@@ -9,13 +9,6 @@
  ***********************************************************************/
 
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using CoreCms.Net.Configuration;
 using CoreCms.Net.IServices;
 using CoreCms.Net.Utility.Extensions;
@@ -24,6 +17,12 @@ using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
 namespace CoreCms.Net.Auth.Policys
 {
@@ -43,7 +42,7 @@ namespace CoreCms.Net.Auth.Policys
         /// 构造函数注入
         /// </summary>
         /// <param name="schemes"></param>
-        /// <param name="navigationRepository"></param>
+        /// <param name="sysRoleMenuServices"></param>
         /// <param name="accessor"></param>
         public PermissionForAdminHandler(IAuthenticationSchemeProvider schemes
             , ISysRoleMenuServices sysRoleMenuServices

CoreCms.Net.Caching/AutoMate/RedisCache/IRedisOperationRepository.cs

@@ -10,21 +10,110 @@ namespace CoreCms.Net.Caching.AutoMate.RedisCache
     /// </summary>
     public interface IRedisOperationRepository
     {
+        /// <summary>
+        /// 延长锁(续约)
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <param name="cacheTime"></param>
+        /// <returns></returns>
+        bool LockExtend(string key, string value, TimeSpan cacheTime);
 
-        //获取 Reids 缓存值
+        /// <summary>
+        /// 延长锁(续约)
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <param name="cacheTime"></param>
+        /// <returns></returns>
+        Task<bool> LockExtendAsync(string key, string value, TimeSpan cacheTime);
+
+        /// <summary>
+        /// 释放锁
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        bool LockRelease(string key, string value);
+
+        /// <summary>
+        /// 释放锁
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        Task<bool> LockReleaseAsync(string key, string value);
+
+        /// <summary>
+        /// 获取锁
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <param name="cacheTime"></param>
+        /// <returns></returns>
+        public bool LockTake(string key, string value, TimeSpan cacheTime);
+        
+        /// <summary>
+        /// 获取锁
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <param name="cacheTime"></param>
+        /// <returns></returns>
+        public Task<bool> LockTakeAsync(string key, string value, TimeSpan cacheTime);
+
+
+        /// <summary>
+        /// 获取值
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
         Task<string> Get(string key);
 
+        RedisValue StringGet(string key);
+
+        /// <summary>
+        /// 搜索获取匹配Key
+        /// </summary>
+        /// <param name="pattern"></param>
+        /// <returns></returns>
+        List<string> SearchKey(string pattern);
+
         //获取值，并序列化
         Task<TEntity> Get<TEntity>(string key);
 
         //保存
-        Task Set(string key, object value, TimeSpan cacheTime);
+        Task<bool> StringSetAsync(string key, string value, TimeSpan cacheTime);
+
+        bool StringSet(string key, string value, TimeSpan cacheTime);
+         
+        bool StringSet(string key, string value);
+
+        bool StringSet(string key, RedisValue value);
+
+        bool StringSet(string key, RedisValue value, TimeSpan cacheTime);
+
+
+        Task SetAsync(string key, object value, TimeSpan cacheTime);
+
+        Task<long> StringIncrement(string key, long value=1);
+
 
         //判断是否存在
-        Task<bool> Exist(string key);
+        Task<bool> KeyExistsAsync(string key);
+
+        bool KeyExists(string key);
+
+        /// <summary>
+        /// 获取键 过期时间
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        Task<TimeSpan?> KeyTime(string key);
 
         //移除某一个缓存值
-        Task Remove(string key);
+        Task KeyDeleteAsync(string key);
+        void KeyDelete(string key);
 
         //全部清除
         Task Clear();
@@ -131,26 +220,46 @@ namespace CoreCms.Net.Caching.AutoMate.RedisCache
         Task ListClearAsync(string redisKey);
 
 
-
         /// <summary>
-        /// 有序集合/定时任务延迟队列用的多（直接传分钟）
+        /// 有序集合/定时任务延迟队列用的多
         /// </summary>
         /// <param name="redisKey">key</param>
         /// <param name="redisValue">元素</param>
         /// <param name="score">分数</param>
-        Task SortedSetAddAsync(string redisKey, string redisValue, double score);
+        Task<bool> SortedSetAddAsync(string redisKey, string redisValue, double score);
-
 
         /// <summary>
-        /// 有序集合/定时任务延迟队列用的多（直接传时间）
+        /// 插入zset
         /// </summary>
-        /// <param name="redisKey">key</param>
+        /// <param name="key">key</param>
-        /// <param name="redisValue">元素</param>
+        /// <param name="msg">消息</param>
-        /// <param name="dt">时间</param>
+        /// <param name="time">延迟执行时间</param>
-        Task SortedSetAddAsync(string redisKey, string redisValue, DateTime dt);
+        /// <returns></returns>
+        Task<bool> SortedSetAddAsync(string key, string msg, DateTime time);
 
-        #region 会员陌小北（QQ：1078350533） 添加的 几个有序集合功能
+        /// <summary>
+        /// 返回有序集合中指定成员的索引
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        Task<long?> SortedSetRankAsync(string key, string value);
 
+        /// <summary>
+        /// 返回有序集合中的分数
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        Task<double?> SortedSetScoreAsync(string key, string value);
+
+        /// <summary>
+        /// 返回有序集合中的分数
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        double? SortedSetScore(string key, string value);
         /// <summary>
         /// 返回有序列表里的数据
         /// </summary>
@@ -170,6 +279,7 @@ namespace CoreCms.Net.Caching.AutoMate.RedisCache
         Task<long> SortedSetRemoveRangeByRankAsync(string redisKey, int start, int stop);
 
 
+        
         /// <summary>
         /// 返回有序列表里的指定范围数量
         /// </summary>
@@ -177,9 +287,9 @@ namespace CoreCms.Net.Caching.AutoMate.RedisCache
         /// <param name="start">0 是第一个</param>
         /// <param name="stop">最大分数值</param>
         /// <returns></returns>
-        Task<long> SortedSetLengthAsync(string redisKey, int start, int stop);
+        Task<long> SortedSetLengthAsync(string redisKey, long min, long max);
+
 
-        #endregion
         
     }
 }

CoreCms.Net.Caching/AutoMate/RedisCache/RedisOperationRepository.cs

@@ -6,6 +6,7 @@ using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using StackExchange.Redis;
 
+
 namespace CoreCms.Net.Caching.AutoMate.RedisCache
 {
     public class RedisOperationRepository : IRedisOperationRepository
@@ -39,22 +40,162 @@ namespace CoreCms.Net.Caching.AutoMate.RedisCache
             }
         }
 
-        public async Task<bool> Exist(string key)
+
+        /// <summary>
+        /// 获取锁
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <param name="cacheTime"></param>
+        /// <returns></returns>
+        public bool LockTake(string key, string value, TimeSpan cacheTime)
         {
+            return _database.LockTake(key, value, cacheTime);
+
+        }
+
+        /// <summary>
+        /// 异步获取锁
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <param name="cacheTime"></param>
+        /// <returns></returns>
+        public async Task<bool> LockTakeAsync(string key, string value, TimeSpan cacheTime)
+        {
+            return await _database.LockTakeAsync(key, value, cacheTime);
+        }
+
+        /// <summary>
+        /// 延长锁(续约)
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <param name="cacheTime"></param>
+        /// <returns></returns>
+
+        public bool LockExtend(string key, string value, TimeSpan cacheTime)
+        {
+            return _database.LockExtend(key, value, cacheTime);
+        }
+
+        /// <summary>
+        /// 延长锁(续约)
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <param name="cacheTime"></param>
+        /// <returns></returns>
+
+        public async Task<bool> LockExtendAsync(string key, string value, TimeSpan cacheTime)
+        {
+            return await _database.LockExtendAsync(key, value, cacheTime);
+        }
+
+        /// <summary>
+        /// 释放锁
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public bool LockRelease(string key, string value)
+        {
+            return _database.LockRelease(key, value);
+        }
+
+        /// <summary>
+        /// 异步释放锁
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public async Task<bool> LockReleaseAsync(string key, string value)
+        {
+            return await _database.LockReleaseAsync(key, value);
+        }
+
+
+        /// <summary>
+        /// 判断key是否存在
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public async Task<bool> KeyExistsAsync(string key)
+        {
+            
             return await _database.KeyExistsAsync(key);
         }
 
+        /// <summary>
+        /// 判断key是否存在
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public bool KeyExists(string key)
+        {
+
+            return  _database.KeyExists(key);
+        }
+
+
+        /// <summary>
+        /// 获取键过期时间
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public async Task<TimeSpan?> KeyTime(string key)
+        {
+           
+            return await _database.KeyTimeToLiveAsync(key);
+        }
+
+
         public async Task<string> Get(string key)
         {
             return await _database.StringGetAsync(key);
         }
 
-        public async Task Remove(string key)
+        public RedisValue StringGet(string key)
+        {
+            return  _database.StringGet(key);
+        }
+
+        /// <summary>
+        /// 搜索匹配Key
+        /// </summary>
+        /// <param name="pattern"></param>
+        /// <returns></returns>
+        public List<string> SearchKey(string pattern)
+        {
+
+            var list = new List<string>();
+            var script = "return redis.call('keys',@pattern)";
+            var prepared = LuaScript.Prepare(script);
+            var redisResult = _database.ScriptEvaluate(prepared, new { pattern });
+            if (!redisResult.IsNull)
+            {
+                foreach (var key in (RedisKey[])redisResult)
+                {
+                    
+                    list.Add(key);
+                }
+            }
+            return list;
+
+        }
+
+        public async Task KeyDeleteAsync(string key)
         {
             await _database.KeyDeleteAsync(key);
         }
 
-        public async Task Set(string key, object value, TimeSpan cacheTime)
+        public void KeyDelete(string key)
+        {
+            _database.KeyDelete(key);
+        }
+
+
+        public async Task SetAsync(string key, object value, TimeSpan cacheTime)
         {
             if (value != null)
             {
@@ -63,6 +204,65 @@ namespace CoreCms.Net.Caching.AutoMate.RedisCache
             }
         }
 
+
+        public async Task<bool> StringSetAsync(string key, string value, TimeSpan cacheTime)
+        {
+            
+           return await _database.StringSetAsync(key, value, cacheTime);
+
+        }
+
+
+
+        public  bool StringSet(string key, string value, TimeSpan cacheTime)
+        {
+
+             return _database.StringSet(key, value, cacheTime);
+
+        }
+
+
+        public bool StringSet(string key, string value)
+        {
+
+            return _database.StringSet(key, value);
+
+        }
+
+
+        public bool StringSet(string key, RedisValue value, TimeSpan cacheTime)
+        {
+
+            return _database.StringSet(key, value, cacheTime);
+
+        }
+
+
+        public bool StringSet(string key, RedisValue value)
+        {
+
+            return _database.StringSet(key, value);
+
+        }
+
+
+
+        /// <summary>
+        /// Increment 递增
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public async Task<long> StringIncrement(string key, long value=1)
+        {
+
+           return await _database.StringIncrementAsync(key, value);
+
+        }
+
+
+
+
         public async Task<TEntity> Get<TEntity>(string key)
         {
             var value = await _database.StringGetAsync(key);
@@ -77,6 +277,9 @@ namespace CoreCms.Net.Caching.AutoMate.RedisCache
             }
         }
 
+
+
+
         /// <summary>
         /// 根据key获取RedisValue
         /// </summary>
@@ -229,29 +432,70 @@ namespace CoreCms.Net.Caching.AutoMate.RedisCache
 
 
         /// <summary>
-        /// 有序集合/定时任务延迟队列用的多（直接传分钟）
+        /// 有序集合/定时任务延迟队列用的多
         /// </summary>
         /// <param name="redisKey">key</param>
         /// <param name="redisValue">元素</param>
         /// <param name="score">分数</param>
-        public async Task SortedSetAddAsync(string redisKey, string redisValue, double score)
+        public async Task<bool> SortedSetAddAsync(string redisKey, string redisValue, double score)
         {
-            await _database.SortedSetAddAsync(redisKey, redisValue, score);
+           return await _database.SortedSetAddAsync(redisKey, redisValue, score);
         }
 
         /// <summary>
-        /// 有序集合/定时任务延迟队列用的多（直接传时间）
+        /// 添加到有序集合 用时间
         /// </summary>
-        /// <param name="redisKey">key</param>
+        /// <param name="key"></param>
-        /// <param name="redisValue">元素</param>
+        /// <param name="msg"></param>
-        /// <param name="dt">时间</param>
+        /// <param name="time"></param>
-        public async Task SortedSetAddAsync(string redisKey, string redisValue, DateTime dt)
+        /// <returns></returns>
+
+        public async Task<bool> SortedSetAddAsync(string key, string msg, DateTime time)
         {
-            var score = (dt.ToUniversalTime().Ticks - 621355968000000000) / 10000000;
+            var score = (time.ToUniversalTime().Ticks - 621355968000000000) / 10000000;
-            await _database.SortedSetAddAsync(redisKey, redisValue, score);
+            var bl = await _database.SortedSetAddAsync(key, msg, score);
+            //When.NotExists 不更新 直接添加
+            return bl;
+        }
+
+
+
+        #region 小北 添加的 几个有序集合功能
+
+        /// <summary>
+        /// 获取有序集合索引
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public async Task<long?> SortedSetRankAsync(string key, string value)
+        {
+           var result= await _database.SortedSetRankAsync(key,value);
+
+            return result;
+        }
+
+        /// <summary>
+        /// 返回有序集中，成员的分数值。 如果成员元素不是有序集 key 的成员，或 key 不存在，返回 null
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public async Task<double?> SortedSetScoreAsync(string key, string value)
+        {
+            var result = await _database.SortedSetScoreAsync(key, value);
+
+            return result;
+        }
+
+
+        public double? SortedSetScore(string key, string value)
+        {
+            var result = _database.SortedSetScore(key, value);
+
+            return result;
         }
 
-        #region 会员陌小北（QQ：1078350533） 添加的 几个有序集合功能
 
         /// <summary>
         /// 返回有序列表里的数据
@@ -262,12 +506,16 @@ namespace CoreCms.Net.Caching.AutoMate.RedisCache
         /// <returns></returns>
         public async Task<IEnumerable<string>> SortedSetRangeByRankAsync(string redisKey, int start, int stop)
         {
-            var result = await _database.SortedSetRangeByRankAsync(redisKey, start, stop);
+            var result= await _database.SortedSetRangeByRankAsync(redisKey, start, stop);
+
+           
 
             return result.Select(o => o.ToString());
 
         }
 
+
+       
         /// <summary>
         /// 移出序列表里的指定范围数量
         /// </summary>
@@ -287,13 +535,12 @@ namespace CoreCms.Net.Caching.AutoMate.RedisCache
         /// <param name="start">0 是第一个</param>
         /// <param name="stop">最大分数值</param>
         /// <returns></returns>
-        public async Task<long> SortedSetLengthAsync(string redisKey, int start, int stop)
+        public async Task<long> SortedSetLengthAsync(string redisKey, long min, long max)
         {
-            return await _database.SortedSetLengthAsync(redisKey, start, stop);
+            return await _database.SortedSetLengthAsync(redisKey, min, max);
 
         }
 
-        #endregion 会员陌小北（QQ：1078350533） 添加的 几个有序集合功能
+        #endregion 小北 添加的 几个有序集合功能
-
     }
 }

CoreCms.Net.Caching/CoreCms.Net.Caching.csproj

@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.15.0" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.17.0" />
-    <PackageReference Include="StackExchange.Redis" Version="2.6.48" />
+    <PackageReference Include="StackExchange.Redis" Version="2.6.66" />
   </ItemGroup>
 
   <ItemGroup>

CoreCms.Net.Caching/SqlSugar/SqlSugarRedisCache.cs

@@ -12,11 +12,13 @@ namespace CoreCms.Net.Caching.SqlSugar
 {
     public class SqlSugarRedisCache : ICacheService
     {
-        readonly RedisCacheManager _service = null;
+        //readonly RedisCacheManager _service = null;
+
+        static readonly RedisCacheManager _service = new RedisCacheManager();
 
         public SqlSugarRedisCache()
         {
-            _service = new RedisCacheManager(); ;
+            //_service = new RedisCacheManager(); ;
         }
 
         public void Add<TV>(string key, TV value)

CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj

@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="DotLiquid" Version="2.2.656" />
-    <PackageReference Include="sqlSugarCore" Version="5.0.9.1" />
+    <PackageReference Include="sqlSugarCore" Version="5.1.3.1" />
   </ItemGroup>
 
   <ItemGroup>

CoreCms.Net.CodeGenerator/CrudTemplete/View/Edit.tpl

@@ -7,8 +7,8 @@
                 <input name="{{field.DbColumnName}}" id="{{field.DbColumnName}}Input" lay-verType="tips" lay-verify="required" class="layui-input"  value="{% raw %}{{{% endraw %}d.params.data.{{field.DbColumnName}} || '' {% raw %}}}{% endraw %}" placeholder="请上传{{field.ColumnDescription}}" lay-reqText="请上传{{field.ColumnDescription}}"  />
             </div>
 		    <div class="layui-input-inline">
-                <img class="coreshop-upload-img" id="viewImgBox{{field.DbColumnName}}" src="{% raw %}{{{% endraw %}d.params.data.{{field.DbColumnName}} || layui.setter.noImagePicUrl {% raw %}}}{% endraw %}">
                 <button type="button" class="layui-btn" id="upBtn{{field.DbColumnName}}" lay-active="doCropperImg">上传图片</button>
+                <img class="coreshop-upload-img" id="viewImgBox{{field.DbColumnName}}" src="{% raw %}{{{% endraw %}d.params.data.{{field.DbColumnName}} || layui.setter.noImagePicUrl {% raw %}}}{% endraw %}">
             </div>
         </div>{% elsif field.DataType == 'nvarchar' %}
 	    <div class="layui-form-item">

CoreCms.Net.Configuration/AppSettingsConstVars.cs

@@ -132,40 +132,6 @@ namespace CoreCms.Net.Configuration
         public static readonly string PayCallBackAlipayRefundUrl = AppSettingsHelper.GetContent("PayCallBack", "AlipayRefundUrl");
         #endregion
 
-
-        #region 易联云打印机================================================================================
-
-        /// <summary>
-        /// 是否开启
-        /// </summary>
-        public static readonly bool YiLianYunConfigEnabled = AppSettingsHelper.GetContent("YiLianYunConfig", "Enabled").ObjToBool();
-        /// <summary>
-        /// 应用ID
-        /// </summary>
-        public static readonly string YiLianYunConfigClientId = AppSettingsHelper.GetContent("YiLianYunConfig", "ClientId");
-        /// <summary>
-        /// 应用密钥
-        /// </summary>
-        public static readonly string YiLianYunConfigClientSecret = AppSettingsHelper.GetContent("YiLianYunConfig", "ClientSecret");
-        /// <summary>
-        /// 打印机设备号
-        /// </summary>
-        public static readonly string YiLianYunConfigMachineCode = AppSettingsHelper.GetContent("YiLianYunConfig", "MachineCode");
-        /// <summary>
-        /// 打印机终端密钥
-        /// </summary>
-        public static readonly string YiLianYunConfigMsign = AppSettingsHelper.GetContent("YiLianYunConfig", "Msign");
-        /// <summary>
-        /// 打印机名称
-        /// </summary>
-        public static readonly string YiLianYunConfigPrinterName = AppSettingsHelper.GetContent("YiLianYunConfig", "PrinterName");
-        /// <summary>
-        /// 打印机设置联系方式
-        /// </summary>
-        public static readonly string YiLianYunConfigPhone = AppSettingsHelper.GetContent("YiLianYunConfig", "Phone");
-
-        #endregion
-
         #region HangFire定时任务================================================================================
         /// <summary>
         /// 登录账号

CoreCms.Net.Configuration/GlobalConstVars.cs

@@ -415,9 +415,6 @@ namespace CoreCms.Net.Configuration
         public const string TransactionComponentAfterSaleCreateSync = "TransactionComponentAfterSaleCreateSyncQueue";
         
 
-
-
-
         //用户相关
 
         //订单支付成功后，用户升级处理
@@ -428,6 +425,10 @@ namespace CoreCms.Net.Configuration
         //发送微信模板消息
         public const string MessageSendWxMessageTemplet = "MessageSendWxMessageTempletQueue";
 
+        /// <summary>
+        /// 支付宝支付成功后推送到接口进行数据处理
+        /// </summary>
+        public const string AliPayNotice = "AliPayNoticeQueue";
 
     }
 

CoreCms.Net.Configuration/GlobalEnumVars.cs

@@ -617,7 +617,7 @@ namespace CoreCms.Net.Configuration
             /// 秒杀
             /// </summary>
             [Description("秒杀")]
-            Skill = 4,
+            Seckill = 4,
             /// <summary>
             /// 砍价
             /// </summary>
@@ -1043,7 +1043,7 @@ namespace CoreCms.Net.Configuration
             /// 秒杀
             /// </summary>
             [Description("秒杀")]
-            Skill = 4,
+            Seckill = 4,
             /// <summary>
             /// 砍价
             /// </summary>

CoreCms.Net.Configuration/GlobalErrorCodeVars.cs

@@ -432,6 +432,7 @@ namespace CoreCms.Net.Configuration
         public const string Code15612 = "货品折扣后价格已经小于0元";
         public const string Code15613 = "您不能参加自己的开团";
         
+
         //微信消息
         public const string Code16001 = "请输入标题";
         public const string Code16002 = "请先填写内容";
@@ -546,6 +547,7 @@ namespace CoreCms.Net.Configuration
         public const string Code21006 = "货品折扣后价格已经小于0";
 
 
+
         //会员管理 -21000
 
         //商品管理 -22000

CoreCms.Net.Core/AOP/RedisCacheAop.cs

@@ -78,7 +78,7 @@ namespace CoreCms.Net.Core.AOP
                     }
                     response ??= string.Empty;
 
-                    _cache.Set(cacheKey, response, TimeSpan.FromMinutes(qCachingAttribute.AbsoluteExpiration)).Wait();
+                    _cache.SetAsync(cacheKey, response, TimeSpan.FromMinutes(qCachingAttribute.AbsoluteExpiration)).Wait();
                 }
             }
             else

CoreCms.Net.Core/Config/CorsSetup.cs

@@ -34,7 +34,8 @@ namespace CoreCms.Net.Core.Config
                     c.AddPolicy(AppSettingsConstVars.CorsPolicyName, policy =>
                         {
                             policy.WithOrigins(AppSettingsConstVars.CorsIPs.Split(','));
-                            policy.AllowAnyHeader();//Ensures that the policy allows any header.
+                            //policy.AllowAnyOrigin();
+                            policy.AllowAnyHeader();
                             policy.AllowAnyMethod();
                             policy.AllowCredentials();
                         });

CoreCms.Net.Core/Config/IpPolicyRateLimitSetup.cs

@@ -35,8 +35,8 @@ namespace CoreCms.Net.Core.Config
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
             // 配置（解析器、计数器密钥生成器）
             services.AddSingleton<IRateLimitConfiguration, RateLimitConfiguration>();
-
             services.AddSingleton<IProcessingStrategy, AsyncKeyLockProcessingStrategy>();
+
         }
     }
 }

CoreCms.Net.Core/Config/RedisMessageQueueSetup.cs

@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using CoreCms.Net.Configuration;
-using CoreCms.Net.RedisMQ.Subscribe;
+using CoreCms.Net.RedisMQ;
-using CoreCms.Net.Utility.Extensions;
 using InitQ;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -32,6 +28,7 @@ namespace CoreCms.Net.Core.Config
                 m.ConnectionString = AppSettingsConstVars.RedisConfigConnectionString;
                 //对应的订阅者类，需要new一个实例对象，当然你也可以传参，比如日志对象
                 m.ListSubscribe = new List<Type>() {
+                    typeof(MessagePushSubscribe),
                     typeof(OrderAgentOrDistributionSubscribe),
                     typeof(OrderAutomaticDeliverySubscribe),
                     typeof(OrderFinishCommandSubscribe),
@@ -45,6 +42,7 @@ namespace CoreCms.Net.Core.Config
                     typeof(SendWxTemplateMessageSubscribe),
                     typeof(AfterSalesReviewSubscribe),
                     typeof(AfterSalesReviewForPointSubscribe),
+                    typeof(AliPayNoticeSubscribe),
                 };
                 //显示日志
                 m.ShowLog = false;

CoreCms.Net.Core/Config/SqlSugarSetup.cs

@@ -39,18 +39,18 @@ namespace CoreCms.Net.Core.Config
                 //判断数据库类型
                 DbType = AppSettingsConstVars.DbDbType == IocDbType.MySql.ToString() ? IocDbType.MySql : IocDbType.SqlServer,
                 //是否开启自动关闭数据库连接-//不设成true要手动close
-                IsAutoCloseConnection = true,
+                IsAutoCloseConnection = false,
             });
 
             //设置参数
             services.ConfigurationSugar(db =>
             {
                 db.CurrentConnectionConfig.InitKeyType = InitKeyType.Attribute;
-                //db.CurrentConnectionConfig.ConfigureExternalServices = new ConfigureExternalServices()
+                db.CurrentConnectionConfig.ConfigureExternalServices = new ConfigureExternalServices()
-                //{
+                {
-                //    //判断是否开启redis设置二级缓存方式
+                    //判断是否开启redis设置二级缓存方式
-                //    DataInfoCacheService = AppSettingsConstVars.RedisUseCache ? (ICacheService)new SqlSugarRedisCache() : new SqlSugarMemoryCache()
+                    DataInfoCacheService = AppSettingsConstVars.RedisUseCache ? (ICacheService)new SqlSugarRedisCache() : new SqlSugarMemoryCache()
-                //};
+                };
 
                 //执行SQL 错误事件，可监控sql（暂时屏蔽，需要可开启）
                 //db.Aop.OnLogExecuting = (sql, p) =>

CoreCms.Net.Core/Config/YiLianYunSetup.cs

@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using CoreCms.Net.Configuration;
-using CoreCms.Net.RedisMQ.Subscribe;
-using CoreCms.Net.Utility.Extensions;
-using InitQ;
-using Microsoft.Extensions.DependencyInjection;
-using Qc.YilianyunSdk;
-
-namespace CoreCms.Net.Core.Config
-{
-    /// <summary>
-    /// 易联云打印机 启动服务
-    /// </summary>
-    public static class YiLianYunSetup
-    {
-        public static void AddYiLianYunSetup(this IServiceCollection services)
-        {
-            if (services == null) throw new ArgumentNullException(nameof(services));
-
-            services.AddYilianyunSdk<DefaultYilianyunSdkHook>(opt =>
-            {
-                // 应用ID请自行前往 dev.10ss.net 获取
-                opt.ClientId = AppSettingsConstVars.YiLianYunConfigClientId;
-                opt.ClientSecret = AppSettingsConstVars.YiLianYunConfigClientSecret;
-                opt.YilianyunClientType = YilianyunClientType.自有应用;
-                opt.SaveTokenDirPath = "./App_Data/YiLianYunLogs";
-            });
-        }
-    }
-}

CoreCms.Net.Core/CoreCms.Net.Core.csproj

@@ -14,21 +14,20 @@
     <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
-    <PackageReference Include="Castle.Core" Version="5.0.0" />
+    <PackageReference Include="Castle.Core" Version="5.1.0" />
-    <PackageReference Include="Hangfire" Version="1.7.30" />
+    <PackageReference Include="Hangfire" Version="1.7.31" />
-    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.30" />
+    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.31" />
-    <PackageReference Include="Hangfire.Core" Version="1.7.30" />
+    <PackageReference Include="Hangfire.Core" Version="1.7.31" />
     <PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
     <PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
     <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.8.5" />
-    <PackageReference Include="InitQ" Version="1.0.0.12" />
+    <PackageReference Include="InitQ" Version="1.0.0.13" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.OpenApi" Version="1.3.2" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.4.2" />
-    <PackageReference Include="Qc.YilianyunSdk" Version="1.0.7" />
+    <PackageReference Include="SqlSugar.IOC" Version="1.9.0" />
-    <PackageReference Include="SqlSugar.IOC" Version="1.8.0" />
+    <PackageReference Include="sqlSugarCore" Version="5.1.3.1" />
-    <PackageReference Include="sqlSugarCore" Version="5.0.9.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.5" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.3" />
   </ItemGroup>
 
   <ItemGroup>

CoreCms.Net.IRepository/Agent/ICoreCmsAgentGoodsRepository.cs

@@ -34,7 +34,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsAgentGoods>> QueryPageAsync(
+        Task<IPageList<CoreCmsAgentGoods>> QueryPageAsync(
             Expression<Func<CoreCmsAgentGoods, bool>> predicate,
             Expression<Func<CoreCmsAgentGoods, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);
@@ -59,14 +59,6 @@ namespace CoreCms.Net.IRepository
         Task<AdminUiCallBack> UpdateAsync(CoreCmsAgentGoods entity, List<CoreCmsAgentProducts> products);
 
 
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsAgentGoods> entity);
-
-
         /// <summary>
         ///     重写删除指定ID的数据
         /// </summary>
@@ -74,14 +66,6 @@ namespace CoreCms.Net.IRepository
         /// <returns></returns>
         Task<AdminUiCallBack> DeleteByIdAsync(int id);
 
-
-        /// <summary>
-        ///     重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
         #endregion
     }
 }

CoreCms.Net.IRepository/Agent/ICoreCmsAgentGradeRepository.cs

@@ -34,7 +34,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsAgentGrade>> QueryPageAsync(
+        Task<IPageList<CoreCmsAgentGrade>> QueryPageAsync(
            Expression<Func<CoreCmsAgentGrade, bool>> predicate,
            Expression<Func<CoreCmsAgentGrade, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);
@@ -46,7 +46,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsAgentGrade entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsAgentGrade entity);
 
 
         /// <summary>
@@ -54,15 +54,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsAgentGrade entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsAgentGrade entity);
-
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsAgentGrade> entity);
 
 
         /// <summary>
@@ -81,12 +73,6 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <returns></returns>
         Task<List<CoreCmsAgentGrade>> GetCaChe();
-
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsAgentGrade>> UpdateCaChe();
-
         #endregion
     }
 }

CoreCms.Net.IRepository/Agent/ICoreCmsAgentOrderDetailsRepository.cs

@@ -25,63 +25,5 @@ namespace CoreCms.Net.IRepository
     /// </summary>
     public interface ICoreCmsAgentOrderDetailsRepository : IBaseRepository<CoreCmsAgentOrderDetails>
     {
-        #region 重写增删改查操作===========================================================
-
-        /// <summary>
-        /// 重写异步插入方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsAgentOrderDetails entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsAgentOrderDetails entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsAgentOrderDetails> entity);
-
-
-        /// <summary>
-        /// 重写删除指定ID的数据
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
-        #endregion
-
-        /// <summary>
-        ///     重写根据条件查询分页数据
-        /// </summary>
-        /// <param name="predicate">判断集合</param>
-        /// <param name="orderByType">排序方式</param>
-        /// <param name="pageIndex">当前页面索引</param>
-        /// <param name="pageSize">分布大小</param>
-        /// <param name="orderByExpression"></param>
-        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
-        /// <returns></returns>
-        new Task<IPageList<CoreCmsAgentOrderDetails>> QueryPageAsync(
-            Expression<Func<CoreCmsAgentOrderDetails, bool>> predicate,
-            Expression<Func<CoreCmsAgentOrderDetails, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
-            int pageSize = 20, bool blUseNoLock = false);
-
     }
 }

CoreCms.Net.IRepository/Agent/ICoreCmsAgentOrderRepository.cs

@@ -34,7 +34,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsAgentOrder>> QueryPageAsync(
+        Task<IPageList<CoreCmsAgentOrder>> QueryPageAsync(
             Expression<Func<CoreCmsAgentOrder, bool>> predicate,
             Expression<Func<CoreCmsAgentOrder, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Agent/ICoreCmsAgentProductsRepository.cs

@@ -33,7 +33,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsAgentProducts>> QueryPageAsync(
+        Task<IPageList<CoreCmsAgentProducts>> QueryPageAsync(
             Expression<Func<CoreCmsAgentProducts, bool>> predicate,
             Expression<Func<CoreCmsAgentProducts, object>> orderByExpression, OrderByType orderByType,
             int pageIndex = 1,

CoreCms.Net.IRepository/Agent/ICoreCmsAgentRepository.cs

@@ -13,7 +13,7 @@ using System.Linq.Expressions;
 using System.Threading.Tasks;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.ViewModels.Basics;
-using CoreCms.Net.Model.ViewModels.DTO.Agent;
+using CoreCms.Net.Model.ViewModels.DTO;
 using SqlSugar;
 
 namespace CoreCms.Net.IRepository
@@ -34,7 +34,6 @@ namespace CoreCms.Net.IRepository
         Task<IPageList<CoreCmsAgentOrder>> QueryOrderPageAsync(int userId, int pageIndex = 1, int pageSize = 20,
             int typeId = 0);
 
-
         /// <summary>
         ///     重写根据条件查询分页数据
         /// </summary>
@@ -45,7 +44,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsAgent>> QueryPageAsync(
+        Task<IPageList<CoreCmsAgent>> QueryPageAsync(
             Expression<Func<CoreCmsAgent, bool>> predicate,
             Expression<Func<CoreCmsAgent, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Api/ICoreCmsPrinterRepository.cs

@@ -0,0 +1,82 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统                                
+ *                Web: https://www.corecms.net                      
+ *             Author: 大灰灰                                          
+ *              Email: jianweie@163.com                                
+ *         CreateTime: 2022/9/16 20:41:09
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+
+namespace CoreCms.Net.IRepository
+{
+    /// <summary>
+    /// 打印机列表 工厂接口
+    /// </summary>
+    public interface ICoreCmsPrinterRepository : IBaseRepository<CoreCmsPrinter>
+    {
+        #region 重写增删改查操作===========================================================
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> InsertAsync(CoreCmsPrinter entity);
+
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsPrinter entity);
+
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
+
+        #endregion
+
+        #region 获取缓存的所有数据==========================================================
+
+        /// <summary>
+        /// 获取缓存的所有数据
+        /// </summary>
+        /// <returns></returns>
+        Task<List<CoreCmsPrinter>> GetCaChe();
+
+        #endregion
+
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        Task<IPageList<CoreCmsPrinter>> QueryPageAsync(
+            Expression<Func<CoreCmsPrinter, bool>> predicate,
+            Expression<Func<CoreCmsPrinter, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false);
+
+    }
+}

CoreCms.Net.IRepository/Bill/ICoreCmsBillDeliveryRepository.cs

@@ -20,6 +20,7 @@ namespace CoreCms.Net.IRepository
     /// </summary>
     public interface ICoreCmsBillDeliveryRepository : IBaseRepository<CoreCmsBillDelivery>
     {
+
         /// <summary>
         ///     发货单统计7天统计
         /// </summary>

CoreCms.Net.IRepository/Bill/ICoreCmsBillPaymentsRepository.cs

@@ -42,7 +42,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsBillPayments>> QueryPageAsync(
+        Task<IPageList<CoreCmsBillPayments>> QueryPageAsync(
             Expression<Func<CoreCmsBillPayments, bool>> predicate,
             Expression<Func<CoreCmsBillPayments, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Bill/ICoreCmsBillRefundRepository.cs

@@ -32,7 +32,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsBillRefund>> QueryPageAsync(
+        Task<IPageList<CoreCmsBillRefund>> QueryPageAsync(
             Expression<Func<CoreCmsBillRefund, bool>> predicate,
             Expression<Func<CoreCmsBillRefund, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Cart/ICoreCmsCartRepository.cs

@@ -23,5 +23,12 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <returns></returns>
         Task<int> GetCountAsync(int userId);
+
+        /// <summary>
+        ///     获取购物车商品总价格
+        /// </summary>
+        /// <returns></returns>
+        Task<decimal> GetMoneyAsync(int userId);
+
     }
 }

CoreCms.Net.IRepository/CheckIn/ICoreCmsContinuousCheckInRulesRepository.cs

@@ -31,10 +31,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(List<CoreCmsContinuousCheckInRules> entity);
+        Task<AdminUiCallBack> InsertAsync(List<CoreCmsContinuousCheckInRules> entity);
-
-
-        #region 获取缓存的所有数据==========================================================
 
         /// <summary>
         /// 获取缓存的所有数据
@@ -42,12 +39,5 @@ namespace CoreCms.Net.IRepository
         /// <returns></returns>
         Task<List<CoreCmsContinuousCheckInRules>> GetCaChe();
 
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsContinuousCheckInRules>> UpdateCaChe();
-
-        #endregion
-
     }
 }

CoreCms.Net.IRepository/CheckIn/ICoreCmsCumulativeCheckInRulesRepository.cs

@@ -25,57 +25,12 @@ namespace CoreCms.Net.IRepository
     /// </summary>
     public interface ICoreCmsCumulativeCheckInRulesRepository : IBaseRepository<CoreCmsCumulativeCheckInRules>
     {
-        #region 重写增删改查操作===========================================================
-
-        /// <summary>
-        /// 重写异步插入方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsCumulativeCheckInRules entity);
-
-
         /// <summary>
         /// 重写异步更新方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(List<CoreCmsCumulativeCheckInRules> entity);
+        Task<AdminUiCallBack> InsertAsync(List<CoreCmsCumulativeCheckInRules> entity);
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsCumulativeCheckInRules entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsCumulativeCheckInRules> entity);
-
-
-        /// <summary>
-        /// 重写删除指定ID的数据
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
-        #endregion
-
-        #region 获取缓存的所有数据==========================================================
 
         /// <summary>
         /// 获取缓存的所有数据
@@ -83,28 +38,5 @@ namespace CoreCms.Net.IRepository
         /// <returns></returns>
         Task<List<CoreCmsCumulativeCheckInRules>> GetCaChe();
 
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsCumulativeCheckInRules>> UpdateCaChe();
-
-        #endregion
-
-
-        /// <summary>
-        ///     重写根据条件查询分页数据
-        /// </summary>
-        /// <param name="predicate">判断集合</param>
-        /// <param name="orderByType">排序方式</param>
-        /// <param name="pageIndex">当前页面索引</param>
-        /// <param name="pageSize">分布大小</param>
-        /// <param name="orderByExpression"></param>
-        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
-        /// <returns></returns>
-        new Task<IPageList<CoreCmsCumulativeCheckInRules>> QueryPageAsync(
-            Expression<Func<CoreCmsCumulativeCheckInRules, bool>> predicate,
-            Expression<Func<CoreCmsCumulativeCheckInRules, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
-            int pageSize = 20, bool blUseNoLock = false);
-
     }
 }

CoreCms.Net.IRepository/CheckIn/ICoreCmsUserCheckInRepository.cs

@@ -35,7 +35,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsUserCheckIn>> QueryPageAsync(
+        Task<IPageList<CoreCmsUserCheckIn>> QueryPageAsync(
             Expression<Func<CoreCmsUserCheckIn, bool>> predicate,
             Expression<Func<CoreCmsUserCheckIn, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionConditionRepository.cs

@@ -34,7 +34,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsDistributionCondition>> QueryPageAsync(
+        Task<IPageList<CoreCmsDistributionCondition>> QueryPageAsync(
            Expression<Func<CoreCmsDistributionCondition, bool>> predicate,
            Expression<Func<CoreCmsDistributionCondition, object>> orderByExpression, OrderByType orderByType,
            int pageIndex = 1,
@@ -47,7 +47,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsDistributionCondition entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsDistributionCondition entity);
 
 
         /// <summary>
@@ -55,15 +55,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsDistributionCondition entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsDistributionCondition entity);
-
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsDistributionCondition> entity);
 
 
         /// <summary>
@@ -71,31 +63,9 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        ///     重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
 
-        #region 获取缓存的所有数据==========================================================
-
-        /// <summary>
-        ///     获取缓存的所有数据
-        /// </summary>
-        /// <returns></returns>
-        Task<List<CoreCmsDistributionCondition>> GetCaChe();
-
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsDistributionCondition>> UpdateCaChe();
-
-        #endregion
     }
 }

CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionGradeRepository.cs

@@ -22,14 +22,14 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsDistributionGrade entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsDistributionGrade entity);
 
         /// <summary>
         /// 重写异步更新方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsDistributionGrade entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsDistributionGrade entity);
 
         /// <summary>
         /// 重写删除指定ID的数据
@@ -48,11 +48,6 @@ namespace CoreCms.Net.IRepository
         /// <returns></returns>
         Task<List<CoreCmsDistributionGrade>> GetCaChe();
 
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsDistributionGrade>> UpdateCaChe();
-
         #endregion
 
 
@@ -66,7 +61,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsDistributionGrade>> QueryPageAsync(
+        Task<IPageList<CoreCmsDistributionGrade>> QueryPageAsync(
            Expression<Func<CoreCmsDistributionGrade, bool>> predicate,
            Expression<Func<CoreCmsDistributionGrade, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionOrderDetailsRepository.cs

@@ -25,63 +25,6 @@ namespace CoreCms.Net.IRepository
     /// </summary>
     public interface ICoreCmsDistributionOrderDetailsRepository : IBaseRepository<CoreCmsDistributionOrderDetails>
     {
-        #region 重写增删改查操作===========================================================
-
-        /// <summary>
-        /// 重写异步插入方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsDistributionOrderDetails entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsDistributionOrderDetails entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsDistributionOrderDetails> entity);
-
-
-        /// <summary>
-        /// 重写删除指定ID的数据
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
-        #endregion
-
-        /// <summary>
-        ///     重写根据条件查询分页数据
-        /// </summary>
-        /// <param name="predicate">判断集合</param>
-        /// <param name="orderByType">排序方式</param>
-        /// <param name="pageIndex">当前页面索引</param>
-        /// <param name="pageSize">分布大小</param>
-        /// <param name="orderByExpression"></param>
-        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
-        /// <returns></returns>
-        new Task<IPageList<CoreCmsDistributionOrderDetails>> QueryPageAsync(
-            Expression<Func<CoreCmsDistributionOrderDetails, bool>> predicate,
-            Expression<Func<CoreCmsDistributionOrderDetails, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
-            int pageSize = 20, bool blUseNoLock = false);
        
     }
 }

CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionOrderRepository.cs

@@ -15,8 +15,6 @@ namespace CoreCms.Net.IRepository
     /// </summary>
     public interface ICoreCmsDistributionOrderRepository : IBaseRepository<CoreCmsDistributionOrder>
     {
-        
-
         /// <summary>
         ///     重写根据条件查询分页数据
         /// </summary>
@@ -27,7 +25,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsDistributionOrder>> QueryPageAsync(
+        Task<IPageList<CoreCmsDistributionOrder>> QueryPageAsync(
            Expression<Func<CoreCmsDistributionOrder, bool>> predicate,
            Expression<Func<CoreCmsDistributionOrder, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionRepository.cs

@@ -47,7 +47,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsDistribution>> QueryPageAsync(
+        Task<IPageList<CoreCmsDistribution>> QueryPageAsync(
             Expression<Func<CoreCmsDistribution, bool>> predicate,
             Expression<Func<CoreCmsDistribution, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionResultRepository.cs

@@ -22,7 +22,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsDistributionResult entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsDistributionResult entity);
 
 
         /// <summary>
@@ -30,15 +30,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsDistributionResult entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsDistributionResult entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsDistributionResult> entity);
 
 
         /// <summary>
@@ -46,7 +38,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
 
 
         /// <summary>
@@ -54,26 +46,10 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
+        Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
 
-        #region 获取缓存的所有数据==========================================================
-
-        /// <summary>
-        /// 获取缓存的所有数据
-        /// </summary>
-        /// <returns></returns>
-        Task<List<CoreCmsDistributionResult>> GetCaChe();
-
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsDistributionResult>> UpdateCaChe();
-
-        #endregion
-
-
         /// <summary>
         ///     重写根据条件查询分页数据
         /// </summary>
@@ -84,7 +60,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsDistributionResult>> QueryPageAsync(
+        Task<IPageList<CoreCmsDistributionResult>> QueryPageAsync(
            Expression<Func<CoreCmsDistributionResult, bool>> predicate,
            Expression<Func<CoreCmsDistributionResult, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Financial/ICoreCmsInvoiceRepository.cs

@@ -32,7 +32,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsInvoice>> QueryPageAsync(
+        Task<IPageList<CoreCmsInvoice>> QueryPageAsync(
            Expression<Func<CoreCmsInvoice, bool>> predicate,
            Expression<Func<CoreCmsInvoice, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Good/ICoreCmsGoodsCategoryRepository.cs

@@ -37,39 +37,21 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsGoodsCategory entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsGoodsCategory entity);
-
 
         /// <summary>
         ///     重写异步更新方法方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsGoodsCategory entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsGoodsCategory entity);
-
-
-        /// <summary>
-        ///     重写异步更新方法方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsGoodsCategory> entity);
-
 
         /// <summary>
         ///     重写删除指定ID的数据
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        ///     重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
     }

CoreCms.Net.IRepository/Good/ICoreCmsGoodsCommentRepository.cs

@@ -52,35 +52,19 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsGoodsComment>> QueryPageAsync(
+        Task<IPageList<CoreCmsGoodsComment>> QueryPageAsync(
            Expression<Func<CoreCmsGoodsComment, bool>> predicate,
            Expression<Func<CoreCmsGoodsComment, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);
 
         #region 重写增删改查操作===========================================================
 
-        /// <summary>
-        ///     重写异步插入方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsGoodsComment entity);
-
-
         /// <summary>
         ///     重写异步更新方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsGoodsComment entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsGoodsComment entity);
-
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsGoodsComment> entity);
 
 
         /// <summary>
@@ -88,15 +72,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        ///     重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
     }

CoreCms.Net.IRepository/Good/ICoreCmsGoodsRepository.cs

@@ -44,7 +44,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
+        Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         /// <summary>
         ///     获取商品重量
@@ -92,7 +92,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsGoods>> QueryPageAsync(
+        Task<IPageList<CoreCmsGoods>> QueryPageAsync(
            Expression<Func<CoreCmsGoods, bool>> predicate,
            Expression<Func<CoreCmsGoods, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);
@@ -107,7 +107,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByType">排序顺序</param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<List<CoreCmsGoods>> QueryListByClauseAsync(Expression<Func<CoreCmsGoods, bool>> predicate, int take,
+        Task<List<CoreCmsGoods>> QueryListByClauseAsync(Expression<Func<CoreCmsGoods, bool>> predicate, int take,
            Expression<Func<CoreCmsGoods, object>> orderByPredicate, OrderByType orderByType, bool blUseNoLock = false);
 
 
@@ -118,13 +118,13 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderBy">排序</param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns>泛型实体集合</returns>
-        new Task<List<CoreCmsGoods>> QueryListByClauseAsync(Expression<Func<CoreCmsGoods, bool>> predicate,
+        Task<List<CoreCmsGoods>> QueryListByClauseAsync(Expression<Func<CoreCmsGoods, bool>> predicate,
            string orderBy = "",
            bool blUseNoLock = false);
 
 
         /// <summary>
-        ///     重写根据条件查询分页数据
+        ///     重写根据条件及自定义排序查询分页数据
         /// </summary>
         /// <param name="predicate"></param>
         /// <param name="orderBy"></param>
@@ -132,7 +132,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="pageSize">分布大小</param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsGoods>> QueryPageAsync(Expression<Func<CoreCmsGoods, bool>> predicate,
+        Task<IPageList<CoreCmsGoods>> QueryPageAsync(Expression<Func<CoreCmsGoods, bool>> predicate,
            string orderBy = "", int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);
 
@@ -165,7 +165,6 @@ namespace CoreCms.Net.IRepository
             Expression<Func<CoreCmsGoods, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);
 
-
         /// <summary>
         ///     获取下拉商品数据
         /// </summary>

CoreCms.Net.IRepository/Good/ICoreCmsGoodsTypeSpecRepository.cs

@@ -31,6 +31,6 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+         Task<AdminUiCallBack> DeleteByIdAsync(object id);
     }
 }

CoreCms.Net.IRepository/IntelligentForms/ICoreCmsFormRepository.cs

@@ -40,29 +40,11 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsForm>> QueryPageAsync(
+        Task<IPageList<CoreCmsForm>> QueryPageAsync(
            Expression<Func<CoreCmsForm, bool>> predicate,
            Expression<Func<CoreCmsForm, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);
 
-        #region 重写增删改查操作===========================================================
-
-        /// <summary>
-        ///     重写异步插入方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsForm entity);
-
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsForm> entity);
-
-
         /// <summary>
         ///     重写删除指定ID的数据
         /// </summary>
@@ -70,29 +52,5 @@ namespace CoreCms.Net.IRepository
         /// <returns></returns>
         Task<AdminUiCallBack> DeleteByIdAsync(int id);
 
-
-        /// <summary>
-        ///     重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
-        #endregion
-
-        #region 获取缓存的所有数据==========================================================
-
-        /// <summary>
-        ///     获取缓存的所有数据
-        /// </summary>
-        /// <returns></returns>
-        Task<List<CoreCmsForm>> GetCaChe();
-
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsForm>> UpdateCaChe();
-
-        #endregion
     }
 }

CoreCms.Net.IRepository/IntelligentForms/ICoreCmsFormSubmitRepository.cs

@@ -4,8 +4,8 @@ using System.Linq.Expressions;
 using System.Threading.Tasks;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.ViewModels.Basics;
-using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Model.ViewModels.DTO;
+using CoreCms.Net.Model.ViewModels.UI;
 using SqlSugar;
 
 namespace CoreCms.Net.IRepository
@@ -25,12 +25,11 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsFormSubmit>> QueryPageAsync(
+        Task<IPageList<CoreCmsFormSubmit>> QueryPageAsync(
             Expression<Func<CoreCmsFormSubmit, bool>> predicate,
             Expression<Func<CoreCmsFormSubmit, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);
 
-
         /// <summary>
         ///     表单支付
         /// </summary>
@@ -45,7 +44,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="formId">表单序列</param>
         /// <param name="day">多少天内的数据</param>
         /// <returns></returns>
-        Task<FormStatisticsViewDto> GetStatisticsByFormid(int formId, int day);
+        Task<FormStatisticsViewDto> GetStatisticsByFormId(int formId, int day);
 
         #region 重写增删改查操作===========================================================
 
@@ -56,45 +55,13 @@ namespace CoreCms.Net.IRepository
         /// <returns></returns>
         Task<int> InsertReturnIdentityAsync(CoreCmsFormSubmit entity);
 
-        /// <summary>
-        ///     重写异步插入方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsFormSubmit entity);
-
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsFormSubmit entity);
-
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsFormSubmit> entity);
-
 
         /// <summary>
         ///     重写删除指定ID的数据
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        ///     重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
         #endregion
     }
 }

CoreCms.Net.IRepository/Message/ICoreCmsMessageRepository.cs

@@ -11,7 +11,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using CoreCms.Net.Model.Entities;
-using CoreCms.Net.Model.ViewModels.Basics;
 
 
 namespace CoreCms.Net.IRepository

CoreCms.Net.IRepository/Order/ICoreCmsOrderRepository.cs

@@ -25,7 +25,7 @@ namespace CoreCms.Net.IRepository
     public interface ICoreCmsOrderRepository : IBaseRepository<CoreCmsOrder>
     {
         /// <summary>
-        ///     查询团购秒杀下单数量
+        ///     查询团购秒杀下单数量（获取货品的秒杀团购数据）
         /// </summary>
         /// <param name="productId"></param>
         /// <param name="userId"></param>
@@ -37,6 +37,18 @@ namespace CoreCms.Net.IRepository
             int orderType = 0);
 
 
+        /// <summary>
+        /// 查询团购秒杀下单数量（获取商品序号的秒杀团购数据）
+        /// </summary>
+        /// <param name="goodId"></param>
+        /// <param name="userId"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <param name="orderType"></param>
+        /// <returns></returns>
+        public FindLimitOrderDto FindLimitOrderByGoodId(int goodId, int userId, DateTime? startTime,
+            DateTime? endTime, int orderType = 0);
+
         /// <summary>
         ///     根据用户id和商品id获取下了多少订单
         /// </summary>
@@ -45,6 +57,7 @@ namespace CoreCms.Net.IRepository
         /// <returns></returns>
         int GetOrderNum(int userId, int goodId);
 
+
         /// <summary>
         ///     重写根据条件列表数据
         /// </summary>
@@ -55,6 +68,7 @@ namespace CoreCms.Net.IRepository
         Task<List<CoreCmsOrder>> QueryListAsync(Expression<Func<CoreCmsOrder, bool>> predicate,
             Expression<Func<CoreCmsOrder, object>> orderByExpression, OrderByType orderByType);
 
+
         /// <summary>
         ///     重写根据条件查询分页数据
         /// </summary>
@@ -65,7 +79,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsOrder>> QueryPageAsync(
+        Task<IPageList<CoreCmsOrder>> QueryPageAsync(
             Expression<Func<CoreCmsOrder, bool>> predicate,
             Expression<Func<CoreCmsOrder, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Pintuan/ICoreCmsPintuanRecordRepository.cs

@@ -43,7 +43,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsPinTuanRecord>> QueryPageAsync(
+        Task<IPageList<CoreCmsPinTuanRecord>> QueryPageAsync(
            Expression<Func<CoreCmsPinTuanRecord, bool>> predicate,
            Expression<Func<CoreCmsPinTuanRecord, object>> orderByExpression, OrderByType orderByType,
            int pageIndex = 1,

CoreCms.Net.IRepository/Pintuan/ICoreCmsPintuanRuleRepository.cs

@@ -14,8 +14,8 @@ using System.Linq.Expressions;
 using System.Threading.Tasks;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.ViewModels.Basics;
-using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Model.ViewModels.DTO;
+using CoreCms.Net.Model.ViewModels.UI;
 using SqlSugar;
 
 namespace CoreCms.Net.IRepository

CoreCms.Net.IRepository/Promotion/ICoreCmsCouponRepository.cs

@@ -71,7 +71,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsCoupon>> QueryPageAsync(
+        Task<IPageList<CoreCmsCoupon>> QueryPageAsync(
             Expression<Func<CoreCmsCoupon, bool>> predicate,
             Expression<Func<CoreCmsCoupon, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Promotion/ICoreCmsPromotionRepository.cs

@@ -28,8 +28,9 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="goodId">商品序列</param>
         /// <param name="promotionId">关联促销信息</param>
+        /// <param name="type">类型</param>
         /// <returns></returns>
-        public bool IsInGroup(int goodId, out int promotionId);
+        public bool IsInGroup(int goodId, out int promotionId,int type);
 
 
         /// <summary>

CoreCms.Net.IRepository/Service/ICoreCmsUserServicesOrderRepository.cs

@@ -22,50 +22,6 @@ namespace CoreCms.Net.IRepository
     /// </summary>
     public interface ICoreCmsUserServicesOrderRepository : IBaseRepository<CoreCmsUserServicesOrder>
     {
-        #region 重写增删改查操作===========================================================
-
-        ///// <summary>
-        ///// 事务重写异步插入方法
-        ///// </summary>
-        ///// <param name="entity"></param>
-        ///// <returns></returns>
-        //new Task<AdminUiCallBack> InsertAsync(CoreCmsUserServicesOrder entity);
-
-
-        ///// <summary>
-        ///// 重写异步更新方法方法
-        ///// </summary>
-        ///// <param name="entity"></param>
-        ///// <returns></returns>
-        //new Task<AdminUiCallBack> UpdateAsync(CoreCmsUserServicesOrder entity);
-
-
-        ///// <summary>
-        ///// 重写异步更新方法方法
-        ///// </summary>
-        ///// <param name="entity"></param>
-        ///// <returns></returns>
-        //new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsUserServicesOrder> entity);
-
-
-        ///// <summary>
-        ///// 重写删除指定ID的数据
-        ///// </summary>
-        ///// <param name="id"></param>
-        ///// <returns></returns>
-        //new Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        ///// <summary>
-        ///// 重写删除指定ID集合的数据(批量删除)
-        ///// </summary>
-        ///// <param name="ids"></param>
-        ///// <returns></returns>
-        //new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
-        #endregion
-
-
         /// <summary>
         ///     重写根据条件查询分页数据
         /// </summary>
@@ -76,7 +32,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsUserServicesOrder>> QueryPageAsync(
+        Task<IPageList<CoreCmsUserServicesOrder>> QueryPageAsync(
             Expression<Func<CoreCmsUserServicesOrder, bool>> predicate,
             Expression<Func<CoreCmsUserServicesOrder, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Service/ICoreCmsUserServicesTicketRepository.cs

@@ -22,49 +22,6 @@ namespace CoreCms.Net.IRepository
     /// </summary>
     public interface ICoreCmsUserServicesTicketRepository : IBaseRepository<CoreCmsUserServicesTicket>
     {
-        #region 重写增删改查操作===========================================================
-
-        ///// <summary>
-        ///// 事务重写异步插入方法
-        ///// </summary>
-        ///// <param name="entity"></param>
-        ///// <returns></returns>
-        //new Task<AdminUiCallBack> InsertAsync(CoreCmsUserServicesTicket entity);
-
-
-        ///// <summary>
-        ///// 重写异步更新方法方法
-        ///// </summary>
-        ///// <param name="entity"></param>
-        ///// <returns></returns>
-        //new Task<AdminUiCallBack> UpdateAsync(CoreCmsUserServicesTicket entity);
-
-
-        ///// <summary>
-        ///// 重写异步更新方法方法
-        ///// </summary>
-        ///// <param name="entity"></param>
-        ///// <returns></returns>
-        //new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsUserServicesTicket> entity);
-
-
-        ///// <summary>
-        ///// 重写删除指定ID的数据
-        ///// </summary>
-        ///// <param name="id"></param>
-        ///// <returns></returns>
-        //new Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        ///// <summary>
-        ///// 重写删除指定ID集合的数据(批量删除)
-        ///// </summary>
-        ///// <param name="ids"></param>
-        ///// <returns></returns>
-        //new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
-        #endregion
-
 
         /// <summary>
         ///     重写根据条件查询分页数据
@@ -76,7 +33,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsUserServicesTicket>> QueryPageAsync(
+        Task<IPageList<CoreCmsUserServicesTicket>> QueryPageAsync(
             Expression<Func<CoreCmsUserServicesTicket, bool>> predicate,
             Expression<Func<CoreCmsUserServicesTicket, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Shop/ICoreCmsAreaRepository.cs

@@ -20,50 +20,27 @@ namespace CoreCms.Net.IRepository
     /// </summary>
     public interface ICoreCmsAreaRepository : IBaseRepository<CoreCmsArea>
     {
-        #region 重写增删改查操作===========================================================
 
         /// <summary>
         ///     重写异步插入方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsArea entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsArea entity);
-
 
         /// <summary>
         ///     重写异步更新方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsArea entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsArea entity);
-
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsArea> entity);
-
 
         /// <summary>
         ///     重写删除指定ID的数据
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        ///     重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
-        #endregion
-
-        #region 获取缓存的所有数据==========================================================
 
         /// <summary>
         ///     获取缓存的所有数据
@@ -71,11 +48,5 @@ namespace CoreCms.Net.IRepository
         /// <returns></returns>
         Task<List<CoreCmsArea>> GetCaChe();
 
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsArea>> UpdateCaChe();
-
-        #endregion
     }
 }

CoreCms.Net.IRepository/Shop/ICoreCmsOrderDistributionModelRepository.cs

@@ -32,7 +32,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsOrderDistributionModel entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsOrderDistributionModel entity);
 
 
         /// <summary>
@@ -40,31 +40,14 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsOrderDistributionModel entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsOrderDistributionModel entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsOrderDistributionModel> entity);
-
 
         /// <summary>
         /// 重写删除指定ID的数据
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
 
@@ -76,11 +59,6 @@ namespace CoreCms.Net.IRepository
         /// <returns></returns>
         Task<List<CoreCmsOrderDistributionModel>> GetCaChe();
 
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsOrderDistributionModel>> UpdateCaChe();
-
         #endregion
 
 
@@ -94,7 +72,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsOrderDistributionModel>> QueryPageAsync(
+        Task<IPageList<CoreCmsOrderDistributionModel>> QueryPageAsync(
            Expression<Func<CoreCmsOrderDistributionModel, bool>> predicate,
            Expression<Func<CoreCmsOrderDistributionModel, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Shop/ICoreCmsPagesRepository.cs

@@ -25,14 +25,14 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsPages entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsPages entity);
 
         /// <summary>
         /// 重写异步更新方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsPages entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsPages entity);
 
         /// <summary>
         /// 重写删除指定ID的数据

CoreCms.Net.IRepository/Shop/ICoreCmsServiceDescriptionRepository.cs

@@ -34,7 +34,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsServiceDescription>> QueryPageAsync(
+        Task<IPageList<CoreCmsServiceDescription>> QueryPageAsync(
            Expression<Func<CoreCmsServiceDescription, bool>> predicate,
            Expression<Func<CoreCmsServiceDescription, object>> orderByExpression, OrderByType orderByType,
            int pageIndex = 1,
@@ -47,7 +47,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsServiceDescription entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsServiceDescription entity);
 
 
         /// <summary>
@@ -55,31 +55,14 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsServiceDescription entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsServiceDescription entity);
-
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsServiceDescription> entity);
-
 
         /// <summary>
         ///     重写删除指定ID的数据
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        ///     重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
 
@@ -91,11 +74,6 @@ namespace CoreCms.Net.IRepository
         /// <returns></returns>
         Task<List<CoreCmsServiceDescription>> GetCaChe();
 
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsServiceDescription>> UpdateCaChe();
-
         #endregion
     }
 }

CoreCms.Net.IRepository/Shop/ICoreCmsShipRepository.cs

@@ -41,7 +41,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsShip>> QueryPageAsync(
+        Task<IPageList<CoreCmsShip>> QueryPageAsync(
             Expression<Func<CoreCmsShip, bool>> predicate,
             Expression<Func<CoreCmsShip, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);
@@ -53,7 +53,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsShip entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsShip entity);
 
 
         /// <summary>
@@ -61,7 +61,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsShip entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsShip entity);
 
         /// <summary>
         ///     重写删除指定ID的数据

CoreCms.Net.IRepository/Shop/ICoreCmsStoreRepository.cs

@@ -28,7 +28,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsStore entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsStore entity);
 
 
         /// <summary>
@@ -36,7 +36,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsStore entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsStore entity);
 
 
         /// <summary>

CoreCms.Net.IRepository/Solitaire/ICoreCmsSolitaireItemsRepository.cs

@@ -32,59 +32,31 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsSolitaireItems entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsSolitaireItems entity);
-
 
         /// <summary>
         /// 重写异步更新方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsSolitaireItems entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsSolitaireItems entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsSolitaireItems> entity);
-
 
         /// <summary>
         /// 重写删除指定ID的数据
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
 
         /// <summary>
         /// 重写删除指定ID集合的数据(批量删除)
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
+        Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
 
-        #region 获取缓存的所有数据==========================================================
-
-        /// <summary>
-        /// 获取缓存的所有数据
-        /// </summary>
-        /// <returns></returns>
-        Task<List<CoreCmsSolitaireItems>> GetCaChe();
-
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsSolitaireItems>> UpdateCaChe();
-
-        #endregion
-
-
-
         /// <summary>
         ///     重写根据条件查询列表数据
         /// </summary>
@@ -93,7 +65,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<List<CoreCmsSolitaireItems>> QueryListByClauseAsync(
+        Task<List<CoreCmsSolitaireItems>> QueryListByClauseAsync(
            Expression<Func<CoreCmsSolitaireItems, bool>> predicate,
            Expression<Func<CoreCmsSolitaireItems, object>> orderByExpression, OrderByType orderByType,
            bool blUseNoLock = false);
@@ -109,7 +81,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsSolitaireItems>> QueryPageAsync(
+        Task<IPageList<CoreCmsSolitaireItems>> QueryPageAsync(
            Expression<Func<CoreCmsSolitaireItems, bool>> predicate,
            Expression<Func<CoreCmsSolitaireItems, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Solitaire/ICoreCmsSolitaireRepository.cs

@@ -33,7 +33,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsSolitaire entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsSolitaire entity);
 
 
         /// <summary>
@@ -41,50 +41,10 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsSolitaire entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsSolitaire entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsSolitaire> entity);
-
-
-        /// <summary>
-        /// 重写删除指定ID的数据
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
 
-        #region 获取缓存的所有数据==========================================================
-
-        /// <summary>
-        /// 获取缓存的所有数据
-        /// </summary>
-        /// <returns></returns>
-        Task<List<CoreCmsSolitaire>> GetCaChe();
-
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsSolitaire>> UpdateCaChe();
-
-        #endregion
-
-
         /// <summary>
         ///     重写根据条件查询分页数据
         /// </summary>
@@ -95,7 +55,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsSolitaire>> QueryPageAsync(
+        Task<IPageList<CoreCmsSolitaire>> QueryPageAsync(
            Expression<Func<CoreCmsSolitaire, bool>> predicate,
            Expression<Func<CoreCmsSolitaire, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/Stock/ICoreCmsStockLogRepository.cs

@@ -34,52 +34,10 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsStockLog>> QueryPageAsync(
+        Task<IPageList<CoreCmsStockLog>> QueryPageAsync(
            Expression<Func<CoreCmsStockLog, bool>> predicate,
            Expression<Func<CoreCmsStockLog, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);
 
-        #region 重写增删改查操作===========================================================
-
-        /// <summary>
-        ///     重写异步插入方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsStockLog entity);
-
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsStockLog entity);
-
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsStockLog> entity);
-
-
-        /// <summary>
-        ///     重写删除指定ID的数据
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        ///     重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
-        #endregion
     }
 }

CoreCms.Net.IRepository/Stock/ICoreCmsStockRepository.cs

@@ -35,7 +35,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsStock>> QueryPageAsync(
+        Task<IPageList<CoreCmsStock>> QueryPageAsync(
            Expression<Func<CoreCmsStock, bool>> predicate,
            Expression<Func<CoreCmsStock, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);
@@ -57,38 +57,6 @@ namespace CoreCms.Net.IRepository
         /// <returns></returns>
         Task<AdminUiCallBack> InsertAsync(FMCreateStock entity);
 
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsStock entity);
-
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsStock> entity);
-
-
-        /// <summary>
-        ///     重写删除指定ID的数据
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        ///     重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
         #endregion
     }
 }

CoreCms.Net.IRepository/System/ICoreCmsAppUpdateLogRepository.cs

@@ -32,39 +32,21 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsAppUpdateLog entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsAppUpdateLog entity);
-
 
         /// <summary>
         /// 重写异步更新方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsAppUpdateLog entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsAppUpdateLog entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsAppUpdateLog> entity);
-
 
         /// <summary>
         /// 重写删除指定ID的数据
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
 
@@ -78,7 +60,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsAppUpdateLog>> QueryPageAsync(
+        Task<IPageList<CoreCmsAppUpdateLog>> QueryPageAsync(
            Expression<Func<CoreCmsAppUpdateLog, bool>> predicate,
            Expression<Func<CoreCmsAppUpdateLog, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/System/ISysMenuRepository.cs

@@ -27,7 +27,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(SysMenu entity);
+        Task<AdminUiCallBack> InsertAsync(SysMenu entity);
 
 
         /// <summary>
@@ -35,15 +35,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(SysMenu entity);
+        Task<AdminUiCallBack> UpdateAsync(SysMenu entity);
-
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<SysMenu> entity);
 
 
         /// <summary>
@@ -54,20 +46,5 @@ namespace CoreCms.Net.IRepository
         Task<AdminUiCallBack> DeleteByIdAsync(int id);
 
         #endregion
-
-        #region 获取缓存的所有数据==========================================================
-
-        /// <summary>
-        ///     获取缓存的所有数据
-        /// </summary>
-        /// <returns></returns>
-        Task<List<SysMenu>> GetCaChe();
-
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<SysMenu>> UpdateCaChe();
-
-        #endregion
     }
 }

CoreCms.Net.IRepository/System/ISysUserOperationLogRepository.cs

@@ -35,7 +35,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<SysUserOperationLog>> QueryPageAsync(
+        Task<IPageList<SysUserOperationLog>> QueryPageAsync(
            Expression<Func<SysUserOperationLog, bool>> predicate,
            Expression<Func<SysUserOperationLog, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/User/ICoreCmsUserBalanceRepository.cs

@@ -32,7 +32,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsUserBalance>> QueryPageAsync(
+        Task<IPageList<CoreCmsUserBalance>> QueryPageAsync(
             Expression<Func<CoreCmsUserBalance, bool>> predicate,
             Expression<Func<CoreCmsUserBalance, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/User/ICoreCmsUserShipRepository.cs

@@ -24,7 +24,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<WebApiCallBack> InsertAsync(CoreCmsUserShip entity);
+        Task<WebApiCallBack> InsertAsync(CoreCmsUserShip entity);
 
 
         /// <summary>
@@ -32,6 +32,6 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsUserShip entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsUserShip entity);
     }
 }

CoreCms.Net.IRepository/User/ICoreCmsUserTocashRepository.cs

@@ -32,7 +32,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsUserTocash>> QueryPageAsync(
+        Task<IPageList<CoreCmsUserTocash>> QueryPageAsync(
             Expression<Func<CoreCmsUserTocash, bool>> predicate,
             Expression<Func<CoreCmsUserTocash, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/WeChat/ICoreCmsUserWeChatInfoRepository.cs

@@ -23,7 +23,6 @@ namespace CoreCms.Net.IRepository
     public interface ICoreCmsUserWeChatInfoRepository : IBaseRepository<CoreCmsUserWeChatInfo>
     {
 
-
         /// <summary>
         ///     重写根据条件查询分页数据
         /// </summary>
@@ -34,7 +33,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsUserWeChatInfo>> QueryPageAsync(
+        Task<IPageList<CoreCmsUserWeChatInfo>> QueryPageAsync(
            Expression<Func<CoreCmsUserWeChatInfo, bool>> predicate,
            Expression<Func<CoreCmsUserWeChatInfo, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/WeChat/IWeChatTransactionComponentAuditCategoryRepository.cs

@@ -33,15 +33,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(WeChatTransactionComponentAuditCategory entity);
+        Task<AdminUiCallBack> UpdateAsync(WeChatTransactionComponentAuditCategory entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<WeChatTransactionComponentAuditCategory> entity);
 
 
         /// <summary>
@@ -49,15 +41,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
 
@@ -72,7 +56,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<WeChatTransactionComponentAuditCategory>> QueryPageAsync(
+        Task<IPageList<WeChatTransactionComponentAuditCategory>> QueryPageAsync(
            Expression<Func<WeChatTransactionComponentAuditCategory, bool>> predicate,
            Expression<Func<WeChatTransactionComponentAuditCategory, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/WeChat/IWeChatTransactionComponentBrandAuditRepository.cs

@@ -32,7 +32,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(WeChatTransactionComponentBrandAudit entity);
+        Task<AdminUiCallBack> InsertAsync(WeChatTransactionComponentBrandAudit entity);
 
 
         /// <summary>
@@ -40,15 +40,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(WeChatTransactionComponentBrandAudit entity);
+        Task<AdminUiCallBack> UpdateAsync(WeChatTransactionComponentBrandAudit entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<WeChatTransactionComponentBrandAudit> entity);
 
 
         /// <summary>
@@ -56,15 +48,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
 
@@ -79,7 +63,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<WeChatTransactionComponentBrandAudit>> QueryPageAsync(
+        Task<IPageList<WeChatTransactionComponentBrandAudit>> QueryPageAsync(
             Expression<Func<WeChatTransactionComponentBrandAudit, bool>> predicate,
             Expression<Func<WeChatTransactionComponentBrandAudit, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/WeChat/IWeChatTransactionComponentDeliveryCompanyRepository.cs

@@ -33,11 +33,6 @@ namespace CoreCms.Net.IRepository
         /// <returns></returns>
         Task<List<WeChatTransactionComponentDeliveryCompany>> GetCaChe();
 
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<WeChatTransactionComponentDeliveryCompany>> UpdateCaChe();
-
         #endregion
 
 
@@ -51,7 +46,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<WeChatTransactionComponentDeliveryCompany>> QueryPageAsync(
+        Task<IPageList<WeChatTransactionComponentDeliveryCompany>> QueryPageAsync(
            Expression<Func<WeChatTransactionComponentDeliveryCompany, bool>> predicate,
            Expression<Func<WeChatTransactionComponentDeliveryCompany, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/WeChat/IWeChatTransactionComponentGoodRepository.cs

@@ -32,7 +32,7 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(WeChatTransactionComponentGood entity);
+        Task<AdminUiCallBack> InsertAsync(WeChatTransactionComponentGood entity);
 
 
         /// <summary>
@@ -40,31 +40,14 @@ namespace CoreCms.Net.IRepository
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(WeChatTransactionComponentGood entity);
+        Task<AdminUiCallBack> UpdateAsync(WeChatTransactionComponentGood entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<WeChatTransactionComponentGood> entity);
-
 
         /// <summary>
         /// 重写删除指定ID的数据
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
 
@@ -78,7 +61,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<WeChatTransactionComponentGood>> QueryPageAsync(
+        Task<IPageList<WeChatTransactionComponentGood>> QueryPageAsync(
            Expression<Func<WeChatTransactionComponentGood, bool>> predicate,
            Expression<Func<WeChatTransactionComponentGood, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IRepository/WeChat/IWeChatTransactionComponentGoodSKURepository.cs

@@ -25,63 +25,13 @@ namespace CoreCms.Net.IRepository
     /// </summary>
     public interface IWeChatTransactionComponentGoodSKURepository : IBaseRepository<WeChatTransactionComponentGoodSKU>
     {
-        #region 重写增删改查操作===========================================================
-
-        /// <summary>
-        /// 重写异步插入方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(WeChatTransactionComponentGoodSKU entity);
-
 
         /// <summary>
         /// 重写异步更新方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(WeChatTransactionComponentGoodSKU entity);
+        Task<AdminUiCallBack> UpdateAsync(List<WeChatTransactionComponentGoodSKU> entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<WeChatTransactionComponentGoodSKU> entity);
-
-
-        /// <summary>
-        /// 重写删除指定ID的数据
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
-        #endregion
-
-        /// <summary>
-        ///     重写根据条件查询分页数据
-        /// </summary>
-        /// <param name="predicate">判断集合</param>
-        /// <param name="orderByType">排序方式</param>
-        /// <param name="pageIndex">当前页面索引</param>
-        /// <param name="pageSize">分布大小</param>
-        /// <param name="orderByExpression"></param>
-        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
-        /// <returns></returns>
-        new Task<IPageList<WeChatTransactionComponentGoodSKU>> QueryPageAsync(
-            Expression<Func<WeChatTransactionComponentGoodSKU, bool>> predicate,
-            Expression<Func<WeChatTransactionComponentGoodSKU, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
-            int pageSize = 20, bool blUseNoLock = false);
 
     }
 }

CoreCms.Net.IRepository/WeChat/IWeChatTransactionComponentThirdCategoryRepository.cs

@@ -25,64 +25,6 @@ namespace CoreCms.Net.IRepository
     /// </summary>
     public interface IWeChatTransactionComponentThirdCategoryRepository : IBaseRepository<WeChatTransactionComponentThirdCategory>
     {
-        #region 重写增删改查操作===========================================================
-
-        /// <summary>
-        /// 重写异步插入方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(WeChatTransactionComponentThirdCategory entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(WeChatTransactionComponentThirdCategory entity);
-
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<WeChatTransactionComponentThirdCategory> entity);
-
-
-        /// <summary>
-        /// 重写删除指定ID的数据
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
-        #endregion
-
-        #region 获取缓存的所有数据==========================================================
-
-        /// <summary>
-        /// 获取缓存的所有数据
-        /// </summary>
-        /// <returns></returns>
-        Task<List<WeChatTransactionComponentThirdCategory>> GetCaChe();
-
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<WeChatTransactionComponentThirdCategory>> UpdateCaChe();
-
-        #endregion
-
 
         /// <summary>
         ///     重写根据条件查询分页数据
@@ -94,7 +36,7 @@ namespace CoreCms.Net.IRepository
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<WeChatTransactionComponentThirdCategory>> QueryPageAsync(
+        Task<IPageList<WeChatTransactionComponentThirdCategory>> QueryPageAsync(
            Expression<Func<WeChatTransactionComponentThirdCategory, bool>> predicate,
            Expression<Func<WeChatTransactionComponentThirdCategory, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IServices/Agent/ICoreCmsAgentGoodsServices.cs

@@ -41,13 +41,6 @@ namespace CoreCms.Net.IServices
         /// <returns></returns>
         Task<AdminUiCallBack> UpdateAsync(CoreCmsAgentGoods entity, List<CoreCmsAgentProducts> products);
 
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsAgentGoods> entity);
-
         /// <summary>
         /// 重写删除指定ID的数据
         /// </summary>
@@ -55,13 +48,6 @@ namespace CoreCms.Net.IServices
         /// <returns></returns>
         Task<AdminUiCallBack> DeleteByIdAsync(int id);
 
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
         #endregion
 
 
@@ -76,7 +62,7 @@ namespace CoreCms.Net.IServices
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsAgentGoods>> QueryPageAsync(
+        Task<IPageList<CoreCmsAgentGoods>> QueryPageAsync(
             Expression<Func<CoreCmsAgentGoods, bool>> predicate,
             Expression<Func<CoreCmsAgentGoods, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IServices/Agent/ICoreCmsAgentGradeServices.cs

@@ -30,21 +30,14 @@ namespace CoreCms.Net.IServices
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsAgentGrade entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsAgentGrade entity);
 
         /// <summary>
         /// 重写异步更新方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsAgentGrade entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsAgentGrade entity);
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsAgentGrade> entity);
 
         /// <summary>
         /// 重写删除指定ID的数据
@@ -64,11 +57,6 @@ namespace CoreCms.Net.IServices
         /// <returns></returns>
         Task<List<CoreCmsAgentGrade>> GetCaChe();
 
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsAgentGrade>> UpdateCaChe();
-
         #endregion
 
         #region 重写根据条件查询分页数据
@@ -82,7 +70,7 @@ namespace CoreCms.Net.IServices
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsAgentGrade>> QueryPageAsync(
+        Task<IPageList<CoreCmsAgentGrade>> QueryPageAsync(
            Expression<Func<CoreCmsAgentGrade, bool>> predicate,
            Expression<Func<CoreCmsAgentGrade, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IServices/Agent/ICoreCmsAgentOrderDetailsServices.cs

@@ -24,60 +24,6 @@ namespace CoreCms.Net.IServices
     /// </summary>
     public interface ICoreCmsAgentOrderDetailsServices : IBaseServices<CoreCmsAgentOrderDetails>
     {
-        #region 重写增删改查操作===========================================================
 
-        /// <summary>
-        /// 重写异步插入方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsAgentOrderDetails entity);
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsAgentOrderDetails entity);
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsAgentOrderDetails> entity);
-
-        /// <summary>
-        /// 重写删除指定ID的数据
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
-        #endregion
-
-        #region 重写根据条件查询分页数据
-        /// <summary>
-        ///     重写根据条件查询分页数据
-        /// </summary>
-        /// <param name="predicate">判断集合</param>
-        /// <param name="orderByType">排序方式</param>
-        /// <param name="pageIndex">当前页面索引</param>
-        /// <param name="pageSize">分布大小</param>
-        /// <param name="orderByExpression"></param>
-        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
-        /// <returns></returns>
-        new Task<IPageList<CoreCmsAgentOrderDetails>> QueryPageAsync(
-            Expression<Func<CoreCmsAgentOrderDetails, bool>> predicate,
-            Expression<Func<CoreCmsAgentOrderDetails, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
-            int pageSize = 20, bool blUseNoLock = false);
-        #endregion
     }
 }

CoreCms.Net.IServices/Agent/ICoreCmsAgentOrderServices.cs

@@ -24,7 +24,6 @@ namespace CoreCms.Net.IServices
     public interface ICoreCmsAgentOrderServices : IBaseServices<CoreCmsAgentOrder>
     {
 
-        #region 重写根据条件查询分页数据
         /// <summary>
         ///     重写根据条件查询分页数据
         /// </summary>
@@ -35,12 +34,10 @@ namespace CoreCms.Net.IServices
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsAgentOrder>> QueryPageAsync(
+        Task<IPageList<CoreCmsAgentOrder>> QueryPageAsync(
             Expression<Func<CoreCmsAgentOrder, bool>> predicate,
             Expression<Func<CoreCmsAgentOrder, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);
-        #endregion
-
 
         /// <summary>
         /// 添加代理订单关联记录
@@ -61,7 +58,7 @@ namespace CoreCms.Net.IServices
         /// </summary>
         /// <param name="orderId">订单编号</param>
         /// <returns></returns>
-        Task<WebApiCallBack> CancleOrderByOrderId(string orderId);
+        Task<WebApiCallBack> CancelOrderByOrderId(string orderId);
 
     }
 

CoreCms.Net.IServices/Agent/ICoreCmsAgentProductsServices.cs

@@ -13,7 +13,6 @@ using System.Linq.Expressions;
 using System.Threading.Tasks;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.ViewModels.Basics;
-using CoreCms.Net.Model.ViewModels.UI;
 using SqlSugar;
 
 namespace CoreCms.Net.IServices
@@ -35,7 +34,7 @@ namespace CoreCms.Net.IServices
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsAgentProducts>> QueryPageAsync(
+        Task<IPageList<CoreCmsAgentProducts>> QueryPageAsync(
             Expression<Func<CoreCmsAgentProducts, bool>> predicate,
             Expression<Func<CoreCmsAgentProducts, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IServices/Agent/ICoreCmsAgentServices.cs

@@ -13,8 +13,8 @@ using System.Linq.Expressions;
 using System.Threading.Tasks;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.DTO;
 using CoreCms.Net.Model.ViewModels.UI;
-using CoreCms.Net.Model.ViewModels.DTO.Agent;
 using SqlSugar;
 
 namespace CoreCms.Net.IServices
@@ -58,17 +58,6 @@ namespace CoreCms.Net.IServices
         /// <returns></returns>
         Task<WebApiCallBack> GetStore(int userId);
 
-        /// <summary>
-        ///     根据条件查询分页数据
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="pageIndex">当前页面索引</param>
-        /// <param name="pageSize">分布大小</param>
-        /// <returns></returns>
-        Task<IPageList<CoreCmsAgentOrder>> QueryOrderPageAsync(int userId, int pageIndex = 1, int pageSize = 20);
-
-
-        #region 重写根据条件查询分页数据
         /// <summary>
         ///     重写根据条件查询分页数据
         /// </summary>
@@ -79,12 +68,10 @@ namespace CoreCms.Net.IServices
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsAgent>> QueryPageAsync(
+        Task<IPageList<CoreCmsAgent>> QueryPageAsync(
             Expression<Func<CoreCmsAgent, bool>> predicate,
             Expression<Func<CoreCmsAgent, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);
-        #endregion
-
 
         /// <summary>
         ///     获取代理商排行

CoreCms.Net.IServices/Api/ICoreCmsPrinterServices.cs

@@ -0,0 +1,69 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统                                
+ *                Web: https://www.corecms.net                      
+ *             Author: 大灰灰                                          
+ *              Email: jianweie@163.com                                
+ *         CreateTime: 2022/9/16 20:41:09
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+namespace CoreCms.Net.IServices
+{
+    /// <summary>
+    /// 打印机列表 服务工厂接口
+    /// </summary>
+    public interface ICoreCmsPrinterServices : IBaseServices<CoreCmsPrinter>
+    {
+        #region 重写增删改查操作===========================================================
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> InsertAsync(CoreCmsPrinter entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsPrinter entity);
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
+
+        #endregion
+
+        #region 重写根据条件查询分页数据
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        Task<IPageList<CoreCmsPrinter>> QueryPageAsync(
+            Expression<Func<CoreCmsPrinter, bool>> predicate,
+            Expression<Func<CoreCmsPrinter, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false);
+        #endregion
+    }
+}

CoreCms.Net.IServices/Bill/ICoreCmsBillAftersalesServices.cs

@@ -33,7 +33,6 @@ namespace CoreCms.Net.IServices
         WebApiCallBack OrderToAftersales(string orderId, int aftersaleLevel = 0);
 
 
-
         /// <summary>
         ///     统计用户的售后数量
         /// </summary>

CoreCms.Net.IServices/Bill/ICoreCmsBillPaymentsServices.cs

@@ -90,8 +90,6 @@ namespace CoreCms.Net.IServices
         Task<List<StatisticsOut>> Statistics();
 
 
-        #region 重写根据条件查询分页数据
-
         /// <summary>
         ///     重写根据条件查询分页数据
         /// </summary>
@@ -102,11 +100,10 @@ namespace CoreCms.Net.IServices
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsBillPayments>> QueryPageAsync(
+        Task<IPageList<CoreCmsBillPayments>> QueryPageAsync(
             Expression<Func<CoreCmsBillPayments, bool>> predicate,
             Expression<Func<CoreCmsBillPayments, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);
 
-        #endregion
     }
 }

CoreCms.Net.IServices/Bill/ICoreCmsBillRefundServices.cs

@@ -63,7 +63,7 @@ namespace CoreCms.Net.IServices
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsBillRefund>> QueryPageAsync(
+        Task<IPageList<CoreCmsBillRefund>> QueryPageAsync(
             Expression<Func<CoreCmsBillRefund, bool>> predicate,
             Expression<Func<CoreCmsBillRefund, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
             int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IServices/Cart/ICoreCmsCartServices.cs

@@ -127,6 +127,11 @@ namespace CoreCms.Net.IServices
         /// <returns></returns>
         Task<int> GetCountAsync(int userId);
 
+        /// <summary>
+        ///     获取购物车商品总价格
+        /// </summary>
+        /// <returns></returns>
+        Task<decimal> GetMoneyAsync(int userId);
 
         /// <summary>
         ///     根据提交的数据判断哪些购物券可以使用

CoreCms.Net.IServices/CheckIn/ICoreCmsContinuousCheckInRulesServices.cs

@@ -30,10 +30,7 @@ namespace CoreCms.Net.IServices
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(List<CoreCmsContinuousCheckInRules> entity);
+        Task<AdminUiCallBack> InsertAsync(List<CoreCmsContinuousCheckInRules> entity);
-
-
-        #region 获取缓存的所有数据==========================================================
 
         /// <summary>
         /// 获取缓存的所有数据
@@ -41,12 +38,5 @@ namespace CoreCms.Net.IServices
         /// <returns></returns>
         Task<List<CoreCmsContinuousCheckInRules>> GetCaChe();
 
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsContinuousCheckInRules>> UpdateCaChe();
-
-        #endregion
-
     }
 }

CoreCms.Net.IServices/CheckIn/ICoreCmsCumulativeCheckInRulesServices.cs

@@ -24,84 +24,17 @@ namespace CoreCms.Net.IServices
     /// </summary>
     public interface ICoreCmsCumulativeCheckInRulesServices : IBaseServices<CoreCmsCumulativeCheckInRules>
     {
-        #region 重写增删改查操作===========================================================
-
-        /// <summary>
-        /// 重写异步插入方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsCumulativeCheckInRules entity);
-
-
         /// <summary>
         /// 重写异步更新方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(List<CoreCmsCumulativeCheckInRules> entity);
+        Task<AdminUiCallBack> InsertAsync(List<CoreCmsCumulativeCheckInRules> entity);
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsCumulativeCheckInRules entity);
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsCumulativeCheckInRules> entity);
-
-        /// <summary>
-        /// 重写删除指定ID的数据
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
-        #endregion
-
-        
-        #region 获取缓存的所有数据==========================================================
 
         /// <summary>
         /// 获取缓存的所有数据
         /// </summary>
         /// <returns></returns>
         Task<List<CoreCmsCumulativeCheckInRules>> GetCaChe();
-
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsCumulativeCheckInRules>> UpdateCaChe();
-
-        #endregion
-
-        #region 重写根据条件查询分页数据
-        /// <summary>
-        ///     重写根据条件查询分页数据
-        /// </summary>
-        /// <param name="predicate">判断集合</param>
-        /// <param name="orderByType">排序方式</param>
-        /// <param name="pageIndex">当前页面索引</param>
-        /// <param name="pageSize">分布大小</param>
-        /// <param name="orderByExpression"></param>
-        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
-        /// <returns></returns>
-        new Task<IPageList<CoreCmsCumulativeCheckInRules>> QueryPageAsync(
-            Expression<Func<CoreCmsCumulativeCheckInRules, bool>> predicate,
-            Expression<Func<CoreCmsCumulativeCheckInRules, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
-            int pageSize = 20, bool blUseNoLock = false);
-        #endregion
     }
 }

CoreCms.Net.IServices/CheckIn/ICoreCmsUserCheckInServices.cs

@@ -35,7 +35,7 @@ namespace CoreCms.Net.IServices
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsUserCheckIn>> QueryPageAsync(
+        Task<IPageList<CoreCmsUserCheckIn>> QueryPageAsync(
            Expression<Func<CoreCmsUserCheckIn, bool>> predicate,
            Expression<Func<CoreCmsUserCheckIn, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false);

CoreCms.Net.IServices/Distribution/ICoreCmsDistributionConditionServices.cs

@@ -36,7 +36,7 @@ namespace CoreCms.Net.IServices
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsDistributionCondition>> QueryPageAsync(
+        Task<IPageList<CoreCmsDistributionCondition>> QueryPageAsync(
            Expression<Func<CoreCmsDistributionCondition, bool>> predicate,
            Expression<Func<CoreCmsDistributionCondition, object>> orderByExpression, OrderByType orderByType,
            int pageIndex = 1,
@@ -51,50 +51,21 @@ namespace CoreCms.Net.IServices
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsDistributionCondition entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsDistributionCondition entity);
 
         /// <summary>
         ///     重写异步更新方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsDistributionCondition entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsDistributionCondition entity);
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsDistributionCondition> entity);
 
         /// <summary>
         ///     重写删除指定ID的数据
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-        /// <summary>
-        ///     重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
-        #endregion
-
-        #region 获取缓存的所有数据==========================================================
-
-        /// <summary>
-        ///     获取缓存的所有数据
-        /// </summary>
-        /// <returns></returns>
-        Task<List<CoreCmsDistributionCondition>> GetCaChe();
-
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsDistributionCondition>> UpdateCaChe();
 
         #endregion
     }

CoreCms.Net.IServices/Distribution/ICoreCmsDistributionGradeServices.cs

@@ -36,7 +36,7 @@ namespace CoreCms.Net.IServices
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsDistributionGrade>> QueryPageAsync(
+        Task<IPageList<CoreCmsDistributionGrade>> QueryPageAsync(
            Expression<Func<CoreCmsDistributionGrade, bool>> predicate,
            Expression<Func<CoreCmsDistributionGrade, object>> orderByExpression, OrderByType orderByType,
            int pageIndex = 1,
@@ -51,14 +51,14 @@ namespace CoreCms.Net.IServices
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsDistributionGrade entity);
+        Task<AdminUiCallBack> InsertAsync(CoreCmsDistributionGrade entity);
 
         /// <summary>
         ///     重写异步更新方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsDistributionGrade entity);
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsDistributionGrade entity);
 
         /// <summary>
         ///     重写删除指定ID的数据
@@ -78,11 +78,6 @@ namespace CoreCms.Net.IServices
         /// <returns></returns>
         Task<List<CoreCmsDistributionGrade>> GetCaChe();
 
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsDistributionGrade>> UpdateCaChe();
-
         #endregion
     }
 }

CoreCms.Net.IServices/Distribution/ICoreCmsDistributionOrderDetailsServices.cs

@@ -24,60 +24,5 @@ namespace CoreCms.Net.IServices
     /// </summary>
     public interface ICoreCmsDistributionOrderDetailsServices : IBaseServices<CoreCmsDistributionOrderDetails>
     {
-        #region 重写增删改查操作===========================================================
-
-        /// <summary>
-        /// 重写异步插入方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsDistributionOrderDetails entity);
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsDistributionOrderDetails entity);
-
-        /// <summary>
-        /// 重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsDistributionOrderDetails> entity);
-
-        /// <summary>
-        /// 重写删除指定ID的数据
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
-
-        /// <summary>
-        /// 重写删除指定ID集合的数据(批量删除)
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
-
-        #endregion
-
-        #region 重写根据条件查询分页数据
-        /// <summary>
-        ///     重写根据条件查询分页数据
-        /// </summary>
-        /// <param name="predicate">判断集合</param>
-        /// <param name="orderByType">排序方式</param>
-        /// <param name="pageIndex">当前页面索引</param>
-        /// <param name="pageSize">分布大小</param>
-        /// <param name="orderByExpression"></param>
-        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
-        /// <returns></returns>
-        new Task<IPageList<CoreCmsDistributionOrderDetails>> QueryPageAsync(
-            Expression<Func<CoreCmsDistributionOrderDetails, bool>> predicate,
-            Expression<Func<CoreCmsDistributionOrderDetails, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
-            int pageSize = 20, bool blUseNoLock = false);
-        #endregion
     }
 }

CoreCms.Net.IServices/Distribution/ICoreCmsDistributionOrderServices.cs

@@ -36,7 +36,7 @@ namespace CoreCms.Net.IServices
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsDistributionOrder>> QueryPageAsync(
+         Task<IPageList<CoreCmsDistributionOrder>> QueryPageAsync(
             Expression<Func<CoreCmsDistributionOrder, bool>> predicate,
             Expression<Func<CoreCmsDistributionOrder, object>> orderByExpression, OrderByType orderByType,
             int pageIndex = 1,

CoreCms.Net.IServices/Distribution/ICoreCmsDistributionResultServices.cs

@@ -36,7 +36,7 @@ namespace CoreCms.Net.IServices
         /// <param name="orderByExpression"></param>
         /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
         /// <returns></returns>
-        new Task<IPageList<CoreCmsDistributionResult>> QueryPageAsync(
+         Task<IPageList<CoreCmsDistributionResult>> QueryPageAsync(
             Expression<Func<CoreCmsDistributionResult, bool>> predicate,
             Expression<Func<CoreCmsDistributionResult, object>> orderByExpression, OrderByType orderByType,
             int pageIndex = 1,
@@ -51,52 +51,30 @@ namespace CoreCms.Net.IServices
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> InsertAsync(CoreCmsDistributionResult entity);
+         Task<AdminUiCallBack> InsertAsync(CoreCmsDistributionResult entity);
 
         /// <summary>
         ///     重写异步更新方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(CoreCmsDistributionResult entity);
+         Task<AdminUiCallBack> UpdateAsync(CoreCmsDistributionResult entity);
-
-        /// <summary>
-        ///     重写异步更新方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        new Task<AdminUiCallBack> UpdateAsync(List<CoreCmsDistributionResult> entity);
 
         /// <summary>
         ///     重写删除指定ID的数据
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdAsync(object id);
+         Task<AdminUiCallBack> DeleteByIdAsync(object id);
 
         /// <summary>
         ///     重写删除指定ID集合的数据(批量删除)
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        new Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
+         Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
 
         #endregion
 
-
-        #region 获取缓存的所有数据==========================================================
-
-        /// <summary>
-        ///     获取缓存的所有数据
-        /// </summary>
-        /// <returns></returns>
-        Task<List<CoreCmsDistributionResult>> GetCaChe();
-
-        /// <summary>
-        ///     更新cache
-        /// </summary>
-        Task<List<CoreCmsDistributionResult>> UpdateCaChe();
-
-        #endregion
     }
 }