Skip to content

M
mall.oytour.com
Commit 109fdae5 authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent ca52ab5f
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 65 deletions
Mall.Module.User/UserModule.cs
View file @ 109fdae5
...@@ -1981,63 +1981,66 @@ namespace Mall.Module.User ...@@ -1981,63 +1981,66 @@ namespace Mall.Module.User
{ {
//所有未提现的 返佣 //所有未提现的 返佣
var clist = goods_OrderCommissionRepository.GetUserCommissionRemit(remitModel.UserId ?? 0); var clist = goods_OrderCommissionRepository.GetUserCommissionRemit(remitModel.UserId ?? 0);
//获取订单列表 if (clist.Any())
string OrderIds = string.Join(",", clist.Select(x => x.OrderId).Distinct());
var olist = goods_OrderRepository.GetOrderList(new RB_Goods_Order_Extend() { OrderIds = OrderIds });
olist = olist.OrderByDescending(x => x.CreateDate).ToList();
List<int> OrderIdList = new List<int>();
string OrderNos = "";
decimal TMoney = (remitModel.AppliedMoney ?? 0);
//开始递减金额 订单不足的 给与提示
foreach (var item in olist)
{ {
if (TMoney > 0) //获取订单列表
string OrderIds = string.Join(",", clist.Select(x => x.OrderId).Distinct());
var olist = goods_OrderRepository.GetOrderList(new RB_Goods_Order_Extend() { OrderIds = OrderIds });
olist = olist.OrderByDescending(x => x.CreateDate).ToList();
List<int> OrderIdList = new List<int>();
string OrderNos = "";
decimal TMoney = (remitModel.AppliedMoney ?? 0);
//开始递减金额 订单不足的 给与提示
foreach (var item in olist)
{ {
decimal CommMoney = 0; if (TMoney > 0)
var chlist = clist.Where(x => x.OrderId == item.OrderId).ToList();
foreach (var qitem in chlist)
{ {
TMoney -= (qitem.Commission ?? 0); decimal CommMoney = 0;
CommMoney+= (qitem.Commission ?? 0); var chlist = clist.Where(x => x.OrderId == item.OrderId).ToList();
Dictionary<string, object> keyValues2 = new Dictionary<string, object>() { foreach (var qitem in chlist)
{
TMoney -= (qitem.Commission ?? 0);
CommMoney += (qitem.Commission ?? 0);
Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
{ nameof(RB_Goods_OrderCommission_Extend.IsRemit),1} { nameof(RB_Goods_OrderCommission_Extend.IsRemit),1}
}; };
List<WhereHelper> wheres2 = new List<WhereHelper>() { List<WhereHelper> wheres2 = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
FiledName=nameof(RB_Goods_OrderCommission_Extend.Id), FiledName=nameof(RB_Goods_OrderCommission_Extend.Id),
FiledValue=qitem.Id, FiledValue=qitem.Id,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
goods_OrderCommissionRepository.Update(keyValues2, wheres2); goods_OrderCommissionRepository.Update(keyValues2, wheres2);
}
OrderNos += "\"" + item.OrderNo + "\"：" + CommMoney + "元，";
OrderIdList.Add(item.OrderId);
} }
OrderNos += "\"" + item.OrderNo + "\"：" + CommMoney + "元，";
OrderIdList.Add(item.OrderId);
} }
} if (!string.IsNullOrEmpty(OrderNos))
if (!string.IsNullOrEmpty(OrderNos)) {
{ OrderNos = OrderNos[0..^1];
OrderNos = OrderNos[0..^1]; }
} if (TMoney > 0)
if (TMoney > 0) {
{ OrderNos += " 余额" + TMoney + "尚未找到相关订单";
OrderNos += " 余额" + TMoney + "尚未找到相关订单"; }
}
if (!string.IsNullOrEmpty(OrderNos)) if (!string.IsNullOrEmpty(OrderNos))
{ {
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() { Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Distributor_Remit_Extend.ReOrderNos),OrderNos}, { nameof(RB_Distributor_Remit_Extend.ReOrderNos),OrderNos},
{ nameof(RB_Distributor_Remit_Extend.ReOrderIds),JsonConvert.SerializeObject(OrderIdList)}, { nameof(RB_Distributor_Remit_Extend.ReOrderIds),JsonConvert.SerializeObject(OrderIdList)},
}; };
List<WhereHelper> wheres1 = new List<WhereHelper>() { List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
FiledName=nameof(RB_Distributor_Remit_Extend.Id), FiledName=nameof(RB_Distributor_Remit_Extend.Id),
FiledValue=remitId, FiledValue=remitId,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
distributor_RemitRepository.Update(keyValues1, wheres1); distributor_RemitRepository.Update(keyValues1, wheres1);
}
} }
} }
#endregion #endregion
...@@ -3214,59 +3217,66 @@ namespace Mall.Module.User ...@@ -3214,59 +3217,66 @@ namespace Mall.Module.User
if (demodel.TenantId == 1) { if (demodel.TenantId == 1) {
//所有未提现的 返佣 //所有未提现的 返佣
var clist = goods_OrderCommissionRepository.GetUserCommissionRemit(demodel.UserId ?? 0); var clist = goods_OrderCommissionRepository.GetUserCommissionRemit(demodel.UserId ?? 0);
//获取订单列表 if (clist.Any())
string OrderIds = string.Join(",", clist.Select(x => x.OrderId).Distinct()); {
var olist = goods_OrderRepository.GetOrderList(new RB_Goods_Order_Extend() { OrderIds = OrderIds }); //获取订单列表
olist = olist.OrderByDescending(x => x.CreateDate).ToList(); string OrderIds = string.Join(",", clist.Select(x => x.OrderId).Distinct());
List<int> OrderIdList = new List<int>(); var olist = goods_OrderRepository.GetOrderList(new RB_Goods_Order_Extend() { OrderIds = OrderIds });
string OrderNos = ""; olist = olist.OrderByDescending(x => x.CreateDate).ToList();
decimal TMoney = (demodel.AppliedMoney ?? 0); List<int> OrderIdList = new List<int>();
//开始递减金额 订单不足的 给与提示 string OrderNos = "";
foreach (var item in olist) { decimal TMoney = (demodel.AppliedMoney ?? 0);
if (TMoney > 0) //开始递减金额 订单不足的 给与提示
foreach (var item in olist)
{ {
decimal CommMoney = 0; if (TMoney > 0)
var chlist = clist.Where(x => x.OrderId == item.OrderId).ToList();
foreach (var qitem in chlist)
{ {
TMoney -= (qitem.Commission ?? 0); decimal CommMoney = 0;
CommMoney += (qitem.Commission ?? 0); var chlist = clist.Where(x => x.OrderId == item.OrderId).ToList();
Dictionary<string, object> keyValues2 = new Dictionary<string, object>() { foreach (var qitem in chlist)
{
TMoney -= (qitem.Commission ?? 0);
CommMoney += (qitem.Commission ?? 0);
Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
{ nameof(RB_Goods_OrderCommission_Extend.IsRemit),1} { nameof(RB_Goods_OrderCommission_Extend.IsRemit),1}
}; };
List<WhereHelper> wheres2 = new List<WhereHelper>() { List<WhereHelper> wheres2 = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
FiledName=nameof(RB_Goods_OrderCommission_Extend.Id), FiledName=nameof(RB_Goods_OrderCommission_Extend.Id),
FiledValue=qitem.Id, FiledValue=qitem.Id,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
goods_OrderCommissionRepository.Update(keyValues2, wheres2, trans); goods_OrderCommissionRepository.Update(keyValues2, wheres2, trans);
}
OrderNos += "\"" + item.OrderNo + "\"：" + CommMoney + "元，";
OrderIdList.Add(item.OrderId);
} }
OrderNos += "\"" + item.OrderNo + "\"：" + CommMoney + "元，";
OrderIdList.Add(item.OrderId);
} }
} if (!string.IsNullOrEmpty(OrderNos))
if (!string.IsNullOrEmpty(OrderNos)) { {
OrderNos = OrderNos[0..^1]; OrderNos = OrderNos[0..^1];
} }
if (TMoney > 0) { if (TMoney > 0)
OrderNos += " 余额" + TMoney + "尚未找到相关订单"; {
} OrderNos += " 余额" + TMoney + "尚未找到相关订单";
}
if (!string.IsNullOrEmpty(OrderNos)) { if (!string.IsNullOrEmpty(OrderNos))
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() { {
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Distributor_Remit_Extend.ReOrderNos),OrderNos}, { nameof(RB_Distributor_Remit_Extend.ReOrderNos),OrderNos},
{ nameof(RB_Distributor_Remit_Extend.ReOrderIds),JsonConvert.SerializeObject(OrderIdList)}, { nameof(RB_Distributor_Remit_Extend.ReOrderIds),JsonConvert.SerializeObject(OrderIdList)},
}; };
List<WhereHelper> wheres1 = new List<WhereHelper>() { List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
FiledName=nameof(RB_Distributor_Remit_Extend.Id), FiledName=nameof(RB_Distributor_Remit_Extend.Id),
FiledValue=RemitId, FiledValue=RemitId,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
distributor_RemitRepository.Update(keyValues1, wheres1, trans); distributor_RemitRepository.Update(keyValues1, wheres1, trans);
}
} }
} }
#endregion #endregion
......
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