提交代码

Mall.Model/Entity/Product/RB_SmallShops_Commission.cs

+using VT.FW.DB;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 微店订单返佣信息表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_SmallShops_Commission
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单id
+        /// </summary>        
+        public int? OrderId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单明细id
+        /// </summary>
+        public int? OrderDetailId { get; set; }
+        /// <summary>
+        /// 分销商id
+        /// </summary>        
+        public int? UserId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 佣金
+        /// </summary>        
+        public decimal? Commission
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 佣金状态  1待返佣   2已返佣  
+        /// </summary>        
+        public int? CommissionState
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 类型  1 微店佣金
+        /// </summary>
+        public int? Type { get; set; }
+        /// <summary>
+        /// Remark
+        /// </summary>        
+        public string Remark
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+
+        public int? IsRemit { get; set; }
+
+        /// <summary>
+        /// 微店id
+        /// </summary>
+        public int SmallShopsId { get; set; }
+    }
+
+}

Mall.Model/Entity/User/RB_SmallShops_Remit.cs

+using VT.FW.DB;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 微店提现表实体h
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_SmallShops_Remit
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int? Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 用户id
+        /// </summary>        
+        public int? UserId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 提现方式  枚举
+        /// </summary>        
+        public DistrbutorWithdrawWayEnum? WithdrawalWay
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 申请金额
+        /// </summary>        
+        public decimal? AppliedMoney
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 手续费
+        /// </summary>        
+        public decimal? Fee
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 打款金额
+        /// </summary>        
+        public decimal? RemitMoney
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 审核状态  1申请中  2同意申请，待打款  3已打款  4拒绝
+        /// </summary>        
+        public DistributorRemitAuditStatusEnum? AuditStatus
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 审核时间
+        /// </summary>        
+        public DateTime? AuditDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 打款时间
+        /// </summary>        
+        public DateTime? RemitDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 拒绝时间
+        /// </summary>
+        public DateTime? RejectDate { get; set; }
+        /// <summary>
+        /// 审核备注
+        /// </summary>        
+        public string AuditRemark
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 打款备注
+        /// </summary>        
+        public string RemitRemark
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 拒绝备注
+        /// </summary>
+        public string RejectRemark { get; set; }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 真实名称
+        /// </summary>        
+        public string AccountName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 账户号码
+        /// </summary>        
+        public string AccountNumber
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 银行名称
+        /// </summary>
+        public string BankName { get; set; }
+        /// <summary>
+        /// 提现订单号
+        /// </summary>
+        public string OrderNum { get; set; }
+        /// <summary>
+        /// 财务单据id
+        /// </summary>
+        public int? FinanceId { get; set; }
+
+        /// <summary>
+        /// 提现关联订单id
+        /// </summary>
+        public string ReOrderIds { get; set; }
+        /// <summary>
+        /// 关联的订单号描述
+        /// </summary>
+        public string ReOrderNos { get; set; }
+    }
+}

Mall.Model/Extend/Product/RB_SmallShops_Commission_Extend.cs

+using VT.FW.DB;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品订单返佣表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_SmallShops_Commission_Extend : RB_SmallShops_Commission
+    {
+        /// <summary>
+        /// ids
+        /// </summary>
+        public string OrderIds { get; set; }
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public string OrderNo { get; set; }
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 手机号码
+        /// </summary>
+        public string Mobile { get; set; }
+        /// <summary>
+        /// 用户头像
+        /// </summary>
+        public string Photo { get; set; }
+        /// <summary>
+        /// 等级描述
+        /// </summary>
+        public string GradeDescription { get; set; }
+        /// <summary>
+        /// 分销订单查询状态  0全部  1代付款  2已付款  3已完成
+        /// </summary>
+        public int? DistrbutionOrderSelectStatus { get; set; }
+        /// <summary>
+        /// 订单明细列表
+        /// </summary>
+        public List<RB_Goods_OrderDetail_Extend> OrderDetailList { get; set; }
+        /// <summary>
+        /// 待返佣金额
+        /// </summary>
+        public decimal WaitCommission { get; set; }
+
+
+        public string OrderDetailIds { get; set; }
+    }
+}

Mall.Model/Extend/User/RB_SmallShops_Remit_Extend.cs

+using VT.FW.DB;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+using Mall.Common.Enum.User;
+
+namespace Mall.Model.Extend.User
+{
+    /// <summary>
+    /// 商户分销提现表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_SmallShops_Remit_Extend : RB_SmallShops_Remit
+    {
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string Photo { get; set; }
+        /// <summary>
+        /// 来源
+        /// </summary>
+        public UserSourceEnum? Source { get; set; }
+        /// <summary>
+        /// 下载枚举
+        /// </summary>
+        public List<int> ExcelEnumIds { get; set; }
+        /// <summary>
+        /// 已提现佣金
+        /// </summary>
+        public decimal TXCommission { get; set; }
+        /// <summary>
+        /// 未结算佣金
+        /// </summary>
+        public decimal WJSCommission { get; set; }
+    }
+}

Mall.Module.BaseSetUp/MallBaseModule.cs

@@ -31,6 +31,8 @@ namespace Mall.Module.BaseSetUp
 
         private RB_MicroShop_BasicsRepository microShopBasicsRepository = new RB_MicroShop_BasicsRepository();
 
+
+
         #region 基础设置
         /// <summary>
         /// 获取小程序列表
@@ -1263,6 +1265,41 @@ namespace Mall.Module.BaseSetUp
             return microShopBasicsRepository.GetMicroShopBasicsList(query);
         }
 
+
+        /// <summary>
+        /// 微店基础配置
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public object GetMicroShopBasics(RB_MicroShop_Basics query)
+        {
+            var model = microShopBasicsRepository.GetMicroShopBasicsList(query).FirstOrDefault();
+            if (model==null)
+            {
+                model = new RB_MicroShop_Basics();
+            }
+            List<string> template_message_list = new List<string>();
+            var minModel = miniProgramRepository.GetEntity(query.MallBaseId);
+            if (minModel != null)
+            {
+
+                if (!string.IsNullOrWhiteSpace(minModel.AuditResultTpl))
+                {
+                    template_message_list.Add(minModel.AuditResultTpl);
+                }
+            }
+            return new
+            {
+                template_message_list,
+                model
+            }; 
+
+        }
+
+
         public bool AddOrUpdateMicroShopBasics(RB_MicroShop_Basics model)
         {
             if (model.ID == 0)

Mall.Module.User/SmallShopsModule.cs

@@ -70,6 +70,12 @@ namespace Mall.Module.User
         /// 规格值
         /// </summary>
         private readonly RB_SmallShops_CustomRepository smallShopsCustomRepository = new RB_SmallShops_CustomRepository();
+
+        /// <summary>
+        /// 订单明细
+        /// </summary>
+        private readonly RB_Goods_OrderDetailRepository goods_OrderDetailRepository = new RB_Goods_OrderDetailRepository();
+        private readonly RB_SmallShops_CommissionRepository smallShopsCommissionRepository = new RB_SmallShops_CommissionRepository();
         #region 微店管理
 
         /// <summary>
@@ -250,7 +256,8 @@ namespace Mall.Module.User
                 string goodsIds = string.Join(",", goodsList.Select(x => x.GoodsId ?? 0).Distinct());
 
                 var glist = goodsRepository.GetSingleList(new RB_Goods_Extend() { GoodsIds = goodsIds, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
-                foreach (var item in glist) {
+                foreach (var item in glist)
+                {
                     item.CoverImage = "";
                     if (!string.IsNullOrEmpty(item.CarouselImage) && item.CarouselImage != "[]")
                     {
@@ -674,5 +681,61 @@ namespace Mall.Module.User
         }
 
         #endregion
+
+        #region 微店订单
+        /// <summary>
+        /// 获取用户返佣
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_SmallShops_Commission_Extend> GetSmallShopsCommissionPageList(int pageIndex, int pageSize, out long count, RB_SmallShops_Commission_Extend dmodel)
+        {
+            var oclist = smallShopsCommissionRepository.GetSmallShopsCommissionPageList(pageIndex, pageSize, out count, dmodel);
+            if (oclist.Any())
+            {
+                //获取用户
+                var ulist = member_UserRepository.GetList(new RB_Member_User_Extend() { TenantId = dmodel.TenantId, MallBaseId = dmodel.MallBaseId, UserIds = string.Join(",", oclist.Select(x => x.UserId).Distinct()) });
+
+                string orderIds = string.Join(",", oclist.Select(x => x.OrderId).Distinct());
+                //查询订单明细
+                var dlist = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { TenantId = dmodel.TenantId, MallBaseId = dmodel.MallBaseId, OrderIds = orderIds });
+                //查询图片
+                List<RB_Material_Info_Extend> Mlist = new List<RB_Material_Info_Extend>();
+                if (dlist.Any())
+                {
+                    foreach (var item in dlist)
+                    {
+                        item.CoverImagePath = item.CoverImage;
+                    }
+                }
+                foreach (var item in oclist)
+                {
+                    var umodel = ulist.Where(x => x.Id == item.UserId).FirstOrDefault();
+                    item.UserName = umodel?.Name ?? "";
+                    item.Mobile = umodel?.Moblie ?? "";
+                    item.Photo = umodel?.Photo ?? "";
+                    item.OrderDetailList = new List<RB_Goods_OrderDetail_Extend>();
+                    if (!string.IsNullOrWhiteSpace(item.OrderDetailIds))
+                    {
+                        var orderDetailIds = item.OrderDetailIds.Split(",");
+                        foreach (var itemOrderDetailId in orderDetailIds)
+                        {
+                            if (!string.IsNullOrWhiteSpace(itemOrderDetailId))
+                            {
+                                item.OrderDetailList.AddRange(dlist.Where(x => x.OrderId == item.OrderId && x.Id == Convert.ToInt32(itemOrderDetailId)));
+                            }
+                        }
+                    }
+                    // item.OrderDetailList = dlist.Where(x => x.OrderId == item.OrderId).ToList();
+                }
+            }
+
+            return oclist;
+            // return smallShopsCommissionRepository.GetSmallShopsCommissionPageList(pageIndex, pageSize, out count, dmodel);
+        }
+        #endregion
     }
 }

Mall.Module.User/UserModule.cs

@@ -93,6 +93,9 @@ namespace Mall.Module.User
         /// 订单返佣
         /// </summary>
         private readonly RB_Goods_OrderCommissionRepository goods_OrderCommissionRepository = new RB_Goods_OrderCommissionRepository();
+
+        private readonly RB_SmallShops_RemitRepository smallShopsRemitRepository = new RB_SmallShops_RemitRepository();
+        private readonly RB_SmallShops_CommissionRepository smallShopsCommissionRepository = new RB_SmallShops_CommissionRepository();
         /// <summary>
         /// 订单
         /// </summary>
@@ -177,6 +180,8 @@ namespace Mall.Module.User
 
         private readonly RB_SmallShops_InfoRepository smallShopsInfoRepository = new RB_SmallShops_InfoRepository();
 
+        private readonly RB_SmallShops_CustomRepository smallShopsCustomRepository = new RB_SmallShops_CustomRepository();
+
         #region 基础配置
 
         /// <summary>
@@ -6188,6 +6193,113 @@ namespace Mall.Module.User
             return RList;
         }
 
+
+
+
+
+        /// <summary>
+        /// 获取用户分销中心
+        /// </summary>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        public object GetSmallShopsCenter(AppletUserInfo userInfo)
+        {
+            // var basicsModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
+            var model = smallShopsInfoRepository.GetList(new RB_SmallShops_Info_Extend() { UserId = userInfo.UserId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
+            if (model == null)
+            {
+                return "微店不存在";
+            }
+            if (model.AuditStatus != Common.Enum.User.DistributorAuditStatusEnum.Audited)
+            {
+                return "微店不存在";
+            }
+
+            //已提现佣金 //未结算佣金
+            var commModel = distributor_RemitRepository.GetDistributorCommissionStatiscs(userInfo.UserId);
+            //提现总额
+            var remitMoney = distributor_RemitRepository.GetDistributorRemitCommission(userInfo.UserId);
+
+            //分销订单
+            decimal OrderCommission = smallShopsCommissionRepository.GetUserOrderCommissionStatistics(userInfo.UserId);
+            //未结算返佣
+            decimal WJSCommission = goods_OrderCommissionRepository.GetUserOrderCommissionNoSettlement(userInfo.UserId);
+
+            if (userInfo.SmallShopId == 0)
+            {
+                return "微店信息错误，请重新登录";
+            }
+            var umodel = smallShopsInfoRepository.GetEntity(userInfo.SmallShopId);
+
+            //下线数量
+            int smallShopsNum = 0;
+
+            //求其所有下线的数量
+            var UserIds = member_UserRepository.GetSmallShopChildIdStr(umodel.Id);
+            if (!string.IsNullOrEmpty(UserIds))
+            {
+                string[] arr = UserIds.Split(',');
+                smallShopsNum = arr.Length - 1;
+            }
+
+            //Vip购买返佣金额
+            //decimal VipBuyCommission = vipBuy_CommissionRepository.getVipBuyCommissionMoney(userInfo.UserId);
+
+            var CustomModel = smallShopsCustomRepository.GetSmallShopsCustomList(new RB_SmallShops_Custom { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
+            if (CustomModel == null)
+            {
+                return "";
+            }
+            return new
+            {
+                CustomModel = new
+                {
+                    CustomModel.HeadBackImage,
+                    CustomModel.WithdrawalFilletPX,
+                    CustomModel.WithdrawalText,
+                    CustomModel.WithdrawalColor,
+                    CustomModel.WithdrawalTextColor,
+                    CustomModel.WithdrawalImage,
+                    CustomModel.SmallShopOrderName,
+                    CustomModel.SmallShopOrderImage,
+                    CustomModel.WithdrawalDetailName,
+                    CustomModel.WithdrawalDetailImage,
+                    CustomModel.MyCustomerName,
+                    CustomModel.MyCustomerImage,
+                    CustomModel.SmallShopQRCodeName,
+                    CustomModel.SmallShopQRCodeImage,
+                    CustomModel.SmallShopSetUpName,
+                    CustomModel.SmallShopSetUpImage,
+                    CustomModel.LiveName,
+                    CustomModel.LiveImage,
+                    CustomModel.CommissionWithdrawnName,
+                    CustomModel.OutstandingCommissionName,
+                    CustomModel.WithdrawableName,
+                    CustomModel.CommissionTobePaidName,
+                    CustomModel.UserNotesName,
+                    CustomModel.UserNotes,
+                    CustomModel.IWantToWithdrawName,
+                    CustomModel.WithdrawalAmountName,
+                    CustomModel.WithdrawalWayName
+                },
+                UserInfo = new
+                {
+                    UserId = umodel.Id,
+                    UserName = umodel.Name,
+                    umodel.Logo,
+                    GradeName = "",
+                    CommissionWithdrawal = model.Commission ?? 0,//可提现佣金
+                    TXCommission = commModel?.TXCommission ?? 0,//已提现佣金
+                    WJSCommission, //未结算返佣
+                    model.TotalCommission,//累计佣金
+                    OrderCommission, //微店订单返佣
+                    RemitMoney = remitMoney,  //提现总额
+                    ReferralsNum = smallShopsNum,   //我的客户数    
+                }
+            };
+        }
+
+
         #endregion
     }
 }

Mall.Repository/Product/RB_SmallShops_CommissionRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+using Mall.Model.Entity.User;
+using Mall.Common.Enum.Goods;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 商品订单返佣仓储层
+    /// </summary>
+    public class RB_SmallShops_CommissionRepository : BaseRepository<RB_SmallShops_Commission>
+    {
+
+     
+
+       
+
+        /// <summary>
+        /// 获取用户返佣
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_SmallShops_Commission_Extend> GetSmallShopsCommissionPageList(int pageIndex, int pageSize, out long count, RB_SmallShops_Commission_Extend dmodel)
+        {
+            string where = $" 1=1 and o.Recycled=2 and oa.ReOrderId is null";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and oc.{nameof(RB_SmallShops_Commission.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and oc.{nameof(RB_SmallShops_Commission.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.OrderId > 0)
+            {
+                where += $@" and oc.{nameof(RB_SmallShops_Commission.OrderId)}={dmodel.OrderId}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and oc.{nameof(RB_SmallShops_Commission.UserId)}={dmodel.UserId}";
+            }
+            if (dmodel.SmallShopsId > 0)
+            {
+                where += $@" and o.{nameof(RB_Goods_Order.SmallShopsId)}={dmodel.SmallShopsId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.OrderIds))
+            {
+                where += $@" and oc.{nameof(RB_SmallShops_Commission.OrderId)} in({dmodel.OrderIds})";
+            }
+            if (dmodel.DistrbutionOrderSelectStatus > 0)
+            {
+                switch (dmodel.DistrbutionOrderSelectStatus)
+                {
+                    case 1: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}={(int)OrderStatusEnum.NonPayment}"; break;
+                    case 2: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(2,3,4,6)"; break;
+                    case 3: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}={(int)OrderStatusEnum.Completed}"; break;
+                }
+            }
+            else
+            {
+                where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,3,4,5,6)";
+            }
+
+            string sql = $@"SELECT GROUP_CONCAT(oc.OrderDetailId) as OrderDetailIds,oc.OrderId,o.OrderNo,o.UserId,oc.Type,oc.CommissionState,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission 
+FROM RB_SmallShops_Commission oc
+inner join rb_goods_orderdetail od on oc.OrderDetailId = od.Id
+inner join rb_goods_order o on oc.OrderId = o.OrderId
+left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
+where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Type order by oc.OrderId desc";
+            return GetPage<RB_SmallShops_Commission_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+
+
+        /// <summary>
+        /// 订单返佣
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public decimal GetUserOrderCommissionStatistics(int userId)
+        {
+            string sql = $@"SELECT SUM(Commission) as Commission FROM RB_SmallShops_Commission oc
+INNER JOIN rb_goods_order o on oc.OrderId=o.OrderId
+left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
+ WHERE oc.UserId={userId} and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2 and oa.ReOrderId is null";
+
+            var obj = ExecuteScalar(sql);
+            if (obj != null)
+            {
+                return Convert.ToDecimal(obj);
+            }
+            return 0;
+        }
+    }
+}

Mall.Repository/User/RB_SmallShops_RemitRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System.Linq;
+
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 分销商提现仓储层
+    /// </summary>
+    public class RB_SmallShops_RemitRepository : BaseRepository<RB_SmallShops_Remit>
+    {
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_SmallShops_Remit_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_SmallShops_Remit_Extend dmodel)
+        {
+            string where = $@" 1=1 ";
+            if (dmodel.TenantId > 0) {
+                where += $@" and r.{nameof(RB_SmallShops_Remit.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and r.{nameof(RB_SmallShops_Remit.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and r.{nameof(RB_SmallShops_Remit.Id)}={dmodel.Id}";
+            }
+            if (dmodel.AuditStatus > 0) {
+                where += $@" and r.{nameof(RB_SmallShops_Remit.AuditStatus)}={(int)dmodel.AuditStatus}";
+            }
+            if (dmodel.UserId > 0) {
+                where += $@" and r.{nameof(RB_SmallShops_Remit.UserId)}={dmodel.UserId}";
+            }
+            
+            string sql = $@"select r.*,u.Name as UserName,u.Photo,u.Source from RB_SmallShops_Remit r
+left join rb_member_user u on r.UserId = u.Id
+where {where} order by r.Id desc";
+            return GetPage<RB_SmallShops_Remit_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_SmallShops_Remit_Extend> GetList(RB_SmallShops_Remit_Extend dmodel)
+        {
+            string where = $@" 1=1 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and {nameof(RB_SmallShops_Remit.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and {nameof(RB_SmallShops_Remit.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and {nameof(RB_SmallShops_Remit.Id)}={dmodel.Id}";
+            }
+            if (dmodel.AuditStatus > 0)
+            {
+                where += $@" and {nameof(RB_SmallShops_Remit.AuditStatus)}={dmodel.AuditStatus}";
+            }
+
+            string sql = $@"select * from RB_SmallShops_Remit where {where} order by Id desc";
+            return Get<RB_SmallShops_Remit_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取导出列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_SmallShops_Remit_Extend> GetDistributorRemitList(RB_SmallShops_Remit_Extend dmodel)
+        {
+            string where = $@" 1=1 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and r.{nameof(RB_SmallShops_Remit.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and r.{nameof(RB_SmallShops_Remit.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and r.{nameof(RB_SmallShops_Remit.Id)}={dmodel.Id}";
+            }
+            if (dmodel.AuditStatus > 0)
+            {
+                where += $@" and r.{nameof(RB_SmallShops_Remit.AuditStatus)}={(int)dmodel.AuditStatus}";
+            }
+
+            string sql = $@"select r.*,u.Name as UserName,u.Photo,u.Source from RB_SmallShops_Remit r
+left join rb_member_user u on r.UserId = u.Id
+where {where} order by r.Id desc";
+            return Get<RB_SmallShops_Remit_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取佣金提现统计
+        /// </summary>
+        /// <returns></returns>
+        public RB_SmallShops_Remit_Extend GetDistributorCommissionStatiscs(int userId) {
+            string sql = $@"SELECT SUM(CASE WHEN AuditStatus=2 THEN AppliedMoney ELSE 0 END) AS WJSCommission,
+SUM(CASE WHEN AuditStatus=3 THEN AppliedMoney ELSE 0 END) AS TXCommission
+ FROM RB_SmallShops_Remit WHERE UserId={userId} AND AuditStatus in (2,3) ";
+
+            return Get<RB_SmallShops_Remit_Extend>(sql).FirstOrDefault();
+        }
+
+        /// <summary>
+        /// 获取用户佣金提现
+        /// </summary>
+        /// <returns></returns>
+        public decimal GetDistributorRemitCommission(int userId)
+        {
+            string sql = $@"SELECT SUM(AppliedMoney) AS WJSCommission FROM RB_SmallShops_Remit WHERE UserId={userId} AND AuditStatus in (1,2,3) ";
+            var obj = ExecuteScalar(sql);
+            if (obj != null) { return Convert.ToDecimal(obj); } else { return 0; }
+        }
+
+        /// <summary>
+        /// 获取今日所有用户提现金额
+        /// </summary>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public decimal GetAllUserToDayRemitMoney(int tenantId, int mallBaseId)
+        {
+            string NowTime = DateTime.Now.ToString("yyyy-MM-dd");
+            string sql = $@"SELECT SUM(AppliedMoney) as AppliedMoney FROM RB_SmallShops_Remit 
+WHERE DATE_FORMAT(CreateDate,'%Y-%m-%d')='{NowTime}' AND AuditStatus in (1,2,3) and TenantId={tenantId} and MallBaseId={mallBaseId}";
+            var obj = ExecuteScalar(sql);
+            if (obj != null)
+            {
+                return Convert.ToDecimal(obj);
+            }
+            else {
+                return 0;
+            }
+
+        }
+    }
+}

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -224,7 +224,7 @@ namespace Mall.WebApi.Controllers.User
                 #endregion                
                 var mmodel = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend() { MallBaseId = umodel.MallBaseId });
                 //2020-08-12 Add By:W
-              //  var smallShopsInfoModle = userModule.GetSmallShopsInfoList(new RB_SmallShops_Info_Extend { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId, UserId = umodel.Id }).OrderByDescending(x => x.CreateDate).FirstOrDefault();
+               var smallShopsInfoModle = userModule.GetSmallShopsInfoList(new RB_SmallShops_Info_Extend { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId, UserId = umodel.Id }).OrderByDescending(x => x.CreateDate).FirstOrDefault();
 
                 AppletUserInfo appletUserInfo = new AppletUserInfo()
                 {
@@ -240,7 +240,7 @@ namespace Mall.WebApi.Controllers.User
                     SecretKey = umodel.SecretKey,
                     SuperiorId = umodel.SuperiorId ?? 0,
                     Token = token,
-                    SmallShopId =0 //(smallShopsInfoModle != null && smallShopsInfoModle.AuditStatus == DistributorAuditStatusEnum.Audited) ? smallShopsInfoModle.Id : 0
+                    SmallShopId =(smallShopsInfoModle != null && smallShopsInfoModle.AuditStatus == DistributorAuditStatusEnum.Audited) ? smallShopsInfoModle.Id : 0
                 };
                 UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + umodel.Id, appletUserInfo, Config.JwtExpirTime);
                 return ApiResult.CouponSuccess(ResultCode.Fail, "", "", appletUserInfo);

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -37,6 +37,7 @@ namespace Mall.WebApi.Controllers.User
         private readonly SupplierModule supplierModule = new SupplierModule();
         private readonly Module.Product.ProductModule productModule = new Module.Product.ProductModule();
         private readonly MallBaseModule MallBaseModule = new MallBaseModule();
+        private readonly SmallShopsModule smallShopsModule = new SmallShopsModule();
         #region 收货地址
 
         /// <summary>
@@ -1709,12 +1710,26 @@ namespace Mall.WebApi.Controllers.User
 
             var req = RequestParm;
             var userInfo = AppletUserInfo;
-            var microShopBasics = MallBaseModule.GetMicroShopBasicsList(new Model.Entity.BaseSetUp.RB_MicroShop_Basics { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
-            if (microShopBasics == null)
+            var microShopBasics = MallBaseModule.GetMicroShopBasics(new Model.Entity.BaseSetUp.RB_MicroShop_Basics { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
+           
+
+            return ApiResult.Success("", microShopBasics);
+        }
+
+        /// <summary>
+        /// 获取微店申请记录
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetSmallShopsApplyInfo()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            var oldModel = userModule.GetSmallShopsInfoList(new RB_SmallShops_Info_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId }).OrderByDescending(x => x.CreateDate).FirstOrDefault();
+            if (oldModel == null)
             {
-                microShopBasics = new Model.Entity.BaseSetUp.RB_MicroShop_Basics();
+                oldModel = new RB_SmallShops_Info_Extend();
             }
-            return ApiResult.Success("", microShopBasics);
+            return ApiResult.Success("", oldModel);
         }
 
 
@@ -1890,6 +1905,70 @@ namespace Mall.WebApi.Controllers.User
 
 
 
+
+        /// <summary>
+        /// 获取分销中心
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSmallShopsCenter()
+        {
+            var userInfo = AppletUserInfo;
+
+            var obj = userModule.GetSmallShopsCenter(userInfo);
+            return ApiResult.Success("", obj);
+        }
+
+
+        /// <summary>
+        /// 获取用户分销订单
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSmallShopsCommissionPageList()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
+            RB_SmallShops_Commission_Extend demodel = JsonConvert.DeserializeObject<RB_SmallShops_Commission_Extend>(req.msg.ToString());
+
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.UserId = userInfo.UserId;
+            demodel.SmallShopsId = userInfo.SmallShopId;
+            var list = smallShopsModule.GetSmallShopsCommissionPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.OrderId,
+                x.OrderNo,
+                x.GradeDescription,
+                DetailList = x.OrderDetailList.Select(y => new
+                {
+                    y.Id,
+                    y.CoverImagePath,
+                    y.OrderType,
+                    OrderTypeName = y.OrderType.GetEnumName(),
+                    y.GoodsName,
+                    SpecificationList = JsonConvert.DeserializeObject<List<string>>(y.Specification),
+                    y.ProductCode,
+                    y.Final_Price,
+                    y.Number
+                }),
+                x.UserId,
+                x.UserName,
+                x.Photo,
+                x.Mobile,
+                x.Remark,
+                x.Commission,
+                x.CommissionState,
+                StatusName = x.DistrbutionOrderSelectStatus == 1 ? "待付款" : x.DistrbutionOrderSelectStatus == 5 ? "已完成" : "已付款",
+                x.TenantId,
+                x.MallBaseId,
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
+            });
+            return ApiResult.Success("", pagelist);
+        }
         #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/User/SmallShopsController.cs

@@ -336,7 +336,7 @@ namespace Mall.WebApi.Controllers.User
             if (demodel.Id == 0)
             {
                 demodel.CreateDate = DateTime.Now;
-                demodel.TenantId = Convert.ToInt32(requestParm.uid);
+                demodel.TenantId = requestParm.TenantId;
                 demodel.MallBaseId = requestParm.MallBaseId;
             }
             demodel.UpdateDate = DateTime.Now;