|
@@ -1171,7 +1171,7 @@ namespace MySystem
|
|
|
string ParentNav = function.CheckNull(user.ParentNav) + "," + user.Id + ",";
|
|
|
if (!string.IsNullOrEmpty(ParentNav))
|
|
|
{
|
|
|
- decimal Prize = 20;
|
|
|
+ decimal Prize = 0;
|
|
|
if(pos.BrandId == 14)
|
|
|
{
|
|
|
Prize = 19 * 0.3M;
|
|
@@ -1186,15 +1186,15 @@ namespace MySystem
|
|
|
{
|
|
|
function.WriteLog("上级:" + puser.MakerCode, "开机奖励发放日志");
|
|
|
function.WriteLog("条件:LeaderLevel:" + puser.LeaderLevel + ",UserType:" + puser.UserType, "开机奖励发放日志");
|
|
|
- if(puser.UserType > 0)
|
|
|
+ if(puser.UserType > 0 || puser.LeaderLevel > 0)
|
|
|
{
|
|
|
bool leaderOp = true;
|
|
|
- // if(puser.LeaderLevel > 0 && puser.UserType == 0)
|
|
|
- // {
|
|
|
- // DateTime now = DateTime.Now;
|
|
|
- // leaderOp = db.Leaders.Any(m => m.Id == puser.Id && m.ExpiredDate >= now);
|
|
|
- // function.WriteLog("条件:leaderOp:" + leaderOp, "开机奖励发放日志");
|
|
|
- // }
|
|
|
+ if(puser.LeaderLevel > 0 && puser.UserType == 0)
|
|
|
+ {
|
|
|
+ DateTime now = DateTime.Now;
|
|
|
+ leaderOp = db.Leaders.Any(m => m.Id == puser.Id && m.ExpiredDate >= now);
|
|
|
+ function.WriteLog("条件:leaderOp:" + leaderOp, "开机奖励发放日志");
|
|
|
+ }
|
|
|
if(leaderOp)
|
|
|
{
|
|
|
function.WriteLog("满足条件", "开机奖励发放日志");
|
|
@@ -1283,7 +1283,7 @@ namespace MySystem
|
|
|
{
|
|
|
function.WriteLog("上级:" + puser.MakerCode, "盟主开机奖励发放日志");
|
|
|
function.WriteLog("条件:LeaderLevel:" + puser.LeaderLevel + ",UserType:" + puser.UserType, "盟主开机奖励发放日志");
|
|
|
- if(puser.LeaderLevel > 0)
|
|
|
+ if(puser.LeaderLevel > 0 || puser.UserType > 0)
|
|
|
{
|
|
|
bool leaderOp = true;
|
|
|
if(puser.LeaderLevel > 0 && puser.UserType == 0)
|