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

Mall.Common/Enum/User/DistrbutorReferralsEnum.cs

@@ -26,6 +26,11 @@ namespace Mall.Common.Enum.User
         /// 首次付款
         /// </summary>
         [EnumField("首次付款")]
-        SCFK = 3
+        SCFK = 3,
+        /// <summary>
+        /// 首次点击链接7天后释放（释放表示 放在总店下）
+        /// </summary>
+        [EnumField("首次点击链接7天后释放")]
+        SC7SF = 4
     }
 }

Mall.Model/Entity/Product/RB_Goods_Comment.cs

@@ -159,5 +159,9 @@ namespace Mall.Model.Entity.Product
             get;
             set;
         }
+        /// <summary>
+        /// 来源订单id
+        /// </summary>
+        public int? OrderDetailId { get; set; }
     }
 }

Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs

@@ -167,5 +167,13 @@ namespace Mall.Model.Entity.Product
         /// 成本价
         /// </summary>
         public decimal? CostMoney { get; set; }
+        /// <summary>
+        /// 是否评论   1是  2否
+        /// </summary>
+        public int? IsComment { get; set; }
+        /// <summary>
+        /// 运费
+        /// </summary>
+        public decimal? FreightMoney { get; set; }
     }
 }

Mall.Model/Entity/User/RB_Member_User.cs

@@ -190,5 +190,21 @@ namespace Mall.Model.Entity.User
         /// 秘钥
         /// </summary>
         public string SecretKey { get; set; }
+        /// <summary>
+        /// 成为下线条件
+        /// </summary>
+        public DistrbutorReferralsEnum? DownlineCondition { get; set; }
+        /// <summary>
+        /// 是否已成为下线  1是  2否
+        /// </summary>
+        public int? IsBeDownline { get; set; }
+        /// <summary>
+        /// 等待成为上线id
+        /// </summary>
+        public int? WaitSuperiorId { get; set; }
+        /// <summary>
+        /// 成为下线时间
+        /// </summary>
+        public DateTime? BeDownlineDate { get; set; }
     }
 }

Mall.Model/Extend/Product/RB_Goods_OrderCommission_Extend.cs

@@ -18,6 +18,10 @@ namespace Mall.Model.Extend.Product
         /// </summary>
         public string OrderIds { get; set; }
         /// <summary>
+        /// 订单号
+        /// </summary>
+        public string OrderNo { get; set; }
+        /// <summary>
         /// 用户名称
         /// </summary>
         public string UserName { get; set; }
@@ -29,5 +33,13 @@ namespace Mall.Model.Extend.Product
         /// 手机号码
         /// </summary>
         public string Mobile { get; set; }
+        /// <summary>
+        /// 分销订单查询状态  0全部  1代付款  2已付款  3已完成
+        /// </summary>
+        public int? DistrbutionOrderSelectStatus { get; set; }
+        /// <summary>
+        /// 订单明细列表
+        /// </summary>
+        public List<RB_Goods_OrderDetail_Extend> OrderDetailList { get; set; }
     }
 }

Mall.Model/Extend/User/RB_Distributor_Remit_Extend.cs

@@ -30,5 +30,13 @@ namespace Mall.Model.Extend.User
         /// 下载枚举
         /// </summary>
         public List<int> ExcelEnumIds { get; set; }
+        /// <summary>
+        /// 已提现佣金
+        /// </summary>
+        public decimal TXCommission { get; set; }
+        /// <summary>
+        /// 未结算佣金
+        /// </summary>
+        public decimal WJSCommission { get; set; }
     }
 }

Mall.Repository/Product/RB_Goods_OrderCommissionRepository.cs

@@ -5,6 +5,7 @@ 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
 {
@@ -79,5 +80,70 @@ namespace Mall.Repository.Product
             string sql = $@"SELECT OrderId,UserId,Grade,SUM(Commission) as Commission FROM RB_Goods_OrderCommission where {where} group by OrderId,UserId,Grade order by Grade asc";
             return Get<RB_Goods_OrderCommission_Extend>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取用户返佣
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Goods_OrderCommission_Extend> GetListGroupByUser_V2(int pageIndex,int pageSize,out long count,RB_Goods_OrderCommission_Extend dmodel)
+        {
+            string where = $" 1=1 and o.Recycled=2";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and oc.{nameof(RB_Goods_OrderCommission.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and oc.{nameof(RB_Goods_OrderCommission.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.OrderId > 0)
+            {
+                where += $@" and oc.{nameof(RB_Goods_OrderCommission.OrderId)}={dmodel.OrderId}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and oc.{nameof(RB_Goods_OrderCommission.UserId)}={dmodel.UserId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.OrderIds))
+            {
+                where += $@" and oc.{nameof(RB_Goods_OrderCommission.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;
+                }
+            }
+
+            string sql = $@"SELECT oc.OrderId,o.OrderNo,o.UserId,oc.Grade,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission 
+FROM RB_Goods_OrderCommission oc
+inner join rb_goods_order o on oc.OrderId = o.OrderId
+where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Grade order by oc.OrderId desc";
+            return GetPage<RB_Goods_OrderCommission_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_goods_ordercommission oc
+INNER JOIN rb_goods_order o on oc.OrderId=o.OrderId
+ WHERE oc.UserId={userId} and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2";
+
+            var obj = ExecuteScalar(sql);
+            if (obj != null) {
+                return Convert.ToDecimal(obj);
+            }
+            return 0;
+        }
     }
 }

Mall.Repository/Product/RB_Goods_OrderDetailRepository.cs

@@ -45,6 +45,9 @@ namespace Mall.Repository.Product
             {
                 where += $@" and {nameof(RB_Goods_OrderDetail.OrderType)}={(int)dmodel.OrderType}";
             }
+            if (dmodel.IsComment > 0) {
+                where += $@" and {nameof(RB_Goods_OrderDetail.IsComment)}={(int)dmodel.IsComment}";
+            }
             if (!string.IsNullOrEmpty(dmodel.GoodsName))
             {
                 where += $@" and {nameof(RB_Goods_OrderDetail.GoodsName)} like '%{dmodel.GoodsName}%'";

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -396,6 +396,77 @@ WHERE od.GoodsId in({goodsIds}) and o.`Status`=0 and o.OrderStatus <> 7 group by
             return Get<RB_Goods_Order_Extend>(sql2).ToList();
         }
 
+        /// <summary>
+        /// 获取商品订单数量统计
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public List<RB_Goods_Order_Extend> GetAppletGoodsOrderNumStatistics(int userId, int tenantId, int mallBaseId)
+        {
+            string sql = $" SELECT OrderStatus,COUNT(0) as OrderNum FROM rb_goods_order WHERE `Status`=0 and OrderStatus in (1,2,3) and UserId={userId} and TenantId={tenantId} and MallBaseId={mallBaseId}";
+            return Get<RB_Goods_Order_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取待评价数量
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public int GetAppletGoodsOrderWaitCommentNum(int userId, int tenantId, int mallBaseId)
+        {
+            string sql = $@"SELECT COUNT(0) as OrderNum FROM(
+SELECT o.OrderId FROM rb_goods_order o
+INNER JOIN rb_goods_orderdetail od on o.OrderId=od.OrderId
+ WHERE o.`Status`=0 and o.OrderStatus =4 and od.IsComment=2 and o.UserId={userId} and o.TenantId={tenantId} and o.MallBaseId={mallBaseId}
+GROUP BY o.OrderId)t";
+            var obj = ExecuteScalar(sql);
+            if (obj != null)
+            {
+                return Convert.ToInt32(obj);
+            }
+            else {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// 获取售后处理中
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public int GetAppletGoodsOrderAfterSaleNum(int userId, int tenantId, int mallBaseId)
+        {
+            string sql = $"SELECT COUNT(0) as OrderNum FROM rb_goods_orderaftersale WHERE `Status`=0 and ReOrderStatus <5 and UserId={userId} and TenantId={tenantId} and MallBaseId={mallBaseId}";
+            var obj = ExecuteScalar(sql);
+            if (obj != null)
+            {
+                return Convert.ToInt32(obj);
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// 获取用户订单数量+销售额
+        /// </summary>
+        /// <param name="userIds"></param>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public List<RB_Goods_Order_Extend> GetUserOrderNumAndMoney(string userIds, int tenantId, int mallBaseId)
+        {
+            string sql = $@"SELECT UserId,SUM(Income) as Income,count(0) as OrderNum FROM rb_goods_order WHERE OrderStatus in (2,3,4,5,6) and Recycled=2 and UserId in({userIds}) and TenantId={tenantId} and MallBaseId={mallBaseId}";
+            return Get<RB_Goods_Order_Extend>(sql).ToList();
+        }
+
 
 
         #region 数据统计-数据概况
@@ -508,8 +579,7 @@ LEFT JOIN rb_goods_order as b on a.OrderId=b.OrderId
 LEFT JOIN rb_goods as c on a.GoodsId=c.Id  {where}
  GROUP BY  a.GoodsId ORDER BY SUM(a.Final_Price) desc LIMIT 100 ";
             return Get<DataStatistics_Query>(sql).ToList();
-        }
-
+        }        
 
         /// <summary>
         /// 用户购买力TOP排行

Mall.Repository/User/RB_Distributor_GradeRepository.cs

@@ -87,5 +87,25 @@ namespace Mall.Repository.User
             string sql = $@"select * from RB_Distributor_Grade where {where} order by Id desc";
             return Get<RB_Distributor_Grade_Extend>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取下一等级
+        /// </summary>
+        /// <param name="grade"></param>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public RB_Distributor_Grade_Extend GetDistrbutorUpgrade(int? grade, int tenantId, int mallBaseId)
+        {
+            string where = $@" 1=1 and {nameof(RB_Distributor_Grade.Status)}=0";
+            
+            where += $@" and {nameof(RB_Distributor_Grade.TenantId)}={tenantId}";
+            where += $@" and {nameof(RB_Distributor_Grade.MallBaseId)}={mallBaseId}";
+            where += $@" and {nameof(RB_Distributor_Grade.Grade)}>{grade}";
+            where += $@" and {nameof(RB_Distributor_Grade.Enabled)}=1";
+
+            string sql = $@"select * from RB_Distributor_Grade where {where} order by Grade asc limit 1";
+            return Get<RB_Distributor_Grade_Extend>(sql).FirstOrDefault();
+        }
     }
 }

Mall.Repository/User/RB_Distributor_InfoRepository.cs

@@ -55,7 +55,7 @@ namespace Mall.Repository.User
                 where += $@" and di.{nameof(RB_Distributor_Info.Mobile)} like '%{dmodel.Mobile}%'";
             }
 
-            string sql = $@"select di.*,u.Name as NickName,u.Photo,u.Source,u.Moblie as Mobile from RB_Distributor_Info di
+            string sql = $@"select di.*,u.Name as NickName,u.Photo,u.Source from RB_Distributor_Info di
 inner join rb_member_user u on di.UserId=u.Id
 where {where} order by di.CreateDate desc";
             return GetPage<RB_Distributor_Info_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();

Mall.Repository/User/RB_Distributor_RemitRepository.cs

@@ -102,5 +102,50 @@ left join rb_member_user u on r.UserId = u.Id
 where {where} order by r.Id desc";
             return Get<RB_Distributor_Remit_Extend>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取佣金提现统计
+        /// </summary>
+        /// <returns></returns>
+        public RB_Distributor_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_distributor_remit WHERE UserId={userId} AND AuditStatus in (2,3) ";
+
+            return Get<RB_Distributor_Remit_Extend>(sql).FirstOrDefault();
+        }
+
+        /// <summary>
+        /// 获取用户佣金提现
+        /// </summary>
+        /// <returns></returns>
+        public decimal GetDistributorRemitCommission(int userId)
+        {
+            string sql = $@"SELECT SUM(AppliedMoney) AS WJSCommission FROM rb_distributor_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_distributor_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.Repository/User/RB_Member_UserRepository.cs

@@ -282,7 +282,7 @@ select * from RB_Member_User where {where} order by CreateDate desc
         }
 
         /// <summary>
-        /// 获取下线分销商数量
+        /// 获取下线数量
         /// </summary>
         /// <param name="uids"></param>
         /// <param name="tier"></param>
@@ -314,6 +314,76 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId in ({
             return new List<RB_Member_User_Extend>();
         }
 
+        /// <summary>
+        /// 获取下线分销商数量
+        /// </summary>
+        /// <param name="uids"></param>
+        /// <param name="tier"></param>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public int GetDistributorReferralsNumTwo(int uid, int tier, int tenantId, int mallBaseId)
+        {
+            if (tier == 1)
+            {
+                string sql = $@"SELECT COUNT(0) AS ReferralsNum FROM rb_member_user u 
+WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={uid} and u.IsDistributor=1";
+                var obj = ExecuteScalar(sql);
+                if (obj != null) { return Convert.ToInt32(obj); } else { return 0; }
+            }
+            else if (tier == 2)
+            {
+                string sql = $@"SELECT COUNT(0) AS ReferralsNum FROM rb_member_user u 
+INNER JOIN rb_member_user u1 on u.Id=u1.SuperiorId
+WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={uid} and u1.IsDistributor=1";
+                var obj = ExecuteScalar(sql);
+                if (obj != null) { return Convert.ToInt32(obj); } else { return 0; }
+            }
+            else if (tier == 3)
+            {
+                string sql = $@"SELECT COUNT(0) AS ReferralsNum FROM rb_member_user u 
+INNER JOIN rb_member_user u1 on u.Id=u1.SuperiorId
+INNER JOIN rb_member_user u2 on u1.Id=u2.SuperiorId
+WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={uid} and u2.IsDistributor=1";
+                var obj = ExecuteScalar(sql);
+                if (obj != null) { return Convert.ToInt32(obj); } else { return 0; }
+            }
+            return 0;
+        }
+
+
+        /// <summary>
+        /// 获取下线分销商分页列表
+        /// </summary>
+        /// <param name="uids"></param>
+        /// <param name="tier"></param>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public List<RB_Member_User_Extend> GetDistributorReferralsPageList(int pageIndex,int pageSize,out long count, RB_Distributor_Info_Extend demodel)
+        {
+            string sql = "";
+            if (demodel.GradeId == 1)
+            {
+                sql = $@"SELECT u.* FROM rb_member_user u 
+WHERE u.TenantId={demodel.TenantId} and u.MallBaseId={demodel.MallBaseId} and u.SuperiorId ={demodel.UserId} and u.IsDistributor=1";
+            }
+            else if (demodel.GradeId == 2)
+            {
+                sql = $@"SELECT u1.* FROM rb_member_user u 
+INNER JOIN rb_member_user u1 on u.Id=u1.SuperiorId
+WHERE u.TenantId={demodel.TenantId} and u.MallBaseId={demodel.MallBaseId} and u.SuperiorId ={demodel.UserId} and u1.IsDistributor=1";
+            }
+            else if (demodel.GradeId == 3)
+            {
+                sql = $@"SELECT u2.* FROM rb_member_user u 
+INNER JOIN rb_member_user u1 on u.Id=u1.SuperiorId
+INNER JOIN rb_member_user u2 on u1.Id=u2.SuperiorId
+WHERE u.TenantId={demodel.TenantId} and u.MallBaseId={demodel.MallBaseId} and u.SuperiorId ={demodel.UserId} and u2.IsDistributor=1";
+            }
+            return GetPage<RB_Member_User_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
         /// <summary>
         /// 获取下级用户列表
         /// </summary>

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -192,7 +192,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     SpecificationList = JsonConvert.DeserializeObject<List<string>>(y.Specification),
                     y.ProductCode,
                     y.Final_Price,
-                    y.Number
+                    y.Number,
+                    y.IsComment
                 }),
                 x.OrderStatus,
                 OrderStatusName = x.OrderStatus.GetEnumName(),
@@ -203,6 +204,16 @@ namespace Mall.WebApi.Controllers.MallBase
             return ApiResult.Success("", pagelist);
         }
 
+        /// <summary>
+        /// 获取订单数量统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAppletGoodsOrderNumStatistics() {
+            var userInfo = AppletUserInfo;
+            return orderModule.GetAppletGoodsOrderNumStatistics(userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId);
+        }
+
         /// <summary>
         /// 获取我的订单详情
         /// </summary>
@@ -369,7 +380,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.MerchantsNo ??= "";
             demodel.Recycled ??= 2;
             demodel.Refund ??= 0;
-            demodel.Status = 0;
+            demodel.Status = 0;            
             demodel.UpdateDate = DateTime.Now;
             demodel.UserId = userInfo.UserId;
             #endregion
@@ -402,6 +413,24 @@ namespace Mall.WebApi.Controllers.MallBase
             if (flag) { return ApiResult.Success(); } else { return ApiResult.Failed(); }
         }
 
+        /// <summary>
+        /// 确认收货
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetAppletOrderGoodsReceiving() {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            int OrderId = parms.GetInt("OrderId", 0);
+            if (OrderId <= 0) {
+                return ApiResult.ParamIsNull();
+            }
+
+            bool flag = orderModule.SetAppletOrderGoodsReceiving(OrderId, userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId);
+            if (flag) { return ApiResult.Success(); } else { return ApiResult.Failed(); }
+        }
+
         #endregion
 
         #region 订单售后
@@ -633,6 +662,10 @@ namespace Mall.WebApi.Controllers.MallBase
             var req = RequestParm;
             var userInfo = AppletUserInfo;
             RB_Goods_Comment_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Comment_Extend>(req.msg.ToString());
+            if ((demodel.OrderDetailId ?? 0) <= 0) 
+            {
+                return ApiResult.ParamIsNull("请传递订单明细OrderDetailId");    
+            }
             if ((demodel.GoodsId ?? 0) <= 0)
             {
                 return ApiResult.ParamIsNull("请传递商品");
@@ -670,5 +703,55 @@ namespace Mall.WebApi.Controllers.MallBase
         }
 
         #endregion
+
+        #region 分销中心
+
+        /// <summary>
+        /// 获取用户分销订单
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserDistributionOrdersPageList()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
+            RB_Goods_OrderCommission_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_OrderCommission_Extend>(req.msg.ToString());
+
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.UserId = userInfo.UserId;
+            var list = orderModule.GetDistributionOrdersPageList_V2(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.OrderId,
+                x.OrderNo,
+                x.Grade,
+                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.Mobile,
+                x.Remark,
+                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/Product/OrderController.cs

@@ -853,6 +853,7 @@ namespace Mall.WebApi.Controllers.MallBase
 
             demodel.TenantId = parms.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
+            demodel.Recycled = 2;
             var list = orderModule.GetDistributionOrdersPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
@@ -878,7 +879,7 @@ namespace Mall.WebApi.Controllers.MallBase
                     y.OrderType,
                     OrderTypeName = y.OrderType.GetEnumName(),
                     y.GoodsName,
-                    y.Specification,
+                    SpecificationList = JsonConvert.DeserializeObject<List<string>>(y.Specification),
                     y.ProductCode,
                     y.Final_Price,
                     y.Number
@@ -1117,6 +1118,7 @@ namespace Mall.WebApi.Controllers.MallBase
                     x.OrderDetailModel.GoodsName,
                     x.OrderDetailModel.GoodsId,
                     x.OrderDetailModel.CoverImagePath,
+                    x.OrderDetailModel.ProductCode,
                     SpecificationList = JsonConvert.DeserializeObject<List<string>>(x.OrderDetailModel.Specification),
                 },
                 x.Type,

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -83,6 +83,20 @@ namespace Mall.WebApi.Controllers.User
                 demodel.Remark ??= "";
                 demodel.TotalConsumption ??= 0;
                 #endregion
+                var basicsModel = userModule.GetDistributorBasicsInfo(requestParm.TenantId.ToString(), requestParm.MallBaseId);
+                if ((basicsModel?.ReferralsCondition ?? DistrbutorReferralsEnum.SCDJ) == DistrbutorReferralsEnum.SCDJ || (basicsModel?.ReferralsCondition ?? DistrbutorReferralsEnum.SCDJ) == DistrbutorReferralsEnum.SC7SF)
+                {
+                    demodel.DownlineCondition = basicsModel?.ReferralsCondition ?? DistrbutorReferralsEnum.SCDJ;
+                    demodel.IsBeDownline = 1;
+                    demodel.WaitSuperiorId = 0;
+                    demodel.BeDownlineDate = DateTime.Now;
+                }
+                else {
+                    demodel.DownlineCondition = basicsModel?.ReferralsCondition ?? DistrbutorReferralsEnum.SCDJ;
+                    demodel.IsBeDownline = 2;
+                    demodel.WaitSuperiorId = demodel.SuperiorId;
+                    demodel.SuperiorId = 0;//未成为下线  暂设为总店
+                }
 
                 demodel.TenantId = requestParm.TenantId;
                 demodel.MallBaseId = requestParm.MallBaseId;
@@ -164,10 +178,12 @@ namespace Mall.WebApi.Controllers.User
                     MallBaseId = umodel.MallBaseId,
                     MallName = mmodel?.MallName ?? "",
                     Mobile = umodel.Moblie,
+                    UserId = umodel.Id,
                     TenantId = umodel.TenantId,
                     Name = umodel.Name,
                     OpenId = umodel.OpenId,
                     Photo = umodel.Photo,
+                    Source = demodel.Source,
                     SecretKey = umodel.SecretKey,
                     SuperiorId = umodel.SuperiorId ?? 0,
                     Token = token

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -283,5 +283,229 @@ namespace Mall.WebApi.Controllers.User
         }
 
         #endregion
+
+        #region 分销中心
+
+        /// <summary>
+        /// 获取用户是否是分销商
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserDistrbutorStatus() {
+            var userInfo = AppletUserInfo;
+
+            var obj = userModule.GetUserDistrbutorStatus(userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId);
+            return ApiResult.Success("", obj);
+        }
+
+        /// <summary>
+        /// 获取用户申请分销商页面信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserApplyForDistrbutorInfo() {
+            var userInfo = AppletUserInfo;
+
+            var obj = userModule.GetUserApplyForDistrbutorInfo(userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId);
+            return ApiResult.Success("", obj);
+        }
+
+        /// <summary>
+        /// 用户申请成为分销商
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetUserApplyForBeDistrbutor() {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            RB_Distributor_Info_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_Info_Extend>(req.msg.ToString());
+            if (string.IsNullOrEmpty(demodel.Name)) {
+                return ApiResult.ParamIsNull("请输入名称");
+            }
+            if (string.IsNullOrEmpty(demodel.Mobile)) {
+                return ApiResult.ParamIsNull("请输入手机号码");
+            }
+
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.UserId = userInfo.UserId;
+            demodel.TotalCommission ??= 0;
+            demodel.CommissionWithdrawal ??= 0;
+            demodel.GradeId ??= 0;
+            demodel.AuditStatus ??= DistributorAuditStatusEnum.Auditing;
+            demodel.Status = 0;
+            demodel.CreateDate = DateTime.Now;
+            demodel.UpdateDate = DateTime.Now;
+            bool flag = userModule.SetUserApplyForBeDistrbutor(demodel);
+            if (flag) { return ApiResult.Success(); } else { return ApiResult.Failed(); }
+        }
+
+        /// <summary>
+        /// 获取分销中心
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserDistrbutorCenter() {
+            var userInfo = AppletUserInfo;
+
+            var obj = userModule.GetDistrbutorCenter(userInfo);
+            return ApiResult.Success("", obj);
+        }
+
+        /// <summary>
+        /// 获取用户升级条件
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserDistrbutorUpgradeConditions() {
+            var userInfo = AppletUserInfo;
+
+            var obj = userModule.GetDistrbutorUpgradeConditions(userInfo);
+            return ApiResult.Success("", obj);
+        }
+
+        /// <summary>
+        /// 获取提现余额
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserDistrbutorWithdrawDepositBalance() {
+            var userInfo = AppletUserInfo;
+
+            var obj = userModule.GetDistrbutorWithdrawDepositBalance(userInfo);
+            return ApiResult.Success("", obj);
+        }
+
+        /// <summary>
+        /// 分销提现
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetUserDistrbutorWithdrawDeposit() {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            RB_Distributor_Remit_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_Remit_Extend>(req.msg.ToString());
+            if ((demodel.AppliedMoney ?? 0) <= 0) {
+                return ApiResult.ParamIsNull("提现金额不能小于0");
+            }
+            if (demodel.WithdrawalWay == DistrbutorWithdrawWayEnum.WXZZ || demodel.WithdrawalWay == DistrbutorWithdrawWayEnum.YYKZZ || demodel.WithdrawalWay == DistrbutorWithdrawWayEnum.ZFBZZ) {
+                if (string.IsNullOrEmpty(demodel.AccountName)) {
+                    return ApiResult.ParamIsNull("请输入账户名称");
+                }
+                if (string.IsNullOrEmpty(demodel.AccountNumber)) {
+                    return ApiResult.ParamIsNull("请输入账号");
+                }
+                if (demodel.WithdrawalWay == DistrbutorWithdrawWayEnum.YYKZZ) {
+                    if (string.IsNullOrEmpty(demodel.BankName)) {
+                        return ApiResult.ParamIsNull("请输入银行名称");
+                    }
+                }
+            }
+
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.UserId = userInfo.UserId;
+            demodel.AuditStatus = DistributorRemitAuditStatusEnum.Auditing;
+            demodel.CreateDate = DateTime.Now;
+            demodel.OrderNum = DateTime.Now.ToString("yyyyMMddHHmmssffff");
+            string msg = userModule.SetDistrbutorWithdrawDeposit(demodel);
+            if (msg == "")
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed(msg);
+            }
+        }
+
+        /// <summary>
+        /// 获取分销佣金页面信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserDistrbutorCommissionInfo()
+        {
+            var userInfo = AppletUserInfo;
+
+            var obj = userModule.GetDistrbutorCommissionInfo(userInfo);
+            return ApiResult.Success("", obj);
+        }
+
+        /// <summary>
+        /// 获取用户提现明细
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserDistrbutorRemitPageList() {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
+            RB_Distributor_Remit_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_Remit_Extend>(req.msg.ToString());
+
+            demodel.UserId = userInfo.UserId;
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            var list = userModule.GetDistributorRemitPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.OrderNum,
+                x.WithdrawalWay,
+                WithdrawalWayName = x.WithdrawalWay.GetEnumName(),
+                x.AccountName,
+                x.AccountNumber,
+                x.BankName,
+                x.AppliedMoney,
+                x.Fee,
+                x.RemitMoney,
+                x.AuditRemark,
+                x.RemitRemark,
+                x.RejectRemark,
+                x.AuditStatus,
+                AuditStatusName = x.AuditStatus.GetEnumName(),                
+                x.TenantId,
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                AuditDate = x.AuditDate.HasValue ? x.AuditDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                RemitDate = x.RemitDate.HasValue ? x.RemitDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                RejectDate = x.RejectDate.HasValue ? x.RejectDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 获取我的团队里 自定义信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserMyTeamCustomInfo() {
+            var userInfo = AppletUserInfo;
+
+            var obj = userModule.GetUserMyTeamCustomInfo(userInfo);
+            return ApiResult.Success("", obj);
+        }
+
+        /// <summary>
+        /// 获取分销商团队
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserMyTeamPageList() {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
+            RB_Distributor_Info_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_Info_Extend>(req.msg.ToString());
+
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.UserId = userInfo.UserId;
+            pageModel.pageData = userModule.GetUserMyTeamPageList(pageModel.pageIndex, pageModel.pageSize, out long count, demodel);
+            pageModel.count = Convert.ToInt32(count);
+
+            return ApiResult.Success("", pageModel);
+        }
+        //分销订单  提现明细  我的团队
+
+        #endregion
     }
 }
\ No newline at end of file