|
@@ -3360,9 +3360,16 @@ namespace MySystem
|
|
TopUserId = int.Parse(ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
|
|
TopUserId = int.Parse(ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
|
|
}
|
|
}
|
|
function.WriteLog("发放给:" + GetUserId, "服务费奖励发放日志");
|
|
function.WriteLog("发放给:" + GetUserId, "服务费奖励发放日志");
|
|
- if(!db.ActiveReward.Any(m => m.KqSnNo == pos.PosSn && m.ActType == 1))
|
|
|
|
|
|
+ if((pos.BrandId == 12 || pos.BrandId == 13) && string.IsNullOrEmpty(merchant.KqMerNo))
|
|
{
|
|
{
|
|
- doActiveRewardFunc(db, merchant, pos, GetUserId, user.ParentNav, TopUserId, ActPrize, 0, 1);
|
|
|
|
|
|
+ if(!db.ActiveReward.Any(m => m.KqSnNo == pos.PosSn && m.ActType == 1))
|
|
|
|
+ {
|
|
|
|
+ doActiveRewardFunc(db, merchant, pos, GetUserId, user.ParentNav, TopUserId, ActPrize, 0, 1);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ doActiveReward(db, merchant, pos, GetUserId, user.ParentNav, TopUserId, ActPrize, 0, 1);
|
|
}
|
|
}
|
|
function.WriteLog("已发放", "服务费奖励发放日志");
|
|
function.WriteLog("已发放", "服务费奖励发放日志");
|
|
}
|
|
}
|