Skip to content

M
mall.oytour.com
Commit 208fe131 authored by 吴春's avatar 吴春
Browse files
Options

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

parents f2c89104 5601d806
Hide whitespace changes
Inline Side-by-side
Showing with 195 additions and 21 deletions
Mall.Common/Config.cs
View file @ 208fe131
...@@ -540,6 +540,17 @@ namespace Mall.Common ...@@ -540,6 +540,17 @@ namespace Mall.Common
} }
} }
/// <summary>
/// 生成收入财务单据
/// </summary>
public static string IsNormalServer
{
get
{
return ReadConfigKey("IsNormalServer");
}
}
/// <summary> /// <summary>
/// 财务单据请求参数Key /// 财务单据请求参数Key
/// </summary> /// </summary>
......
Mall.Module.Product/OrderModule.cs
View file @ 208fe131
...@@ -6477,6 +6477,91 @@ namespace Mall.Module.Product ...@@ -6477,6 +6477,91 @@ namespace Mall.Module.Product
return oclist; return oclist;
} }
/// <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> GetDistributionOrdersPageListModule(int pageIndex, int pageSize, out long count, RB_Goods_OrderCommission_Extend demodel)
{
var oclist = goods_OrderCommissionRepository.GetListGroupByUserRepository(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())
{
foreach (var item in dlist)
{
item.CoverImagePath = item.CoverImage;
}
}
var HpgradeList = new List<RB_Distributor_HPGradeInfo_Extend>();
if (oclist.Where(x => x.Type == 2).Any())
{
string gradeIds = string.Join(",", oclist.Where(x => x.Type == 2).Select(x => x.Grade).Distinct());
HpgradeList = distributor_HPGradeInfoRepository.GetList(new RB_Distributor_HPGradeInfo_Extend() { GradeIds = gradeIds, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }, true);
}
var FXGradeList = new List<RB_Distributor_FXGrade_Extend>();
if (oclist.Where(x => x.Type == 3).Any())
{
string gradeIds = string.Join(",", oclist.Where(x => x.Type == 3).Select(x => x.Grade).Distinct());
FXGradeList = distributor_FXGradeRepository.GetList(new RB_Distributor_FXGrade_Extend() { GradeIds = gradeIds, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
}
foreach (var item in oclist)
{
var umodel = ulist.Where(x => x.Id == item.UserId).FirstOrDefault();
item.UserName = umodel?.Name ?? "";
item.Mobile = umodel?.Moblie ?? "";
item.Photo = umodel?.Photo ?? "";
item.OrderDetailList = dlist.Where(x => x.OrderId == item.OrderId).ToList();
if (item.Type == 1)
{
if (item.Grade == 0)
{
item.GradeDescription = "自购返利";
}
else if (item.Grade == 1)
{
item.GradeDescription = "一级佣金";
}
else if (item.Grade == 2)
{
item.GradeDescription = "二级佣金";
}
else if (item.Grade == 3)
{
item.GradeDescription = "三级佣金";
}
}
else if (item.Type == 2)
{
var hpGModel = HpgradeList.Where(x => x.Id == item.Grade).FirstOrDefault();
item.GradeDescription = hpGModel?.GradeName ?? "暂无等级";
}
else if (item.Type == 3)
{
var fxGModel = FXGradeList.Where(x => x.Id == item.Grade).FirstOrDefault();
item.GradeDescription = fxGModel?.GradeName ?? "暂无等级";
item.GradeDescription += "佣金";
}
}
}
return oclist;
}
/// <summary> /// <summary>
/// 获取用户分销订单 /// 获取用户分销订单
/// </summary> /// </summary>
......
Mall.Repository/Product/RB_Goods_OrderCommissionRepository.cs
View file @ 208fe131
...@@ -231,6 +231,69 @@ where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Type,oc.Grade order by ...@@ -231,6 +231,69 @@ where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Type,oc.Grade order by
return GetPage<RB_Goods_OrderCommission_Extend>(pageIndex, pageSize, out count, sql).ToList(); return GetPage<RB_Goods_OrderCommission_Extend>(pageIndex, pageSize, out count, 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> GetListGroupByUserRepository(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 o.{nameof(RB_Goods_OrderCommission.TenantId)}={dmodel.TenantId}";
}
if (dmodel.MallBaseId > 0)
{
where += $@" and o.{nameof(RB_Goods_OrderCommission.MallBaseId)}={dmodel.MallBaseId}";
}
if (dmodel.OrderId > 0)
{
where += $@" and o.{nameof(RB_Goods_OrderCommission.OrderId)}={dmodel.OrderId}";
}
if (dmodel.UserId > 0)
{
where += string.Format(@" and o.UserId={0} ", 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;
}
}
else
{
where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,3,4,5,6)";
}
string sql = $@"
SELECT o.OrderId,o.OrderNo,o.UserId,o.OrderStatus AS DistrbutionOrderSelectStatus
,IFNULL(oc.Commission,0) AS Commission,oc.Type AS Type,oc.Grade AS Grade,oc.CommissionState AS CommissionState
FROM rb_goods_order o
LEFT JOIN (
SELECT goc.OrderId,goc.UserId,goc.Type,goc.Grade,goc.CommissionState,SUM(goc.Commission) as Commission
FROM RB_Goods_OrderCommission as goc
LEFT JOIN rb_goods_orderaftersale oa on goc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
GROUP BY goc.OrderId,goc.UserId,goc.Type,goc.Grade,goc.CommissionState
)
AS oc ON oc.OrderId = o.OrderId AND o.UserId=oc.UserId
WHERE {where}
order by o.OrderId desc
";
var list= GetPage<RB_Goods_OrderCommission_Extend>(pageIndex, pageSize, out count, sql).ToList();
return list;
}
/// <summary> /// <summary>
/// 获取用户返佣 /// 获取用户返佣
/// </summary> /// </summary>
......
Mall.WebApi/Controllers/Product/AppletOrderController.cs
View file @ 208fe131
...@@ -40,6 +40,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -40,6 +40,7 @@ namespace Mall.WebApi.Controllers.MallBase
private readonly OrderModule orderModule = new OrderModule(); private readonly OrderModule orderModule = new OrderModule();
private readonly Module.User.MiniProgramModule programModule = new Module.User.MiniProgramModule(); private readonly Module.User.MiniProgramModule programModule = new Module.User.MiniProgramModule();
private readonly UserModule userModule = new UserModule();
#region 购物车 #region 购物车
/// <summary> /// <summary>
...@@ -285,11 +286,15 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -285,11 +286,15 @@ namespace Mall.WebApi.Controllers.MallBase
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
JObject parms = JObject.Parse(req.msg.ToString()); JObject parms = JObject.Parse(req.msg.ToString());
int OrderId = parms.GetInt("OrderId", 0); int OrderId = parms.GetInt("OrderId", 0);
//HK2020-08-08新增
if (parms.GetInt("NewUserId") > 0)
{
userInfo.UserId = parms.GetInt("NewUserId");
}
if (OrderId <= 0) if (OrderId <= 0)
{ {
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
return orderModule.GetAppletMyOrderInfo(OrderId, userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId); return orderModule.GetAppletMyOrderInfo(OrderId, userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId);
} }
...@@ -986,11 +991,33 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -986,11 +991,33 @@ namespace Mall.WebApi.Controllers.MallBase
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString()); ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
RB_Goods_OrderCommission_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_OrderCommission_Extend>(req.msg.ToString()); RB_Goods_OrderCommission_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_OrderCommission_Extend>(req.msg.ToString());
//HK 2020-08-27新增
JObject parms = JObject.Parse(req.msg.ToString());
demodel.TenantId = userInfo.TenantId; demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId; demodel.MallBaseId = userInfo.MallBaseId;
demodel.UserId = userInfo.UserId; demodel.UserId = userInfo.UserId;
var list = orderModule.GetDistributionOrdersPageList_V2(pagelist.pageIndex, pagelist.pageSize, out long count, demodel); List<RB_Goods_OrderCommission_Extend> list = new List<RB_Goods_OrderCommission_Extend>();
long count = 0;
if (parms.GetInt("NewUserId") > 0)
{
demodel.UserId = parms.GetInt("NewUserId");
list = orderModule.GetDistributionOrdersPageListModule(pagelist.pageIndex, pagelist.pageSize, out count, demodel);
}
else
{
list = orderModule.GetDistributionOrdersPageList_V2(pagelist.pageIndex, pagelist.pageSize, out count, demodel);
}
List<RB_Member_User_Extend> memberList = new List<RB_Member_User_Extend>();
if (list != null && list.Count > 0)
{
var userIds = string.Join(",", list.Select(qitem => qitem.UserId));
if (!string.IsNullOrWhiteSpace(userIds))
{
memberList = userModule.GetUserListExtModule(new RB_Member_User_Extend() { UserIds = userIds });
}
}
pagelist.count = Convert.ToInt32(count); pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new pagelist.pageData = list.Select(x => new
{ {
...@@ -1010,6 +1037,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1010,6 +1037,7 @@ namespace Mall.WebApi.Controllers.MallBase
y.Final_Price, y.Final_Price,
y.Number y.Number
}), }),
Icon = memberList?.Where(qitem => qitem.Id == x.UserId)?.FirstOrDefault()?.Icon ?? "",
x.UserId, x.UserId,
x.UserName, x.UserName,
x.Photo, x.Photo,
......
Mall.WebApi/Controllers/User/AppletUserController.cs
View file @ 208fe131
...@@ -1707,22 +1707,9 @@ namespace Mall.WebApi.Controllers.User ...@@ -1707,22 +1707,9 @@ namespace Mall.WebApi.Controllers.User
demodel.TenantId = userInfo.TenantId; demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId; demodel.MallBaseId = userInfo.MallBaseId;
demodel.UserId = userInfo.UserId; demodel.UserId = userInfo.UserId;
//HK 2020-08-27新增
JObject parms = JObject.Parse(req.msg.ToString());
if (parms.GetInt("NewUserId") > 0)
{
demodel.UserId = parms.GetInt("NewUserId");
}
List<RB_Member_User_Extend> memberList = new List<RB_Member_User_Extend>(); List<RB_Member_User_Extend> memberList = new List<RB_Member_User_Extend>();
var list = userModule.GetOrderIntroductionPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel); var list = userModule.GetOrderIntroductionPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
if (list != null && list.Count > 0)
{
var userIds = string.Join(",",list.Select(qitem => qitem.UserId));
if (!string.IsNullOrWhiteSpace(userIds))
{
memberList= userModule.GetUserListExtModule(new RB_Member_User_Extend() { UserIds = userIds });
}
}
pagelist.count = Convert.ToInt32(count); pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new pagelist.pageData = list.Select(x => new
{ {
...@@ -1741,7 +1728,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -1741,7 +1728,7 @@ namespace Mall.WebApi.Controllers.User
y.Number y.Number
}), }),
x.UserId, x.UserId,
Icon= memberList?.Where(qitem=>qitem.Id==x.UserId)?.FirstOrDefault()?.Icon??"",
x.UserName, x.UserName,
x.Photo, x.Photo,
x.Mobile, x.Mobile,
......
Mall.WindowsService/Module/FinanceModule.cs
View file @ 208fe131
...@@ -901,7 +901,7 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A ...@@ -901,7 +901,7 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
Random R = new Random(); Random R = new Random();
int Rstr = R.Next(111, 999); int Rstr = R.Next(111, 999);
string OrderNum = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr; string OrderNum = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr;
int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value); int IsNormalServer = Convert.ToInt32(Config.IsNormalServer);
var flagpay = false; var flagpay = false;
if (IsNormalServer == 1) if (IsNormalServer == 1)
{ {
...@@ -1504,7 +1504,7 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A ...@@ -1504,7 +1504,7 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
Random R = new Random(); Random R = new Random();
int Rstr = R.Next(111, 999); int Rstr = R.Next(111, 999);
string OrderNum = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr; string OrderNum = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr;
int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value); int IsNormalServer = Convert.ToInt32(Config.IsNormalServer);
var flagpay = false; var flagpay = false;
if (IsNormalServer == 1) if (IsNormalServer == 1)
{ {
...@@ -1837,7 +1837,7 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A ...@@ -1837,7 +1837,7 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
Random R = new Random(); Random R = new Random();
int Rstr = R.Next(111, 999); int Rstr = R.Next(111, 999);
string OrderNum = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr; string OrderNum = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr;
int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value); int IsNormalServer = Convert.ToInt32(Config.IsNormalServer);
var flagpay = false; var flagpay = false;
if (IsNormalServer == 1) if (IsNormalServer == 1)
{ {
......
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