积分以余额收支

Mall.Common/Enum/MarketingCenter/PlatformTypeEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Common.Enum.MarketingCenter
+{
+    public enum PlatformTypeEnum
+    {
+        /// <summary>
+        /// 微信
+        /// </summary>
+        [EnumField("微信")]
+        WeChat = 1,
+        /// <summary>
+        /// 支付宝
+        /// </summary>
+        [EnumField("支付宝")]
+        Alipay = 2,
+        /// <summary>
+        /// 抖音/头条
+        /// </summary>
+        [EnumField("抖音/头条")]
+        TrillOrHeadline = 3,
+        /// <summary>
+        /// 百度
+        /// </summary>
+        [EnumField("百度")]
+        Baidu = 2,
+    }
+}

Mall.Model/Entity/User/RB_Member_Balance.cs

 using Mall.Common.AOP;
+using Mall.Common.Enum.MarketingCenter;
 using Mall.Common.Enum.User;
 using System;
 using System.Collections.Generic;
@@ -29,7 +30,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// 类型  1增加  2减少
         /// </summary>        
-        public int? Type
+        public RecordTypeEnum? Type
         {
             get;
             set;
@@ -82,5 +83,10 @@ namespace Mall.Model.Entity.User
             get;
             set;
         }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remarks { get; set; }
     }
 }

Mall.Model/Entity/User/RB_Member_Integral.cs

@@ -35,6 +35,13 @@ namespace Mall.Model.Entity.User
             get;
             set;
         }
+
+
+        /// <summary>
+        /// 平台类型
+        /// </summary>
+        public PlatformTypeEnum? PlatformType { get; set; }
+
         /// <summary>
         /// 积分
         /// </summary>        

Mall.Model/Extend/User/RB_Member_Balance_Extend.cs

@@ -13,6 +13,19 @@ namespace Mall.Model.Extend.User
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_Member_Balance_Extend : RB_Member_Balance
     {
+        /// <summary>
+        /// 会员名称
+        /// </summary>
+        public string MemberName { get; set; }
 
+        /// <summary>
+        /// 开始时间【查询使用】
+        /// </summary>
+        public string StartDate { get; set; }
+
+        /// <summary>
+        /// 结束时间【查询使用】
+        /// </summary>
+        public string EndDate { get; set; }
     }
 }

Mall.Model/Query/Integral_Query.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Query
+{
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Integral_Query
+    {
+
+        public int TenantId { get; set; }
+
+        public int MallBaseId { get; set; }
+
+        public int PlatformType { get; set; }
+        public string CreateDate { get; set; }
+
+        public string Income { get; set; }
+
+        public string Expend { get; set; }
+
+        /// <summary>
+        /// 开始时间【查询使用】
+        /// </summary>
+        public string StartDate { get; set; }
+
+        /// <summary>
+        /// 结束时间【查询使用】
+        /// </summary>
+        public string EndDate { get; set; }
+    }
+}

Mall.Module.MarketingCenter/IntegralModule.cs

 using Mall.Model.Entity.MarketingCenter;
 using Mall.Model.Extend.MarketingCenter;
 using Mall.Model.Extend.User;
+using Mall.Model.Query;
 using Mall.Repository.MarketingCenter;
 using Mall.Repository.User;
 using System;
@@ -62,7 +63,31 @@ namespace Mall.Module.MarketingCenter
             return recordRepository.GetRechargeRecordPageList(pageIndex, pageSize, out rowCount, query);
         }
 
-        
+
+        /// <summary>
+        /// 数据统计-积分收支
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<Integral_Query> GetIntegraStatisticslList(int pageIndex, int pageSize, out long rowCount, Integral_Query query)
+        {
+            return recordRepository.GetIntegraStatisticslList(pageIndex, pageSize, out rowCount, query);
+        }
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Member_Integral_Extend> GetTotalIntegral(RB_Member_Integral_Extend dmodel)
+        {
+            return recordRepository.GetList(dmodel);
+
+        }
         #endregion
     }
 }

Mall.Module.MarketingCenter/RechargeModule.cs

 using Mall.Common.Plugin;
 using Mall.Model.Entity.MarketingCenter;
 using Mall.Model.Extend.MarketingCenter;
+using Mall.Model.Extend.User;
 using Mall.Repository;
 using Mall.Repository.MarketingCenter;
+using Mall.Repository.User;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -14,7 +16,7 @@ namespace Mall.Module.MarketingCenter
         private RB_Recharge_RulesRepository rulesRepository = new RB_Recharge_RulesRepository();
 
 
-
+        private RB_Member_BalanceRepository balanceRepository = new RB_Member_BalanceRepository();
         private RB_Recharge_SettingsRepository settingsRepository = new RB_Recharge_SettingsRepository();
         #region 充值规则信息
         /// <summary>
@@ -125,5 +127,20 @@ namespace Mall.Module.MarketingCenter
             }
         }
         #endregion
+
+        #region 余额收支
+        /// <summary>
+        /// 营销中心-余额收支
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Member_Balance_Extend> GetMemberBalancePageList(int pageIndex, int pageSize, out long rowCount, RB_Member_Balance_Extend query)
+        {
+            return balanceRepository.GetMemberBalancePageList(pageIndex, pageSize, out rowCount, query);
+        }
+        #endregion
     }
 }

Mall.Module.User/UserModule.cs

@@ -501,7 +501,7 @@ namespace Mall.Module.User
         {
             var umodel = member_UserRepository.GetEntity(demodel.UserId);
             decimal Balance;
-            if (demodel.Type == 1)
+            if ((int)demodel.Type == 1)
             {
                 Balance = (umodel.Balance ?? 0) + (demodel.Balance ?? 0);
             }

Mall.Repository/User/RB_Member_BalanceRepository.cs

@@ -12,7 +12,11 @@ namespace Mall.Repository.User
     /// </summary>
     public class RB_Member_BalanceRepository : RepositoryBase<RB_Member_Balance>
     {
-
+        public string MemberTableName { get { return nameof(RB_Member_User); } }
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Member_Balance); } }
         /// <summary>
         /// 分页列表
         /// </summary>
@@ -76,5 +80,48 @@ namespace Mall.Repository.User
             string sql = $@"select * from RB_Member_Balance where {where} order by Id desc";
             return Get<RB_Member_Balance_Extend>(sql).ToList();
         }
+
+
+        /// <summary>
+        /// 营销中心-余额收支
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Member_Balance_Extend> GetMemberBalancePageList(int pageIndex, int pageSize, out long rowCount, RB_Member_Balance_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT a.*,b.`Name` as MemberName FROM {TableName} as a LEFT JOIN {MemberTableName} as b on a.UserId = b.Id WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.Id > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Member_Balance_Extend.Id)}={query.Id}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Member_Balance_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Member_Balance_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.MemberName))
+                {
+                    builder.Append($" AND b.{nameof(RB_Member_Balance_Extend.MemberName)} like '%{query.MemberName}%'");
+                }
+                if (!string.IsNullOrWhiteSpace(query.StartDate))
+                {
+                    builder.Append($" AND DATE_FORMAT(a.{nameof(RB_Member_Balance_Extend.CreateDate)},'%Y-%m-%d' )>= DATE_FORMAT('{nameof(RB_Member_Balance_Extend.StartDate)}','%Y-%m-%d' )");
+                }
+                if (!string.IsNullOrWhiteSpace(query.EndDate))
+                {
+                    builder.Append($" AND DATE_FORMAT(a.{nameof(RB_Member_Balance_Extend.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{nameof(RB_Member_Balance_Extend.EndDate)}','%Y-%m-%d' )");
+                }
+            }
+            return GetPage<RB_Member_Balance_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
     }
 }

Mall.Repository/User/RB_Member_IntegralRepository.cs

@@ -4,6 +4,7 @@ using System.Text;
 using Mall.Model.Entity.User;
 using Mall.Model.Extend.User;
 using System.Linq;
+using Mall.Model.Query;
 
 namespace Mall.Repository.User
 {
@@ -77,6 +78,10 @@ namespace Mall.Repository.User
             {
                 where += $@" and {nameof(RB_Member_Integral.Type)}={dmodel.Type}";
             }
+            if (dmodel.PlatformType != null && (int)dmodel.PlatformType > 0)
+            {
+                where += $@" and {nameof(RB_Member_Integral.PlatformType)}={dmodel.PlatformType}";
+            }
             if (dmodel.UserId > 0)
             {
                 where += $@" and {nameof(RB_Member_Integral.UserId)}={dmodel.UserId}";
@@ -98,7 +103,7 @@ namespace Mall.Repository.User
         public List<RB_Member_Integral_Extend> GetRechargeRecordPageList(int pageIndex, int pageSize, out long rowCount, RB_Member_Integral_Extend query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.Append($" SELECT a.*,b.`Name` as MemberName FROM {TableName} as a LEFT JOIN {MemberTableName} as b on a.MemberId = b.Id WHERE 1=1 ");
+            builder.Append($" SELECT a.*,b.`Name` as MemberName FROM {TableName} as a LEFT JOIN {MemberTableName} as b on a.UserId = b.Id WHERE 1=1 ");
             if (query != null)
             {
                 if (query.Id > 0)
@@ -128,6 +133,46 @@ namespace Mall.Repository.User
             }
             return GetPage<RB_Member_Integral_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
         }
-
+        /// <summary>
+        /// 数据统计-积分收支
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<Integral_Query> GetIntegraStatisticslList(int pageIndex, int pageSize, out long rowCount, Integral_Query query)
+        {
+            StringBuilder builder = new StringBuilder();
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Member_Integral_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Member_Integral_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.PlatformType > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Member_Integral_Extend.PlatformType)}={query.PlatformType}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.StartDate))
+                {
+                    builder.Append($" AND DATE_FORMAT({nameof(RB_Member_Integral_Extend.CreateDate)},'%Y-%m-%d' )>= DATE_FORMAT('{nameof(RB_Member_Integral_Extend.StartDate)}','%Y-%m-%d' )");
+                }
+                if (!string.IsNullOrWhiteSpace(query.EndDate))
+                {
+                    builder.Append($" AND DATE_FORMAT({nameof(RB_Member_Integral_Extend.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{nameof(RB_Member_Integral_Extend.EndDate)}','%Y-%m-%d' )");
+                }
+            }
+            string sql = @$" SELECT CreateDate,SUM(Income) as Income, SUM(Expend) as Expend from (
+select DATE_FORMAT(CreateDate, '%Y-%m-%d') as CreateDate, Integral as Income, 0 as Expend from rb_member_integral where  Type = 1 {builder.ToString()}
+union all
+select DATE_FORMAT(CreateDate, '%Y-%m-%d') as CreateDate, 0 as Income, Integral as Expend from rb_member_integral where Type = 2 {builder.ToString()}
+) as t GROUP BY CreateDate ";
+            return GetPage<Integral_Query>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
     }
 }

Mall.WebApi/Controllers/MarketingCenter/IntegralController.cs

@@ -6,6 +6,7 @@ using Mall.Common.API;
 using Mall.Model.Entity.MarketingCenter;
 using Mall.Model.Extend.MarketingCenter;
 using Mall.Model.Extend.User;
+using Mall.Model.Query;
 using Mall.Module.MarketingCenter;
 using Mall.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
@@ -111,5 +112,51 @@ namespace Mall.WebApi.Controllers.MarketingCenter
         }
 
         #endregion
+
+
+        #region 数据统计- 积分收支
+        /// <summary>
+        /// 积分收支
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetIntegraStatisticslList()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            Integral_Query demodel = JsonConvert.DeserializeObject<Integral_Query>(RequestParm.msg.ToString());
+            demodel.TenantId = UserInfo.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = IntegralModule.GetIntegraStatisticslList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.CreateDate,
+                x.Income,
+                x.Expend
+            });
+            return ApiResult.Success("", pagelist);
+        }
+        /// <summary>
+        /// 积分收支统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetTotalIntegral()
+        {
+            var parms = RequestParm;
+            RB_Member_Integral_Extend demodel = JsonConvert.DeserializeObject<RB_Member_Integral_Extend>(RequestParm.msg.ToString());
+            demodel.TenantId = UserInfo.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = IntegralModule.GetTotalIntegral(demodel);
+            Integral_Query model = new Integral_Query();
+            if (list != null && list.Any())
+            {
+                model.Income = list.Where(x => x.Type == Common.Enum.MarketingCenter.RecordTypeEnum.Income).Sum(x => x.Integral ?? 0).ToString();
+                model.Expend = list.Where(x => x.Type == Common.Enum.MarketingCenter.RecordTypeEnum.Expend).Sum(x => x.Integral ?? 0).ToString();
+            }
+            return ApiResult.Success("", new { model.Income, model.Expend });
+        }
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/MarketingCenter/RechargeController.cs

@@ -7,6 +7,7 @@ using Mall.Common.Plugin;
 using Mall.Model.Entity.MarketingCenter;
 using Mall.Model.Extend.BaseSetUp;
 using Mall.Model.Extend.MarketingCenter;
+using Mall.Model.Extend.User;
 using Mall.Module.MarketingCenter;
 using Mall.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
@@ -195,5 +196,37 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             }
         }
         #endregion
+
+
+        #region 余额收支
+
+        /// <summary>
+        /// 余额收支列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMemberBalancePageList()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            RB_Member_Balance_Extend demodel = JsonConvert.DeserializeObject<RB_Member_Balance_Extend>(RequestParm.msg.ToString());
+            demodel.TenantId = UserInfo.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = rechargeModule.GetMemberBalancePageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                CreateDate = x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+                x.MemberName,
+                Balance = x.Balance ?? 0,
+                x.Description,
+                x.Remarks,
+                RecordTypeStr = Mall.Common.Plugin.EnumHelper.GetEnumName(x.Type)
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/User/UserController.cs

@@ -396,7 +396,8 @@ namespace Mall.WebApi.Controllers.MallBase
             }
 
             var model = userModule.GetMemberGradeInfo(GradeId);
-            return ApiResult.Success("", new {
+            return ApiResult.Success("", new
+            {
                 model.Id,
                 model.Name,
                 model.Grade,
@@ -586,6 +587,10 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.TenantId = Convert.ToInt32(parms.uid);
             demodel.MallBaseId = parms.MallBaseId;
             demodel.CreateDate = DateTime.Now;
+            if (demodel.PlatformType == null)
+            {
+                demodel.PlatformType = Common.Enum.MarketingCenter.PlatformTypeEnum.WeChat;
+            }
             bool flag = userModule.SetMemberIntegralInfo(demodel);
             if (flag)
             {
@@ -645,7 +650,7 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull("请传递用户id");
             }
-            if (demodel.Type != 1 && demodel.Type != 2)
+            if ((int)demodel.Type != 1 && (int)demodel.Type != 2)
             {
                 return ApiResult.ParamIsNull("请选择充值/扣除");
             }
@@ -1122,7 +1127,8 @@ namespace Mall.WebApi.Controllers.MallBase
             }
 
             var model = userModule.GetDistributorGradeInfo(GradeId);
-            return ApiResult.Success("", new {
+            return ApiResult.Success("", new
+            {
                 model.Id,
                 model.Name,
                 model.Grade,
@@ -1184,11 +1190,14 @@ namespace Mall.WebApi.Controllers.MallBase
                 }
             }
             var model = userModule.GetDistributorBasicsInfo(re.uid, re.MallBaseId);
-            if (model == null) {
+            if (model == null)
+            {
                 return ApiResult.ParamIsNull("请先配置分销商基础信息");
             }
-            switch (model.DistributorTier) {
-                case 0: demodel.OneCommission = 0;
+            switch (model.DistributorTier)
+            {
+                case 0:
+                    demodel.OneCommission = 0;
                     demodel.TwoCommission = 0;
                     demodel.ThreeCommission = 0;
                     break;
@@ -1215,7 +1224,8 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.Success();
             }
-            else {
+            else
+            {
                 return ApiResult.Failed();
             }
         }
@@ -1225,11 +1235,13 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult DelDistributorGradeInfo() {
+        public ApiResult DelDistributorGradeInfo()
+        {
             var re = RequestParm;
             var parms = JObject.Parse(re.msg.ToString());
             int GradeId = parms.GetInt("GradeId", 0);
-            if (GradeId <= 0) {
+            if (GradeId <= 0)
+            {
                 return ApiResult.ParamIsNull("请传递等级id");
             }
 
@@ -1238,7 +1250,8 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.Success();
             }
-            else {
+            else
+            {
                 return ApiResult.Failed();
             }
         }
@@ -1311,21 +1324,26 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetDistributorInfo() {
+        public ApiResult SetDistributorInfo()
+        {
             var req = RequestParm;
             RB_Distributor_Info_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_Info_Extend>(req.msg.ToString());
-            if ((demodel.UserId ?? 0) <= 0) {
+            if ((demodel.UserId ?? 0) <= 0)
+            {
                 return ApiResult.ParamIsNull("请传递用户id");
             }
-            if (demodel.IsFormSelfApplication == 1) {
-                if (string.IsNullOrEmpty(demodel.Name)) {
+            if (demodel.IsFormSelfApplication == 1)
+            {
+                if (string.IsNullOrEmpty(demodel.Name))
+                {
                     return ApiResult.ParamIsNull("请传递姓名");
                 }
-                if (string.IsNullOrEmpty(demodel.Mobile)) {
+                if (string.IsNullOrEmpty(demodel.Mobile))
+                {
                     return ApiResult.ParamIsNull("请传递手机号码");
                 }
             }
-            
+
             demodel.TenantId = Convert.ToInt32(req.uid);
             demodel.MallBaseId = req.MallBaseId;
             demodel.CreateDate = DateTime.Now;
@@ -1333,7 +1351,8 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.Status = 0;
             //验证用户是否已是分销商
             string msg = userModule.ValidateDistributorInfo(demodel.UserId, demodel.TenantId, demodel.MallBaseId);
-            if (msg != "") {
+            if (msg != "")
+            {
                 return ApiResult.Failed(msg);
             }
 
@@ -1342,7 +1361,8 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.Success();
             }
-            else {
+            else
+            {
                 return ApiResult.Failed();
             }
         }
@@ -1352,18 +1372,22 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetDistributorAudit() {
+        public ApiResult SetDistributorAudit()
+        {
             var re = RequestParm;
             var parms = JObject.Parse(re.msg.ToString());
             string UserIds = parms.GetStringValue("UserIds");
             int Type = parms.GetInt("Type", 0);//1审核通过  2审核拒绝  3删除分销  4修改等级  5修改备注
             int NewGradeId = parms.GetInt("NewGradeId", 0);
             string Remark = parms.GetStringValue("Remark");
-            if (string.IsNullOrEmpty(UserIds)) {
+            if (string.IsNullOrEmpty(UserIds))
+            {
                 return ApiResult.ParamIsNull("请传递用户id");
             }
-            if (Type == 4) {
-                if (NewGradeId <= 0) {
+            if (Type == 4)
+            {
+                if (NewGradeId <= 0)
+                {
                     return ApiResult.ParamIsNull("请传递分销商等级");
                 }
             }
@@ -1384,7 +1408,7 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetDistributorQRCode() 
+        public ApiResult GetDistributorQRCode()
         {
             //小程序接口
             return ApiResult.Success();
@@ -1458,29 +1482,29 @@ namespace Mall.WebApi.Controllers.MallBase
                             case 1:
                                 datarow.ExcelRows.Add(new ExcelColumn(value: item.Source.GetEnumName()) { }); break;
                             case 2:
-                                datarow.ExcelRows.Add(new ExcelColumn(value: (item.UserId??0).ToString()) { }); break;
+                                datarow.ExcelRows.Add(new ExcelColumn(value: (item.UserId ?? 0).ToString()) { }); break;
                             case 3:
-                                datarow.ExcelRows.Add(new ExcelColumn(value: item.NickName??"") { }); break;
+                                datarow.ExcelRows.Add(new ExcelColumn(value: item.NickName ?? "") { }); break;
                             case 4:
-                                datarow.ExcelRows.Add(new ExcelColumn(value: item.Name??"") { }); break;
+                                datarow.ExcelRows.Add(new ExcelColumn(value: item.Name ?? "") { }); break;
                             case 5:
-                                datarow.ExcelRows.Add(new ExcelColumn(value: item.Mobile??"") { }); break;
+                                datarow.ExcelRows.Add(new ExcelColumn(value: item.Mobile ?? "") { }); break;
                             case 6:
                                 datarow.ExcelRows.Add(new ExcelColumn(value: item.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")) { }); break;
                             case 7:
                                 datarow.ExcelRows.Add(new ExcelColumn(value: item.AuditStatus.GetEnumName()) { }); break;
                             case 8:
-                                datarow.ExcelRows.Add(new ExcelColumn(value: (item.TotalCommission??0).ToString()) { }); break;
+                                datarow.ExcelRows.Add(new ExcelColumn(value: (item.TotalCommission ?? 0).ToString()) { }); break;
                             case 9:
-                                datarow.ExcelRows.Add(new ExcelColumn(value: (item.CommissionWithdrawal??0).ToString()) { }); break;
+                                datarow.ExcelRows.Add(new ExcelColumn(value: (item.CommissionWithdrawal ?? 0).ToString()) { }); break;
                             case 10:
                                 datarow.ExcelRows.Add(new ExcelColumn(value: (item.OrderNum ?? 0).ToString()) { }); break;
                             case 11:
                                 datarow.ExcelRows.Add(new ExcelColumn(value: "一级:" + (item.OneNum ?? 0) + " 二级:" + (item.TwoNum ?? 0) + " 三级:" + (item.ThreeNum ?? 0)) { }); break;
                             case 12:
-                                datarow.ExcelRows.Add(new ExcelColumn(value: item.SuperiorName??"") { }); break;
+                                datarow.ExcelRows.Add(new ExcelColumn(value: item.SuperiorName ?? "") { }); break;
                             case 13:
-                                datarow.ExcelRows.Add(new ExcelColumn(value: item.Remark??"") { }); break;
+                                datarow.ExcelRows.Add(new ExcelColumn(value: item.Remark ?? "") { }); break;
                         }
                     }
                     slist.Add(datarow);
@@ -1571,21 +1595,26 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetDistributorRemitInfo() {
+        public ApiResult SetDistributorRemitInfo()
+        {
             var req = RequestParm;
             RB_Distributor_Remit_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_Remit_Extend>(req.msg.ToString());
-            if ((demodel.UserId ?? 0) <= 0) {
+            if ((demodel.UserId ?? 0) <= 0)
+            {
                 return ApiResult.ParamIsNull("请传递用户id");
             }
-            if ((demodel.WithdrawalWay ?? 0) <= 0) {
+            if ((demodel.WithdrawalWay ?? 0) <= 0)
+            {
                 return ApiResult.ParamIsNull("请传递提现方式");
             }
-            if ((demodel.AppliedMoney ?? 0) <= 0) {
+            if ((demodel.AppliedMoney ?? 0) <= 0)
+            {
                 return ApiResult.ParamIsNull("请输入提现金额");
             }
             var basmodel = userModule.GetDistributorBasicsInfo(req.uid, req.MallBaseId);
             decimal fee = (demodel.AppliedMoney ?? 0) * (basmodel?.WithdrawFee ?? 0) / 100;
-            if (demodel.Fee != fee) {
+            if (demodel.Fee != fee)
+            {
                 return ApiResult.ParamIsNull("手续费计算有误，请刷新后再试");
             }
 
@@ -1596,7 +1625,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.RemitMoney ??= 0;
             demodel.OrderNum = DateTime.Now.ToString("yyyyMMddHHmmssffff");
             demodel.CreateDate = DateTime.Now;
-            string msg= userModule.SetDistributorRemitInfo(demodel);
+            string msg = userModule.SetDistributorRemitInfo(demodel);
             if (msg == "")
             {
                 return ApiResult.Success();
@@ -1726,7 +1755,7 @@ namespace Mall.WebApi.Controllers.MallBase
                             case 5:
                                 datarow.ExcelRows.Add(new ExcelColumn(value: item.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")) { }); break;
                             case 6:
-                                datarow.ExcelRows.Add(new ExcelColumn(value: item.BankName??"") { }); break;
+                                datarow.ExcelRows.Add(new ExcelColumn(value: item.BankName ?? "") { }); break;
                             case 7:
                                 datarow.ExcelRows.Add(new ExcelColumn(value: item.AccountNumber) { }); break;
                             case 8: