|
|
@@ -217,6 +217,14 @@ namespace MySystem
|
|
|
merchant.ActiveStatus = 1;
|
|
|
merchant.MerStandardDate = now;
|
|
|
db.SaveChanges();
|
|
|
+ if (!string.IsNullOrEmpty(act.Field1))
|
|
|
+ {
|
|
|
+ string PassDateString = act.Field1.Substring(0, 4) + "-" + act.Field1.Substring(4, 2) + "-" + act.Field1.Substring(6, 2);
|
|
|
+ if(DateTime.Parse(PassDateString).AddDays(30) < DateTime.Now)
|
|
|
+ {
|
|
|
+ Prize = 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (Prize > 0)
|
|
|
{
|
|
|
StatService.Instance.doActiveReward(db, merchant, pos, pos.BuyUserId, user.ParentNav, TopUserId, Prize);
|