Commit d1f8bc07 authored by 吴春's avatar 吴春

提交代码

parent 816b06b1
...@@ -77,5 +77,8 @@ namespace Mall.Model.Extend.User ...@@ -77,5 +77,8 @@ namespace Mall.Model.Extend.User
/// 第几级 /// 第几级
/// </summary> /// </summary>
public int? ReferralsType { get; set; } public int? ReferralsType { get; set; }
public string OpenId { get; set; }
} }
} }
...@@ -1592,6 +1592,10 @@ namespace Mall.Module.User ...@@ -1592,6 +1592,10 @@ namespace Mall.Module.User
} }
}; };
bool flag = distributor_InfoRepository.Update(keyValues, wheres, trans); bool flag = distributor_InfoRepository.Update(keyValues, wheres, trans);
if (flag)
{
new MiniProgramMsgModule().SendAuditResultMsg(item.TenantId, item.MallBaseId, item.OpenId, "分销商审核", "成功", item.Name, System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
}
} }
} }
else if (type == 3) else if (type == 3)
...@@ -1633,6 +1637,7 @@ namespace Mall.Module.User ...@@ -1633,6 +1637,7 @@ namespace Mall.Module.User
} }
}; };
member_UserRepository.Update(keyValues1, wheres1, trans); member_UserRepository.Update(keyValues1, wheres1, trans);
new MiniProgramMsgModule().SendAuditResultMsg(item.TenantId, item.MallBaseId, item.OpenId, "分销商审核", "拒绝", item.Name, System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
} }
} }
} }
...@@ -1962,7 +1967,8 @@ namespace Mall.Module.User ...@@ -1962,7 +1967,8 @@ namespace Mall.Module.User
} }
}; };
bool flag = distributor_RemitRepository.Update(keyValues, wheres); bool flag = distributor_RemitRepository.Update(keyValues, wheres);
if (flag) { if (flag)
{
//拒绝之后 需回滚提现佣金 //拒绝之后 需回滚提现佣金
var remodel = distributor_RemitRepository.GetEntity(remitId); var remodel = distributor_RemitRepository.GetEntity(remitId);
var dmodel = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { UserId = remodel.UserId, TenantId = Convert.ToInt32(uid), MallBaseId = mallBaseId }).FirstOrDefault(); var dmodel = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { UserId = remodel.UserId, TenantId = Convert.ToInt32(uid), MallBaseId = mallBaseId }).FirstOrDefault();
...@@ -2643,7 +2649,7 @@ namespace Mall.Module.User ...@@ -2643,7 +2649,7 @@ namespace Mall.Module.User
var minModel = miniProgramRepository.GetEntity(mallBaseId); var minModel = miniProgramRepository.GetEntity(mallBaseId);
if (minModel != null) if (minModel != null)
{ {
if (!string.IsNullOrWhiteSpace(minModel.AuditResultTpl)) if (!string.IsNullOrWhiteSpace(minModel.AuditResultTpl))
{ {
template_message_list.Add(minModel.AuditResultTpl); template_message_list.Add(minModel.AuditResultTpl);
......
...@@ -100,7 +100,7 @@ where {where} order by di.CreateDate desc"; ...@@ -100,7 +100,7 @@ where {where} order by di.CreateDate desc";
where += $@" and di.{nameof(RB_Distributor_Info.Name)} like '%{dmodel.Name}%'"; where += $@" and di.{nameof(RB_Distributor_Info.Name)} like '%{dmodel.Name}%'";
} }
string sql = $@"select di.* from RB_Distributor_Info di where {where} order by di.CreateDate desc"; string sql = $@"select di.*,mu.OpenId from RB_Distributor_Info di LEFT JOIN rb_member_user as mu on di.UserId=mu.Id where {where} order by di.CreateDate desc";
return Get<RB_Distributor_Info_Extend>(sql).ToList(); return Get<RB_Distributor_Info_Extend>(sql).ToList();
} }
......
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