|
|
@@ -1614,7 +1614,6 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
storeFromUserAcount.ValidAmount += amount;
|
|
|
storeBackUserAcount.ValidAmount -= amount;
|
|
|
|
|
|
-
|
|
|
newpos.BuyUserId = oldpos.BuyUserId;
|
|
|
newpos.UserId = oldpos.UserId;
|
|
|
newpos.RecycEndDate = oldpos.RecycEndDate;
|
|
|
@@ -1632,6 +1631,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
newpos.SeoKeyword = oldpos.SeoKeyword;
|
|
|
newpos.PrizeParams = oldpos.PrizeParams;
|
|
|
newpos.LeaderUserId = oldpos.LeaderUserId;
|
|
|
+ newpos.BindMerchantId = oldpos.BindMerchantId;
|
|
|
|
|
|
newpos.StoreId = oldpos.StoreId;
|
|
|
newpos.UserId = oldpos.UserId;
|
|
|
@@ -1641,6 +1641,13 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
oldpos.BuyUserId = 0;
|
|
|
oldpos.UserId = 0;
|
|
|
oldpos.Status = -1;
|
|
|
+
|
|
|
+ PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == newpos.BindMerchantId);
|
|
|
+ if(merchant != null)
|
|
|
+ {
|
|
|
+ merchant.KqSnNo = newpos.PosSn;
|
|
|
+ merchant.ActiveStatus = newpos.ActivationState;
|
|
|
+ }
|
|
|
db.SaveChanges();
|
|
|
|
|
|
BrokenMachineChange add = db.BrokenMachineChange.Add(new BrokenMachineChange()
|