Skip to content

M
mall.oytour.com
Commit 3e3edcaa authored by liudong1993's avatar liudong1993
Browse files
Options

佣金现结

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