|
@@ -244,8 +244,7 @@ namespace MySystem
|
|
|
bool directPrize = false; //直推奖标记
|
|
|
bool bigLeaderPrize = false; //大盟主券标记
|
|
|
bool operateFlag = false; //运营中心标记
|
|
|
- bool buyPrize = false; //返100购机奖励标记
|
|
|
- bool operatePrize = false; //返100购机奖励标记-运营中心
|
|
|
+ bool buyPrize = false; //返100购机奖励标记或返100购机奖励标记-运营中心
|
|
|
int leaderFlag = 0; //返600备用金标记
|
|
|
if(user.LeaderLevel > 0 || user.UserType == 1) //盟主或运营中心
|
|
|
{
|
|
@@ -552,11 +551,11 @@ namespace MySystem
|
|
|
if(puser.UserType == 1)
|
|
|
{
|
|
|
UserAccount acccount = db.UserAccount.FirstOrDefault(m => m.Id == puser.Id) ?? new UserAccount();
|
|
|
- if(!operatePrize)
|
|
|
+ if(!buyPrize)
|
|
|
{
|
|
|
//购机奖励
|
|
|
ChangeAccount(db, order, puser.Id, 100 * pro.ProductCount, 120);
|
|
|
- operatePrize = true;
|
|
|
+ buyPrize = true;
|
|
|
}
|
|
|
//标记标签
|
|
|
if(couponIds.Count > 0 && !operateFlag)
|
|
@@ -926,8 +925,8 @@ namespace MySystem
|
|
|
{
|
|
|
OpModels.WebCMSEntities db = new OpModels.WebCMSEntities();
|
|
|
if(OpReserve1 > 0) OperateAmountChange(db, UserId, OpReserve1, 1, 1, "机具激活", true);
|
|
|
- if(OpReserve2 > 0) OperateAmountChange(db, UserId, OpReserve1, 1, 2, "机具激活", true);
|
|
|
- if(OpReserve3 > 0) OperateAmountChange(db, UserId, OpReserve1, 1, 3, "机具激活", true);
|
|
|
+ if(OpReserve2 > 0) OperateAmountChange(db, UserId, OpReserve2, 1, 2, "机具激活", true);
|
|
|
+ if(OpReserve3 > 0) OperateAmountChange(db, UserId, OpReserve3, 1, 3, "机具激活", true);
|
|
|
db.Dispose();
|
|
|
}
|
|
|
public void OperateAmountChange(OpModels.WebCMSEntities db, int UserId, decimal Money, int OperateType, int AmountType, string Remark = "", bool record = false)
|