|
|
@@ -1394,6 +1394,16 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
CustomerSqlConn.op("insert into PosMerchantInfo select * from PosMerchantInfoBak where KqMerNo='" + MerNo + "'", MysqlConn.connstr);
|
|
|
}
|
|
|
+
|
|
|
+ if (oldpos.OpId > 0)
|
|
|
+ {
|
|
|
+ var opUserAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort > 0 && m.Id == oldpos.OpId && m.UserId == oldpos.OpId) ?? new OpModels.UserAccount();
|
|
|
+ opUserAccount.ValidAmount += oldpos.OpReserve3;
|
|
|
+ opUserAccount.ValidForGetAmount += oldpos.OpReserve2;
|
|
|
+ opUserAccount.TotalAmount += oldpos.OpReserve1;
|
|
|
+ }
|
|
|
+ opdb.SaveChanges();
|
|
|
+
|
|
|
merchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == MerNo) ?? new PosMerchantInfo();
|
|
|
newpos.BindMerchantId = merchant.Id;
|
|
|
newpos.BuyUserId = oldpos.BuyUserId;
|
|
|
@@ -1589,6 +1599,14 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
storeFromUserAcount.ValidAmount += amount;
|
|
|
storeBackUserAcount.ValidAmount -= amount;
|
|
|
|
|
|
+ if (oldpos.OpId > 0)
|
|
|
+ {
|
|
|
+ var opUserAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort > 0 && m.Id == oldpos.OpId && m.UserId == oldpos.OpId) ?? new OpModels.UserAccount();
|
|
|
+ opUserAccount.ValidAmount += oldpos.OpReserve3;
|
|
|
+ opUserAccount.ValidForGetAmount += oldpos.OpReserve2;
|
|
|
+ opUserAccount.TotalAmount += oldpos.OpReserve1;
|
|
|
+ }
|
|
|
+
|
|
|
newpos.BuyUserId = oldpos.BuyUserId;
|
|
|
newpos.UserId = oldpos.UserId;
|
|
|
newpos.RecycEndDate = oldpos.RecycEndDate;
|
|
|
@@ -1660,6 +1678,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
oldpos.Status = -1;
|
|
|
PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
|
|
|
db.SaveChanges();
|
|
|
+ opdb.SaveChanges();
|
|
|
|
|
|
PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == newpos.BindMerchantId);
|
|
|
if (merchant != null)
|
|
|
@@ -1809,6 +1828,13 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
opData.Add(oldpos.BuyUserId + ":" + oldpos.BrandId);
|
|
|
}
|
|
|
+ if (oldpos.OpId > 0)
|
|
|
+ {
|
|
|
+ var opUserAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort > 0 && m.Id == oldpos.OpId && m.UserId == oldpos.OpId) ?? new OpModels.UserAccount();
|
|
|
+ opUserAccount.ValidAmount += oldpos.OpReserve3;
|
|
|
+ opUserAccount.ValidForGetAmount += oldpos.OpReserve2;
|
|
|
+ opUserAccount.TotalAmount += oldpos.OpReserve1;
|
|
|
+ }
|
|
|
|
|
|
oldpos.StoreId = storeBack.Id;
|
|
|
oldpos.QueryCount = 0;
|
|
|
@@ -1853,6 +1879,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
oldpos.Status = -1;
|
|
|
PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
|
|
|
db.SaveChanges();
|
|
|
+ opdb.SaveChanges();
|
|
|
|
|
|
BrokenMachineChange add = db.BrokenMachineChange.Add(new BrokenMachineChange()
|
|
|
{
|