Skip to content

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

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

parents 90e1acfa 3e3edcaa
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 57 deletions
Mall.Module.Product/OrderModule.cs
View file @ 4c86849c
...@@ -269,6 +269,10 @@ namespace Mall.Module.Product ...@@ -269,6 +269,10 @@ namespace Mall.Module.Product
/// </summary> /// </summary>
private readonly RB_SmallShops_CommissionRepository smallShopsCommissionRepository = new RB_SmallShops_CommissionRepository(); private readonly RB_SmallShops_CommissionRepository smallShopsCommissionRepository = new RB_SmallShops_CommissionRepository();
/// <summary> /// <summary>
/// 微店提现
/// </summary>
private readonly RB_SmallShops_RemitRepository smallShops_RemitRepository = new RB_SmallShops_RemitRepository();
/// <summary>
/// 微店信息 /// 微店信息
/// </summary> /// </summary>
private readonly RB_SmallShops_InfoRepository smallShopsInfoRepository = new RB_SmallShops_InfoRepository(); private readonly RB_SmallShops_InfoRepository smallShopsInfoRepository = new RB_SmallShops_InfoRepository();
...@@ -8424,9 +8428,9 @@ namespace Mall.Module.Product ...@@ -8424,9 +8428,9 @@ namespace Mall.Module.Product
TotalCommission += (item.Commission ?? 0); TotalCommission += (item.Commission ?? 0);
} }
#region 看微店佣金是否是负数 是的话 需要走总佣金里减去 #region 看微店佣金是否是负数 是的话 需要走总佣金里减去
OldCommission = TotalCommission;
if ((smallModel.Commission ?? 0) < 0) if ((smallModel.Commission ?? 0) < 0)
{ {
OldCommission = TotalCommission;
TotalCommission += (smallModel?.Commission ?? 0); TotalCommission += (smallModel?.Commission ?? 0);
} }
#endregion #endregion
...@@ -8460,22 +8464,22 @@ namespace Mall.Module.Product ...@@ -8460,22 +8464,22 @@ namespace Mall.Module.Product
{ {
//更新返佣状态 //更新返佣状态
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() { Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_SmallShops_Commission_Extend.CommissionState),2}, { nameof(RB_SmallShops_Commission_Extend.CommissionState),2},
{ nameof(RB_SmallShops_Commission_Extend.IsRemit),1}, { nameof(RB_SmallShops_Commission_Extend.IsRemit),1},
{ nameof(RB_SmallShops_Commission_Extend.UpdateDate),DateTime.Now}, { nameof(RB_SmallShops_Commission_Extend.UpdateDate),DateTime.Now},
}; };
List<WhereHelper> wheres1 = new List<WhereHelper>() { List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
FiledName=nameof(RB_SmallShops_Commission_Extend.Id), FiledName=nameof(RB_SmallShops_Commission_Extend.Id),
FiledValue=item.Id, FiledValue=item.Id,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
smallShops_CommissionRepository.Update(keyValues1, wheres1); smallShops_CommissionRepository.Update(keyValues1, wheres1);
} }
} }
//写入已提现数据 //写入已提现数据
distributor_RemitRepository.Insert(new Model.Entity.User.RB_Distributor_Remit() smallShops_RemitRepository.Insert(new Model.Entity.User.RB_SmallShops_Remit()
{ {
Id = 0, Id = 0,
AccountName = "", AccountName = "",
...@@ -8495,9 +8499,8 @@ namespace Mall.Module.Product ...@@ -8495,9 +8499,8 @@ namespace Mall.Module.Product
RemitDate = DateTime.Now, RemitDate = DateTime.Now,
RemitMoney = RemitMoney, RemitMoney = RemitMoney,
RemitRemark = "自动结算打款", RemitRemark = "自动结算打款",
ReOrderIds = (orderModel.OrderId).ToString(), ReOrderIds = "[" + (orderModel.OrderId).ToString() + "]",
ReOrderNos = orderModel.OrderNo, ReOrderNos = "\"" + orderModel.OrderNo + "\"：" + RemitMoney + "元",
ReVipIds = "",
TenantId = tenantId, TenantId = tenantId,
UserId = ssmodel.UserId, UserId = ssmodel.UserId,
WithdrawalWay = DistrbutorWithdrawWayEnum.ZDXJ WithdrawalWay = DistrbutorWithdrawWayEnum.ZDXJ
...@@ -8527,14 +8530,14 @@ namespace Mall.Module.Product ...@@ -8527,14 +8530,14 @@ namespace Mall.Module.Product
} }
} }
//写入已提现数据 //写入已提现数据
distributor_RemitRepository.Insert(new Model.Entity.User.RB_Distributor_Remit() smallShops_RemitRepository.Insert(new Model.Entity.User.RB_SmallShops_Remit()
{ {
Id = 0, Id = 0,
AccountName = "", AccountName = "",
AccountNumber = "", AccountNumber = "",
AppliedMoney = TotalCommission, AppliedMoney = TotalCommission,
AuditDate = DateTime.Now, AuditDate = DateTime.Now,
AuditRemark = "自动结算失败，请手动打款", AuditRemark = "自动现结失败，变更为手动打款",
AuditStatus = DistributorRemitAuditStatusEnum.ToPlayWith, AuditStatus = DistributorRemitAuditStatusEnum.ToPlayWith,
BankName = "", BankName = "",
CreateDate = DateTime.Now, CreateDate = DateTime.Now,
...@@ -8547,30 +8550,26 @@ namespace Mall.Module.Product ...@@ -8547,30 +8550,26 @@ namespace Mall.Module.Product
RemitDate = DateTime.Now, RemitDate = DateTime.Now,
RemitMoney = RemitMoney, RemitMoney = RemitMoney,
RemitRemark = "", RemitRemark = "",
ReOrderIds = (orderModel.OrderId).ToString(), ReOrderIds = "[" + (orderModel.OrderId).ToString() + "]",
ReOrderNos = orderModel.OrderNo, ReOrderNos = "\"" + orderModel.OrderNo + "\"：" + RemitMoney + "元",
ReVipIds = "",
TenantId = tenantId, TenantId = tenantId,
UserId = ssmodel.UserId, UserId = ssmodel.UserId,
WithdrawalWay = DistrbutorWithdrawWayEnum.ZDDK WithdrawalWay = DistrbutorWithdrawWayEnum.ZDDK
}); });
} }
if ((smallModel.Commission ?? 0) < 0) //更新微店佣金等于0
{ Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
//更新微店佣金等于0 { nameof(RB_SmallShops_Info_Extend.TotalCommission),(smallModel.TotalCommission??0) + OldCommission},
Dictionary<string, object> keyValues2 = new Dictionary<string, object>() { { nameof(RB_SmallShops_Info_Extend.Commission), TotalCommission}
{ nameof(RB_SmallShops_Info_Extend.TotalCommission),(smallModel.TotalCommission??0) + OldCommission}, };
{ nameof(RB_SmallShops_Info_Extend.Commission),0}, List<WhereHelper> wheres2 = new List<WhereHelper>() {
}; new WhereHelper(){
List<WhereHelper> wheres2 = new List<WhereHelper>() { FiledName=nameof(RB_SmallShops_Info_Extend.Id),
new WhereHelper(){ FiledValue=smallModel.Id,
FiledName=nameof(RB_SmallShops_Info_Extend.Id), OperatorEnum=OperatorEnum.Equal
FiledValue=smallModel.Id, }
OperatorEnum=OperatorEnum.Equal };
} bool flag1 = smallShops_InfoRepository.Update(keyValues2, wheres2);
};
bool flag1 = smallShops_InfoRepository.Update(keyValues2, wheres2);
}
} }
else if (TotalCommission < 0) else if (TotalCommission < 0)
{ {
......
Mall.Module.User/SmallShopsModule.cs
View file @ 4c86849c
...@@ -414,29 +414,26 @@ namespace Mall.Module.User ...@@ -414,29 +414,26 @@ namespace Mall.Module.User
//开始递减金额 订单不足的 给与提示 //开始递减金额 订单不足的 给与提示
foreach (var item in olist) foreach (var item in olist)
{ {
if (TMoney > 0) decimal CommMoney = 0;
var chlist = clist.Where(x => x.OrderId == item.OrderId).ToList();
foreach (var qitem in chlist)
{ {
decimal CommMoney = 0; TMoney -= (qitem.Commission ?? 0);
var chlist = clist.Where(x => x.OrderId == item.OrderId).ToList(); CommMoney += (qitem.Commission ?? 0);
foreach (var qitem in chlist) Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
{ { nameof(RB_SmallShops_Commission_Extend.IsRemit),1}
TMoney -= (qitem.Commission ?? 0); };
CommMoney += (qitem.Commission ?? 0); List<WhereHelper> wheres2 = new List<WhereHelper>() {
Dictionary<string, object> keyValues2 = new Dictionary<string, object>() { new WhereHelper(){
{ nameof(RB_SmallShops_Commission_Extend.IsRemit),1} FiledName=nameof(RB_SmallShops_Commission_Extend.Id),
}; FiledValue=qitem.Id,
List<WhereHelper> wheres2 = new List<WhereHelper>() { OperatorEnum=OperatorEnum.Equal
new WhereHelper(){ }
FiledName=nameof(RB_SmallShops_Commission_Extend.Id), };
FiledValue=qitem.Id, smallShopsCommissionRepository.Update(keyValues2, wheres2, trans);
OperatorEnum=OperatorEnum.Equal
}
};
smallShopsCommissionRepository.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))
{ {
......
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