Skip to content

M
mall.oytour.com
Commit 4b9b6294 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 78e60038 06abd1b5
Hide whitespace changes
Inline Side-by-side
Showing with 1335 additions and 15 deletions
Mall.Common/Enum/User/DistrbutorReferralsEnum.cs
View file @ 4b9b6294
...@@ -26,6 +26,11 @@ namespace Mall.Common.Enum.User ...@@ -26,6 +26,11 @@ namespace Mall.Common.Enum.User
/// 首次付款 /// 首次付款
/// </summary> /// </summary>
[EnumField("首次付款")] [EnumField("首次付款")]
SCFK = 3 SCFK = 3,
/// <summary>
/// 首次点击链接7天后释放（释放表示 放在总店下）
/// </summary>
[EnumField("首次点击链接7天后释放")]
SC7SF = 4
} }
} }
Mall.Model/Entity/Product/RB_Goods_Comment.cs
View file @ 4b9b6294
...@@ -159,5 +159,9 @@ namespace Mall.Model.Entity.Product ...@@ -159,5 +159,9 @@ namespace Mall.Model.Entity.Product
get; get;
set; set;
} }
/// <summary>
/// 来源订单id
/// </summary>
public int? OrderDetailId { get; set; }
} }
} }
Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs
View file @ 4b9b6294
...@@ -167,5 +167,13 @@ namespace Mall.Model.Entity.Product ...@@ -167,5 +167,13 @@ namespace Mall.Model.Entity.Product
/// 成本价 /// 成本价
/// </summary> /// </summary>
public decimal? CostMoney { get; set; } 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
View file @ 4b9b6294
...@@ -190,5 +190,21 @@ namespace Mall.Model.Entity.User ...@@ -190,5 +190,21 @@ namespace Mall.Model.Entity.User
/// 秘钥 /// 秘钥
/// </summary> /// </summary>
public string SecretKey { get; set; } 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
View file @ 4b9b6294
...@@ -18,6 +18,10 @@ namespace Mall.Model.Extend.Product ...@@ -18,6 +18,10 @@ namespace Mall.Model.Extend.Product
/// </summary> /// </summary>
public string OrderIds { get; set; } public string OrderIds { get; set; }
/// <summary> /// <summary>
/// 订单号
/// </summary>
public string OrderNo { get; set; }
/// <summary>
/// 用户名称 /// 用户名称
/// </summary> /// </summary>
public string UserName { get; set; } public string UserName { get; set; }
...@@ -29,5 +33,13 @@ namespace Mall.Model.Extend.Product ...@@ -29,5 +33,13 @@ namespace Mall.Model.Extend.Product
/// 手机号码 /// 手机号码
/// </summary> /// </summary>
public string Mobile { get; set; } 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
View file @ 4b9b6294
...@@ -30,5 +30,13 @@ namespace Mall.Model.Extend.User ...@@ -30,5 +30,13 @@ namespace Mall.Model.Extend.User
/// 下载枚举 /// 下载枚举
/// </summary> /// </summary>
public List<int> ExcelEnumIds { get; set; } public List<int> ExcelEnumIds { get; set; }
/// <summary>
/// 已提现佣金
/// </summary>
public decimal TXCommission { get; set; }
/// <summary>
/// 未结算佣金
/// </summary>
public decimal WJSCommission { get; set; }
} }
} }
Mall.Module.Product/OrderModule.cs
View file @ 4b9b6294
...@@ -246,7 +246,7 @@ namespace Mall.Module.Product ...@@ -246,7 +246,7 @@ namespace Mall.Module.Product
} }
} }
return list; return list;
} }
/// <summary> /// <summary>
/// 加入购物车 /// 加入购物车
...@@ -387,7 +387,7 @@ namespace Mall.Module.Product ...@@ -387,7 +387,7 @@ namespace Mall.Module.Product
#endregion #endregion
#region 小程序下单 #region 小程序
/// <summary> /// <summary>
/// 小程序我的订单列表 /// 小程序我的订单列表
...@@ -441,6 +441,31 @@ namespace Mall.Module.Product ...@@ -441,6 +441,31 @@ namespace Mall.Module.Product
return list; return list;
} }
/// <summary>
/// 获取我的订单数量统计
/// </summary>
/// <param name="userId"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public ApiResult GetAppletGoodsOrderNumStatistics(int userId, int tenantId, int mallBaseId)
{
//订单状态
List<RB_Goods_Order_Extend> olist = goods_OrderRepository.GetAppletGoodsOrderNumStatistics(userId, tenantId, mallBaseId);
//待评价
int WaitCommentNum = goods_OrderRepository.GetAppletGoodsOrderWaitCommentNum(userId, tenantId, mallBaseId);
//售后处理中
int AfterSaleNum = goods_OrderRepository.GetAppletGoodsOrderAfterSaleNum(userId, tenantId, mallBaseId);
return ApiResult.Success("",new {
NonPayment = olist.Where(x => x.OrderStatus == OrderStatusEnum.NonPayment).FirstOrDefault()?.OrderNum ?? 0,
WaitSendGoods = olist.Where(x => x.OrderStatus == OrderStatusEnum.WaitSendGoods).FirstOrDefault()?.OrderNum ?? 0,
WaitReceiving = olist.Where(x => x.OrderStatus == OrderStatusEnum.WaitReceiving).FirstOrDefault()?.OrderNum ?? 0,
WaitCommentNum,
AfterSaleNum
});
}
/// <summary> /// <summary>
/// 获取我的订单详情 /// 获取我的订单详情
/// </summary> /// </summary>
...@@ -598,7 +623,8 @@ namespace Mall.Module.Product ...@@ -598,7 +623,8 @@ namespace Mall.Module.Product
dModel.GoodsName, dModel.GoodsName,
SpecificationList = JsonConvert.DeserializeObject<List<string>>(dModel.Specification), SpecificationList = JsonConvert.DeserializeObject<List<string>>(dModel.Specification),
dModel.Number, dModel.Number,
dModel.Final_Price dModel.Final_Price,
dModel.FreightMoney
}); });
} }
...@@ -1284,6 +1310,7 @@ namespace Mall.Module.Product ...@@ -1284,6 +1310,7 @@ namespace Mall.Module.Product
} }
} }
TotalExpress += Express; TotalExpress += Express;
item.FreightMoney = Express;
item.Unit_Price = gmodel.SellingPrice ?? 0; item.Unit_Price = gmodel.SellingPrice ?? 0;
item.Original_Price = (item.Unit_Price) * (item.Number); item.Original_Price = (item.Unit_Price) * (item.Number);
if (umodel.MemberGrade > 0) if (umodel.MemberGrade > 0)
...@@ -1471,6 +1498,22 @@ namespace Mall.Module.Product ...@@ -1471,6 +1498,22 @@ namespace Mall.Module.Product
goods_ShoppingCartRepository.Update(keyValues2, wheres2); goods_ShoppingCartRepository.Update(keyValues2, wheres2);
} }
} }
if (umodel.DownlineCondition == Common.Enum.User.DistrbutorReferralsEnum.SCXD && umodel.IsBeDownline==2) {
//首次下单成为下线
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{nameof(RB_Member_User_Extend.IsBeDownline),1 },
{nameof(RB_Member_User_Extend.BeDownlineDate),DateTime.Now },
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Member_User_Extend.Id),
FiledValue=umodel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
member_UserRepository.Update(keyValues1, wheres1, trans);
}
//任务执行返佣 失败查看日志，手动返佣(空闲可增加手动返佣接口) //任务执行返佣 失败查看日志，手动返佣(空闲可增加手动返佣接口)
Task.Run(() => InsertOrderCommission(demodel, umodel, GoodsIds, OrderId)); Task.Run(() => InsertOrderCommission(demodel, umodel, GoodsIds, OrderId));
//记录日志 //记录日志
...@@ -1855,7 +1898,7 @@ namespace Mall.Module.Product ...@@ -1855,7 +1898,7 @@ namespace Mall.Module.Product
CostMoney = item.CostMoney, CostMoney = item.CostMoney,
CoverImage = item.CoverImage, CoverImage = item.CoverImage,
CreateDate = DateTime.Now, CreateDate = DateTime.Now,
DiscountRate = item.DiscountRate??0, DiscountRate = item.DiscountRate ?? 0,
Final_Price = item.Final_Price, Final_Price = item.Final_Price,
GoodsId = item.GoodsId, GoodsId = item.GoodsId,
GoodsName = item.GoodsName, GoodsName = item.GoodsName,
...@@ -1870,7 +1913,9 @@ namespace Mall.Module.Product ...@@ -1870,7 +1913,9 @@ namespace Mall.Module.Product
SpecificationSort = item.SpecificationSort, SpecificationSort = item.SpecificationSort,
Unit_Price = item.Unit_Price, Unit_Price = item.Unit_Price,
TenantId = demodel.TenantId, TenantId = demodel.TenantId,
UpdateDate = DateTime.Now UpdateDate = DateTime.Now,
IsComment = 2,
FreightMoney = item.FreightMoney
}, trans); }, trans);
item.Id = detailId; item.Id = detailId;
//更新商品数量 //更新商品数量
...@@ -2112,7 +2157,7 @@ namespace Mall.Module.Product ...@@ -2112,7 +2157,7 @@ namespace Mall.Module.Product
public bool SetAppletMyOrderAfterSale(RB_Goods_OrderAfterSale_Extend demodel) public bool SetAppletMyOrderAfterSale(RB_Goods_OrderAfterSale_Extend demodel)
{ {
var dModel = goods_OrderDetailRepository.GetEntity(demodel.OrderDetialId); var dModel = goods_OrderDetailRepository.GetEntity(demodel.OrderDetialId);
if (demodel.Type==1 && dModel.Final_Price < demodel.Refund) { if (demodel.Type==1 && ((dModel.Final_Price??0)-(dModel.FreightMoney??0)) < demodel.Refund) {
return false; return false;
} }
demodel.Income = dModel.Final_Price; demodel.Income = dModel.Final_Price;
...@@ -2359,6 +2404,63 @@ namespace Mall.Module.Product ...@@ -2359,6 +2404,63 @@ namespace Mall.Module.Product
} }
return list; return list;
} }
/// <summary>
/// 订单确认收货
/// </summary>
/// <param name="orderId"></param>
/// <param name="userId"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public bool SetAppletOrderGoodsReceiving(int orderId, int userId, int tenantId, int mallBaseId)
{
var omodel = goods_OrderRepository.GetEntity(orderId);
if (omodel == null) { return false; }
if (omodel.OrderStatus != OrderStatusEnum.WaitReceiving) { return false; }
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Goods_Order.OrderStatus), OrderStatusEnum.Received},
{ nameof(RB_Goods_Order.ReceivingTime), DateTime.Now},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods_Order.OrderId),
FiledValue=orderId,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Goods_Order.UserId),
FiledValue=userId,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Goods_Order.TenantId),
FiledValue=tenantId,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Goods_Order.MallBaseId),
FiledValue=mallBaseId,
OperatorEnum=OperatorEnum.Equal
}
};
bool flag = goods_OrderRepository.Update(keyValues, wheres);
if (flag)
{
//记录日志
goods_LogRepository.Insert(new RB_Goods_Log()
{
Content = "客人确认收货",
CreateDate = DateTime.Now,
Id = 0,
MallBaseId = mallBaseId,
SourceId = orderId,
TenantId = tenantId,
Type = 1
});
}
return flag;
}
#endregion #endregion
#region 订单管理 #region 订单管理
...@@ -2487,6 +2589,48 @@ namespace Mall.Module.Product ...@@ -2487,6 +2589,48 @@ namespace Mall.Module.Product
return list; return list;
} }
/// <summary>
/// 获取用户分销订单
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="demodel"></param>
/// <returns></returns>
public List<RB_Goods_OrderCommission_Extend> GetDistributionOrdersPageList_V2(int pageIndex, int pageSize, out long count, RB_Goods_OrderCommission_Extend demodel)
{
var oclist = goods_OrderCommissionRepository.GetListGroupByUser_V2(pageIndex, pageSize, out count, demodel);
if (oclist.Any())
{
//获取用户
var ulist = member_UserRepository.GetList(new RB_Member_User_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.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 = demodel.TenantId, MallBaseId = demodel.MallBaseId, OrderIds = orderIds });
//查询图片
List<RB_Material_Info_Extend> Mlist = new List<RB_Material_Info_Extend>();
if (dlist.Any())
{
Mlist = material_InfoRepository.GetList(new RB_Material_Info_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, MaterialIds = string.Join(",", dlist.Select(x => x.CoverImage)) });
foreach (var item in dlist)
{
item.CoverImagePath = Mlist.Where(x => x.Id == item.CoverImage).FirstOrDefault()?.Path ?? "";
}
}
foreach (var item in oclist)
{
var umodel = ulist.Where(x => x.Id == item.UserId).FirstOrDefault();
item.UserName = umodel?.Name ?? "";
item.Mobile = umodel?.Moblie ?? "";
item.OrderDetailList = dlist.Where(x => x.OrderId == item.OrderId).ToList();
}
}
return oclist;
}
/// <summary> /// <summary>
/// 获取分销订单 /// 获取分销订单
/// </summary> /// </summary>
...@@ -2730,6 +2874,7 @@ namespace Mall.Module.Product ...@@ -2730,6 +2874,7 @@ namespace Mall.Module.Product
odModel.CoverImagePath, odModel.CoverImagePath,
odModel.GoodsId, odModel.GoodsId,
odModel.GoodsName, odModel.GoodsName,
odModel.ProductCode,
SpecificationList = JsonConvert.DeserializeObject<List<string>>(odModel.Specification), SpecificationList = JsonConvert.DeserializeObject<List<string>>(odModel.Specification),
odModel.Number, odModel.Number,
odModel.Original_Price, odModel.Original_Price,
...@@ -3923,7 +4068,51 @@ namespace Mall.Module.Product ...@@ -3923,7 +4068,51 @@ namespace Mall.Module.Product
/// <returns></returns> /// <returns></returns>
public bool SetGoodsCommentInfo(RB_Goods_Comment_Extend demodel) public bool SetGoodsCommentInfo(RB_Goods_Comment_Extend demodel)
{ {
return goods_CommentRepository.Insert(demodel) > 0; int OrderId = 0;
if (demodel.OrderDetailId > 0) {
var dmodel = goods_OrderDetailRepository.GetEntity(demodel.OrderDetailId);
if (dmodel == null) { return false; }
OrderId = dmodel.OrderId ?? 0;
if (dmodel.IsComment == 1) { return false; }
var omodel = goods_OrderRepository.GetEntity(OrderId);
if (omodel == null) { return false; }
if (omodel.OrderStatus != OrderStatusEnum.Received) { return false; }
}
bool flag = goods_CommentRepository.Insert(demodel) > 0;
if (flag) {
if (demodel.OrderDetailId > 0) {
//更新订单商品为已评价
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Goods_OrderDetail.IsComment),1}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods_OrderDetail.Id),
FiledValue=demodel.OrderDetailId,
OperatorEnum=OperatorEnum.Equal
}
};
goods_OrderDetailRepository.Update(keyValues, wheres);
if (OrderId > 0) {
var dlist = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { OrderId = OrderId, IsComment = 2, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
if (!dlist.Any()) {
//更新订单为已完成
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Goods_Order.OrderStatus),OrderStatusEnum.Completed}
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods_Order.OrderId),
FiledValue=OrderId,
OperatorEnum=OperatorEnum.Equal
}
};
goods_OrderRepository.Update(keyValues1, wheres1);
}
}
}
}
return flag;
} }
/// <summary> /// <summary>
......
Mall.Module.User/UserModule.cs
View file @ 4b9b6294
...@@ -14,6 +14,7 @@ using Microsoft.Extensions.Configuration; ...@@ -14,6 +14,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Json; using Microsoft.Extensions.Configuration.Json;
using Newtonsoft.Json; using Newtonsoft.Json;
using Mall.Repository.BaseSetUp; using Mall.Repository.BaseSetUp;
using Mall.Common.Enum.User;
namespace Mall.Module.User namespace Mall.Module.User
{ {
...@@ -82,6 +83,14 @@ namespace Mall.Module.User ...@@ -82,6 +83,14 @@ namespace Mall.Module.User
/// 收藏表 /// 收藏表
/// </summary> /// </summary>
private readonly RB_Member_CollectionRepository member_CollectionRepository = new RB_Member_CollectionRepository(); private readonly RB_Member_CollectionRepository member_CollectionRepository = new RB_Member_CollectionRepository();
/// <summary>
/// 订单返佣
/// </summary>
private readonly RB_Goods_OrderCommissionRepository goods_OrderCommissionRepository = new RB_Goods_OrderCommissionRepository();
/// <summary>
/// 订单
/// </summary>
private readonly RB_Goods_OrderRepository goods_OrderRepository = new RB_Goods_OrderRepository();
/// <summary> /// <summary>
...@@ -1925,6 +1934,476 @@ namespace Mall.Module.User ...@@ -1925,6 +1934,476 @@ namespace Mall.Module.User
#endregion #endregion
#region 分销中心
/// <summary>
/// 验证分销商
/// </summary>
/// <param name="userId"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public object GetUserDistrbutorStatus(int userId, int tenantId, int mallBaseId)
{
var model = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { UserId = userId, TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
if (model == null)
{
return new
{
Status = 1,
Msg = "未申请成为分销商"
};
}
if (model.AuditStatus == Common.Enum.User.DistributorAuditStatusEnum.Reject)
{
return new
{
Status = 4,
Msg = "申请已被拒绝"
};
}
else if (model.AuditStatus == Common.Enum.User.DistributorAuditStatusEnum.Auditing)
{
return new
{
Status = 2,
Msg = "正在审核中"
};
}
else if (model.AuditStatus == Common.Enum.User.DistributorAuditStatusEnum.Audited)
{
return new
{
Status = 3,
Msg = "已是分销商"
};
}
return new
{
Status = 0,
Msg = ""
};
}
/// <summary>
/// 获取用户申请分销商页面信息
/// </summary>
/// <param name="userId"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public object GetUserApplyForDistrbutorInfo(int userId, int tenantId, int mallBaseId)
{
int SuperiorId = 0;
string SuperiorName = "总店";
var umodel = member_UserRepository.GetEntity(userId);
if (umodel.SuperiorId > 0)
{
SuperiorId = umodel.SuperiorId ?? 0;
var upmodel = member_UserRepository.GetEntity(umodel.SuperiorId ?? 0);
SuperiorName = upmodel?.Name ?? "";
}
else if (umodel.SuperiorId == 0 && umodel.IsBeDownline == 2 && umodel.WaitSuperiorId > 0) {
SuperiorId = umodel.WaitSuperiorId ?? 0;
var upmodel = member_UserRepository.GetEntity(umodel.WaitSuperiorId ?? 0);
SuperiorName = upmodel?.Name ?? "";
}
var CustomModel = distributor_CustomRepository.GetList(new RB_Distributor_Custom_Extend() { TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
if (CustomModel == null) {
return "";
}
string HeadImage = material_InfoRepository.GetEntity(CustomModel.HeadImage)?.Path??"";
string BottomImage = material_InfoRepository.GetEntity(CustomModel.BottomImage)?.Path??"";
return new
{
CustomModel = new
{
HeadImage,
BottomImage,
CustomModel.DistributionApplication,
CustomModel.ApplicationAgreement,
CustomModel.ButtonFilletPX,
CustomModel.ButtonText,
CustomModel.ButtonColor,
CustomModel.ButtonTextColor
},
ApplyForInfo = new
{
SuperiorId,
SuperiorName
}
};
}
/// <summary>
/// 申请成为分销商
/// </summary>
/// <param name="demodel"></param>
/// <returns></returns>
public bool SetUserApplyForBeDistrbutor(RB_Distributor_Info_Extend demodel)
{
var model = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { UserId = demodel.UserId, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
if (model != null)
{
return false;
}
return distributor_InfoRepository.Insert(demodel) > 0;
}
/// <summary>
/// 获取用户分销中心
/// </summary>
/// <param name="userInfo"></param>
/// <returns></returns>
public object GetDistrbutorCenter(AppletUserInfo userInfo)
{
var model = distributor_InfoRepository.GetList(new RB_Distributor_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 "分销商不存在";
}
//分销商等级
string GradeName = "默认等级";
if (model.GradeId > 0)
{
var gmodel = distributor_GradeRepository.GetEntity(model.GradeId);
GradeName = gmodel?.Name ?? "";
}
//已提现佣金 //未结算佣金
var commModel = distributor_RemitRepository.GetDistributorCommissionStatiscs(userInfo.UserId);
//提现总额
var remitMoney = distributor_RemitRepository.GetDistributorRemitCommission(userInfo.UserId);
//分销订单
decimal OrderCommission = goods_OrderCommissionRepository.GetUserOrderCommissionStatistics(userInfo.UserId);
int SuperiorId = 0;
string SuperiorName = "";
var umodel = member_UserRepository.GetEntity(userInfo.UserId);
if (umodel.SuperiorId > 0)
{
SuperiorId = umodel.SuperiorId ?? 0;
var upmodel = member_UserRepository.GetEntity(umodel.SuperiorId ?? 0);
SuperiorName = upmodel?.Name ?? "";
}
//下线数量
int oneNum = member_UserRepository.GetDistributorReferralsNumTwo(umodel.Id, 1, userInfo.TenantId, userInfo.MallBaseId);
int twoNum = member_UserRepository.GetDistributorReferralsNumTwo(umodel.Id, 1, userInfo.TenantId, userInfo.MallBaseId);
int threeNum = member_UserRepository.GetDistributorReferralsNumTwo(umodel.Id, 1, userInfo.TenantId, userInfo.MallBaseId);
var CustomModel = distributor_CustomRepository.GetList(new RB_Distributor_Custom_Extend() { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
if (CustomModel == null)
{
return "";
}
string DistributionCommissionImage = material_InfoRepository.GetEntity(CustomModel.DistributionCommissionImage)?.Path ?? "";
string DistributionOrderImage = material_InfoRepository.GetEntity(CustomModel.DistributionOrderImage)?.Path ?? "";
string WithdrawDetialsImage = material_InfoRepository.GetEntity(CustomModel.WithdrawDetialsImage)?.Path ?? "";
string MyTeamImage = material_InfoRepository.GetEntity(CustomModel.MyTeamImage)?.Path ?? "";
string PromoteQRCodeImage = material_InfoRepository.GetEntity(CustomModel.PromoteQRCodeImage)?.Path ?? "";
var basicsModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
return new
{
CustomModel = new
{
CustomModel.DistributionCommissionName,
DistributionCommissionImage,
CustomModel.DistributionOrderName,
DistributionOrderImage,
CustomModel.WithdrawDetialsName,
WithdrawDetialsImage,
CustomModel.MyTeamName,
MyTeamImage,
CustomModel.PromoteQRCodeName,
PromoteQRCodeImage,
CustomModel.ReferrerName,
CustomModel.CommissionForWithdrawalName,
CustomModel.WithdrawDepositName,
CustomModel.CommissionWithdrawnName,
CustomModel.OutstandingCommissionName,
CustomModel.DistributorName,
},
UserInfo = new
{
UserId = umodel.Id,
UserName = umodel.Name,
GradeName,
SuperiorId,
SuperiorName,
DistributorGradeEntrance = basicsModel?.GradeEntrance ?? 2,
CommissionWithdrawal = model.CommissionWithdrawal ?? 0,
TXCommission = commModel?.TXCommission ?? 0,
WJSCommission = commModel?.WJSCommission ?? 0,
model.TotalCommission,
OrderCommission,
RemitMoney = remitMoney,
ReferralsNum = oneNum + twoNum + threeNum
}
};
}
/// <summary>
/// 获取分销商升级条件
/// </summary>
/// <param name="userInfo"></param>
/// <returns></returns>
public object GetDistrbutorUpgradeConditions(AppletUserInfo userInfo)
{
var model = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { UserId = userInfo.UserId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
var gmodel = distributor_GradeRepository.GetEntity(model.GradeId);
var upgmodel = distributor_GradeRepository.GetDistrbutorUpgrade(gmodel?.Grade ?? 0, userInfo.TenantId, userInfo.MallBaseId);
if (upgmodel == null || upgmodel.IsAutoUpGrade != 1)
{
return new
{
Status = 2,
GradeInfo = new { }
};
}
else
{
return new
{
Status = 1,
GradeInfo =new
{
upgmodel.Id,
upgmodel.Grade,
upgmodel.Name,
upgmodel.UpGradeCondition,
UpGradeConditionName = upgmodel.UpGradeCondition.GetEnumName(),
upgmodel.ReferralsNumber,
upgmodel.TotalCommission,
upgmodel.CommissionWithdrawn,
upgmodel.DistributionCommissionType,
upgmodel.OneCommission,
upgmodel.TwoCommission,
upgmodel.ThreeCommission,
upgmodel.GradeExplain
}
};
}
}
/// <summary>
/// 获取提现余额
/// </summary>
/// <returns></returns>
public object GetDistrbutorWithdrawDepositBalance(AppletUserInfo userInfo)
{
var basicsModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
var disModel = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { UserId = userInfo.UserId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
decimal CanRemitMoney = -1;
if (basicsModel.DailyWithdrawalLimit != -1) {
//获取当日所有用户提现金额
decimal RemitMoney = distributor_RemitRepository.GetAllUserToDayRemitMoney(userInfo.TenantId, userInfo.MallBaseId);
CanRemitMoney = (basicsModel.DailyWithdrawalLimit ?? 0) - RemitMoney;
CanRemitMoney = CanRemitMoney < 0 ? 0 : CanRemitMoney;
}
//提现方式
List<int> WithdrawWayids = JsonConvert.DeserializeObject<List<int>>(basicsModel.WithdrawWay);
var list = EnumHelper.GetEnumList(typeof(DistrbutorWithdrawWayEnum));
var WayList = list.Where(x => WithdrawWayids.Contains(Convert.ToInt32(x.Value)));
return new
{
disModel.CommissionWithdrawal,
CanRemitMoney,
basicsModel.MinimumWithdrawalLimit,
basicsModel.WithdrawFee,
WithdrawWayList = WayList.Select(x => new
{
Id = Convert.ToInt32(x.Value),
Name = x.Key
})
};
}
/// <summary>
/// 提现
/// </summary>
/// <param name="demodel"></param>
/// <returns></returns>
public string SetDistrbutorWithdrawDeposit(RB_Distributor_Remit_Extend demodel)
{
//验证金额
var disModel = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { UserId = demodel.UserId, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
if ((disModel.CommissionWithdrawal ?? 0) < (demodel.AppliedMoney ?? 0)) {
return "账户余额不足，请刷新后再试";
}
var basicsModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
//提现方式
List<int> WithdrawWayids = JsonConvert.DeserializeObject<List<int>>(basicsModel.WithdrawWay);
if (!WithdrawWayids.Contains((int)(demodel.WithdrawalWay ?? DistrbutorWithdrawWayEnum.ZDDK)))
{
return "提现方式不正确";
}
//今日可提
decimal CanRemitMoney = -1;
if (basicsModel.DailyWithdrawalLimit != -1)
{
//获取当日所有用户提现金额
decimal RemitMoney = distributor_RemitRepository.GetAllUserToDayRemitMoney(demodel.TenantId, demodel.MallBaseId);
CanRemitMoney = (basicsModel.DailyWithdrawalLimit ?? 0) - RemitMoney;
CanRemitMoney = CanRemitMoney < 0 ? 0 : CanRemitMoney;
if (CanRemitMoney < (demodel.AppliedMoney ?? 0)) {
return "今日可提现余额不足";
}
}
//验证手续费
if (basicsModel.WithdrawFee > 0)
{
decimal fee = Math.Round((demodel.AppliedMoney ?? 0) * (basicsModel.WithdrawFee ?? 0) / 100, 2, MidpointRounding.AwayFromZero);
if (demodel.Fee != fee)
{
return "手续费计算不准确";
}
if (demodel.RemitMoney != (demodel.AppliedMoney ?? 0) - fee)
{
return "最终金额不正确";
}
}
else {
demodel.Fee = 0;
demodel.RemitMoney = demodel.AppliedMoney;
}
var trans = distributor_RemitRepository.DbTransaction;
try
{
bool flag = distributor_RemitRepository.Insert(demodel, trans) > 0;
if (flag) {
//扣除账户可提佣金
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Distributor_Info.CommissionWithdrawal),(disModel.CommissionWithdrawal ?? 0) - (demodel.AppliedMoney ?? 0)}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Distributor_Info.Id),
FiledValue=disModel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
distributor_InfoRepository.Update(keyValues, wheres, trans);
}
distributor_RemitRepository.DBSession.Commit();
return "";
}
catch (Exception ex)
{
LogHelper.Write(ex, "SetDistrbutorWithdrawDeposit");
distributor_RemitRepository.DBSession.Rollback();
return "出错了，请联系管理员";
}
}
/// <summary>
/// 获取分销佣金页面详情
/// </summary>
/// <param name="userInfo"></param>
/// <returns></returns>
public object GetDistrbutorCommissionInfo(AppletUserInfo userInfo)
{
var model = distributor_InfoRepository.GetList(new RB_Distributor_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 CustomModel = distributor_CustomRepository.GetList(new RB_Distributor_Custom_Extend() { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
if (CustomModel == null)
{
return "";
}
return new
{
CustomModel = new
{
CustomModel.CommissionTobePaidName,
CustomModel.UserNotesName,
CustomModel.IWantToWithdrawName
},
CommissionInfo = new
{
model.TotalCommission,
CommissionWithdrawal = model.CommissionWithdrawal ?? 0,
TXCommission = commModel?.TXCommission ?? 0,
WJSCommission = commModel?.WJSCommission ?? 0
}
};
}
/// <summary>
/// 获取我的团队
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="demodel"></param>
/// <returns></returns>
public object GetUserMyTeamPageList(int pageIndex, int pageSize, out long count, RB_Distributor_Info_Extend demodel)
{
var list = member_UserRepository.GetDistributorReferralsPageList(pageIndex, pageSize, out count, demodel);
List<object> RList = new List<object>();
if (list.Any()) {
string userIds = string.Join(",", list.Select(x => x.Id));
//获取推广人数
var tList = member_UserRepository.GetDistributorReferralsNum(userIds, 1, demodel.TenantId, demodel.MallBaseId);
//获取消费金额 + 订单数量
var oList = goods_OrderRepository.GetUserOrderNumAndMoney(userIds, demodel.TenantId, demodel.MallBaseId);
foreach (var item in list) {
int tgNum = tList.Where(x => x.SuperiorId == item.Id).FirstOrDefault()?.ReferralsNum ?? 0;
var orderModel = oList.Where(x => x.UserId == item.Id).FirstOrDefault();
RList.Add(new
{
UserId = item.Id,
UserName = item.Name,
item.Photo,
CreateDate = item.CreateDate.HasValue ? item.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
GeneralizeNum = tgNum,
OrderNum = orderModel?.OrderNum ?? 0,
Income = orderModel?.Income ?? 0
});
}
}
return RList;
}
/// <summary>
/// 获取我的团队自定义信息
/// </summary>
/// <param name="userInfo"></param>
/// <returns></returns>
public object GetUserMyTeamCustomInfo(AppletUserInfo userInfo)
{
var CustomModel = distributor_CustomRepository.GetList(new RB_Distributor_Custom_Extend() { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
return new
{
CustomModel.OneDistributionName,
CustomModel.TwoDistributionName,
CustomModel.ThreeDistributionName
};
}
#endregion
#region 数据统计-分销排行 #region 数据统计-分销排行
/// <summary> /// <summary>
/// 分页列表 /// 分页列表
......
Mall.Repository/Product/RB_Goods_OrderCommissionRepository.cs
View file @ 4b9b6294
...@@ -5,6 +5,7 @@ using Mall.Model.Entity.Product; ...@@ -5,6 +5,7 @@ using Mall.Model.Entity.Product;
using Mall.Model.Extend.Product; using Mall.Model.Extend.Product;
using System.Linq; using System.Linq;
using Mall.Model.Entity.User; using Mall.Model.Entity.User;
using Mall.Common.Enum.Goods;
namespace Mall.Repository.Product namespace Mall.Repository.Product
{ {
...@@ -79,5 +80,70 @@ 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"; 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(); 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
View file @ 4b9b6294
...@@ -45,6 +45,9 @@ namespace Mall.Repository.Product ...@@ -45,6 +45,9 @@ namespace Mall.Repository.Product
{ {
where += $@" and {nameof(RB_Goods_OrderDetail.OrderType)}={(int)dmodel.OrderType}"; 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)) if (!string.IsNullOrEmpty(dmodel.GoodsName))
{ {
where += $@" and {nameof(RB_Goods_OrderDetail.GoodsName)} like '%{dmodel.GoodsName}%'"; where += $@" and {nameof(RB_Goods_OrderDetail.GoodsName)} like '%{dmodel.GoodsName}%'";
......
Mall.Repository/Product/RB_Goods_OrderRepository.cs
View file @ 4b9b6294
...@@ -396,6 +396,77 @@ WHERE od.GoodsId in({goodsIds}) and o.`Status`=0 and o.OrderStatus <> 7 group by ...@@ -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(); 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 数据统计-数据概况 #region 数据统计-数据概况
...@@ -508,8 +579,7 @@ LEFT JOIN rb_goods_order as b on a.OrderId=b.OrderId ...@@ -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} 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 "; GROUP BY a.GoodsId ORDER BY SUM(a.Final_Price) desc LIMIT 100 ";
return Get<DataStatistics_Query>(sql).ToList(); return Get<DataStatistics_Query>(sql).ToList();
} }
/// <summary> /// <summary>
/// 用户购买力TOP排行 /// 用户购买力TOP排行
......
Mall.Repository/User/RB_Distributor_GradeRepository.cs
View file @ 4b9b6294
...@@ -87,5 +87,25 @@ namespace Mall.Repository.User ...@@ -87,5 +87,25 @@ namespace Mall.Repository.User
string sql = $@"select * from RB_Distributor_Grade where {where} order by Id desc"; string sql = $@"select * from RB_Distributor_Grade where {where} order by Id desc";
return Get<RB_Distributor_Grade_Extend>(sql).ToList(); 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
View file @ 4b9b6294
...@@ -55,7 +55,7 @@ namespace Mall.Repository.User ...@@ -55,7 +55,7 @@ namespace Mall.Repository.User
where += $@" and di.{nameof(RB_Distributor_Info.Mobile)} like '%{dmodel.Mobile}%'"; 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 inner join rb_member_user u on di.UserId=u.Id
where {where} order by di.CreateDate desc"; where {where} order by di.CreateDate desc";
return GetPage<RB_Distributor_Info_Extend>(pageIndex, pageSize, out rowCount, sql).ToList(); return GetPage<RB_Distributor_Info_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
......
Mall.Repository/User/RB_Distributor_RemitRepository.cs
View file @ 4b9b6294
...@@ -102,5 +102,50 @@ left join rb_member_user u on r.UserId = u.Id ...@@ -102,5 +102,50 @@ left join rb_member_user u on r.UserId = u.Id
where {where} order by r.Id desc"; where {where} order by r.Id desc";
return Get<RB_Distributor_Remit_Extend>(sql).ToList(); 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
View file @ 4b9b6294
...@@ -282,7 +282,7 @@ select * from RB_Member_User where {where} order by CreateDate desc ...@@ -282,7 +282,7 @@ select * from RB_Member_User where {where} order by CreateDate desc
} }
/// <summary> /// <summary>
/// 获取下线分销商数量 /// 获取下线数量
/// </summary> /// </summary>
/// <param name="uids"></param> /// <param name="uids"></param>
/// <param name="tier"></param> /// <param name="tier"></param>
...@@ -314,6 +314,76 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId in ({ ...@@ -314,6 +314,76 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId in ({
return new List<RB_Member_User_Extend>(); 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>
/// 获取下级用户列表 /// 获取下级用户列表
/// </summary> /// </summary>
......
Mall.WebApi/Controllers/Product/AppletOrderController.cs
View file @ 4b9b6294
...@@ -192,7 +192,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -192,7 +192,8 @@ namespace Mall.WebApi.Controllers.MallBase
SpecificationList = JsonConvert.DeserializeObject<List<string>>(y.Specification), SpecificationList = JsonConvert.DeserializeObject<List<string>>(y.Specification),
y.ProductCode, y.ProductCode,
y.Final_Price, y.Final_Price,
y.Number y.Number,
y.IsComment
}), }),
x.OrderStatus, x.OrderStatus,
OrderStatusName = x.OrderStatus.GetEnumName(), OrderStatusName = x.OrderStatus.GetEnumName(),
...@@ -203,6 +204,16 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -203,6 +204,16 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Success("", pagelist); 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>
/// 获取我的订单详情 /// 获取我的订单详情
/// </summary> /// </summary>
...@@ -369,7 +380,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -369,7 +380,7 @@ namespace Mall.WebApi.Controllers.MallBase
demodel.MerchantsNo ??= ""; demodel.MerchantsNo ??= "";
demodel.Recycled ??= 2; demodel.Recycled ??= 2;
demodel.Refund ??= 0; demodel.Refund ??= 0;
demodel.Status = 0; demodel.Status = 0;
demodel.UpdateDate = DateTime.Now; demodel.UpdateDate = DateTime.Now;
demodel.UserId = userInfo.UserId; demodel.UserId = userInfo.UserId;
#endregion #endregion
...@@ -402,6 +413,24 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -402,6 +413,24 @@ namespace Mall.WebApi.Controllers.MallBase
if (flag) { return ApiResult.Success(); } else { return ApiResult.Failed(); } 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 #endregion
#region 订单售后 #region 订单售后
...@@ -633,6 +662,10 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -633,6 +662,10 @@ namespace Mall.WebApi.Controllers.MallBase
var req = RequestParm; var req = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
RB_Goods_Comment_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Comment_Extend>(req.msg.ToString()); 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) if ((demodel.GoodsId ?? 0) <= 0)
{ {
return ApiResult.ParamIsNull("请传递商品"); return ApiResult.ParamIsNull("请传递商品");
...@@ -670,5 +703,55 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -670,5 +703,55 @@ namespace Mall.WebApi.Controllers.MallBase
} }
#endregion #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
View file @ 4b9b6294
...@@ -853,6 +853,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -853,6 +853,7 @@ namespace Mall.WebApi.Controllers.MallBase
demodel.TenantId = parms.TenantId; demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId; demodel.MallBaseId = parms.MallBaseId;
demodel.Recycled = 2;
var list = orderModule.GetDistributionOrdersPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel); var list = orderModule.GetDistributionOrdersPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count); pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new pagelist.pageData = list.Select(x => new
...@@ -878,7 +879,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -878,7 +879,7 @@ namespace Mall.WebApi.Controllers.MallBase
y.OrderType, y.OrderType,
OrderTypeName = y.OrderType.GetEnumName(), OrderTypeName = y.OrderType.GetEnumName(),
y.GoodsName, y.GoodsName,
y.Specification, SpecificationList = JsonConvert.DeserializeObject<List<string>>(y.Specification),
y.ProductCode, y.ProductCode,
y.Final_Price, y.Final_Price,
y.Number y.Number
...@@ -1117,6 +1118,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1117,6 +1118,7 @@ namespace Mall.WebApi.Controllers.MallBase
x.OrderDetailModel.GoodsName, x.OrderDetailModel.GoodsName,
x.OrderDetailModel.GoodsId, x.OrderDetailModel.GoodsId,
x.OrderDetailModel.CoverImagePath, x.OrderDetailModel.CoverImagePath,
x.OrderDetailModel.ProductCode,
SpecificationList = JsonConvert.DeserializeObject<List<string>>(x.OrderDetailModel.Specification), SpecificationList = JsonConvert.DeserializeObject<List<string>>(x.OrderDetailModel.Specification),
}, },
x.Type, x.Type,
......
Mall.WebApi/Controllers/User/AppletLoginController.cs
View file @ 4b9b6294
...@@ -83,6 +83,20 @@ namespace Mall.WebApi.Controllers.User ...@@ -83,6 +83,20 @@ namespace Mall.WebApi.Controllers.User
demodel.Remark ??= ""; demodel.Remark ??= "";
demodel.TotalConsumption ??= 0; demodel.TotalConsumption ??= 0;
#endregion #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.TenantId = requestParm.TenantId;
demodel.MallBaseId = requestParm.MallBaseId; demodel.MallBaseId = requestParm.MallBaseId;
...@@ -164,10 +178,12 @@ namespace Mall.WebApi.Controllers.User ...@@ -164,10 +178,12 @@ namespace Mall.WebApi.Controllers.User
MallBaseId = umodel.MallBaseId, MallBaseId = umodel.MallBaseId,
MallName = mmodel?.MallName ?? "", MallName = mmodel?.MallName ?? "",
Mobile = umodel.Moblie, Mobile = umodel.Moblie,
UserId = umodel.Id,
TenantId = umodel.TenantId, TenantId = umodel.TenantId,
Name = umodel.Name, Name = umodel.Name,
OpenId = umodel.OpenId, OpenId = umodel.OpenId,
Photo = umodel.Photo, Photo = umodel.Photo,
Source = demodel.Source,
SecretKey = umodel.SecretKey, SecretKey = umodel.SecretKey,
SuperiorId = umodel.SuperiorId ?? 0, SuperiorId = umodel.SuperiorId ?? 0,
Token = token Token = token
......
Mall.WebApi/Controllers/User/AppletUserController.cs
View file @ 4b9b6294
...@@ -283,5 +283,229 @@ namespace Mall.WebApi.Controllers.User ...@@ -283,5 +283,229 @@ namespace Mall.WebApi.Controllers.User
} }
#endregion #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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment