|
@@ -111,6 +111,7 @@ namespace MySystem
|
|
decimal Deposit = decimal.Parse(function.CheckNum(pos.SeoKeyword));
|
|
decimal Deposit = decimal.Parse(function.CheckNum(pos.SeoKeyword));
|
|
MpMainModels2.MerchantAddInfo merchantAddInfo = mpdb.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == merchant.KqMerNo) ?? new MpMainModels2.MerchantAddInfo();
|
|
MpMainModels2.MerchantAddInfo merchantAddInfo = mpdb.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == merchant.KqMerNo) ?? new MpMainModels2.MerchantAddInfo();
|
|
decimal Prize = 0;
|
|
decimal Prize = 0;
|
|
|
|
+ bool PrizeFlag = true;
|
|
if(pos.BindingTime > DateTime.Parse("2024-07-02 00:00:00"))
|
|
if(pos.BindingTime > DateTime.Parse("2024-07-02 00:00:00"))
|
|
{
|
|
{
|
|
if(Deposit == 198)
|
|
if(Deposit == 198)
|
|
@@ -129,6 +130,7 @@ namespace MySystem
|
|
if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL")
|
|
if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL")
|
|
{
|
|
{
|
|
Prize = 50;
|
|
Prize = 50;
|
|
|
|
+ PrizeFlag = false;
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -151,6 +153,7 @@ namespace MySystem
|
|
if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL")
|
|
if(merchantAddInfo.SubjectType == "SUBJECT_TYPE_SMALL")
|
|
{
|
|
{
|
|
Prize = 100;
|
|
Prize = 100;
|
|
|
|
+ PrizeFlag = false;
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -218,16 +221,16 @@ namespace MySystem
|
|
{
|
|
{
|
|
StatService.Instance.doActiveReward(db, merchant, pos, pos.BuyUserId, user.ParentNav, TopUserId, Prize);
|
|
StatService.Instance.doActiveReward(db, merchant, pos, pos.BuyUserId, user.ParentNav, TopUserId, Prize);
|
|
}
|
|
}
|
|
- if (pos.CardType < 100 && Prize > 0)
|
|
|
|
|
|
+ if (pos.CardType < 100 && Prize > 0 && PrizeFlag)
|
|
{
|
|
{
|
|
RedisDbconn.Instance.AddList("OpenRewardQueue", pos.Id.ToString());
|
|
RedisDbconn.Instance.AddList("OpenRewardQueue", pos.Id.ToString());
|
|
}
|
|
}
|
|
- if (Deposit > 0 && pos.LeaderUserId > 0 && db.Leaders.Any(m => m.Id == pos.LeaderUserId && m.ExpiredDate > now) && pos.CardType < 100 && Prize > 0)
|
|
|
|
|
|
+ if (Deposit > 0 && pos.LeaderUserId > 0 && db.Leaders.Any(m => m.Id == pos.LeaderUserId && m.ExpiredDate > now) && pos.CardType < 100 && Prize > 0 && PrizeFlag)
|
|
{
|
|
{
|
|
RedisDbconn.Instance.AddList("LeaderPrizeQueue", pos.Id);
|
|
RedisDbconn.Instance.AddList("LeaderPrizeQueue", pos.Id);
|
|
}
|
|
}
|
|
//发放运营中心奖励
|
|
//发放运营中心奖励
|
|
- if (Deposit > 0 && pos.CardType < 100 && Prize > 0)
|
|
|
|
|
|
+ if (Deposit > 0 && pos.CardType < 100 && Prize > 0 && PrizeFlag)
|
|
{
|
|
{
|
|
RedisDbconn.Instance.AddList("OperatePrizeQueue", pos.Id);
|
|
RedisDbconn.Instance.AddList("OperatePrizeQueue", pos.Id);
|
|
}
|
|
}
|