|
|
@@ -457,18 +457,12 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
return "您输入的仓库负责人编号不存在，请重新输入正确的仓库负责人编号";
|
|
|
}
|
|
|
var store = db.StoreHouse.Where(m => m.Sort == 0 && m.Status == 1 && m.UserId == user.UserId).ToList();
|
|
|
- UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == user.UserId);
|
|
|
- if (account == null)
|
|
|
+ var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == user.UserId) ?? new UserAccount();
|
|
|
+ if (userAccount.Id > 0)
|
|
|
{
|
|
|
- account = db.UserAccount.Add(new UserAccount()
|
|
|
- {
|
|
|
- Id = user.UserId,
|
|
|
- UserId = user.UserId,
|
|
|
- }).Entity;
|
|
|
+ userAccount.StoreDeposit = data.Deposit;
|
|
|
db.SaveChanges();
|
|
|
}
|
|
|
- account.StoreDeposit = data.Deposit;
|
|
|
- db.SaveChanges();
|
|
|
RedisDbconn.Instance.AddList("ResetStoreReserveQueue", user.UserId.ToString());
|
|
|
decimal olddeposit = 0;//旧押金
|
|
|
decimal newdeposit = 0;//新押金
|
|
|
@@ -937,6 +931,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
db.StoreChangeHistory.Add(new StoreChangeHistory()
|
|
|
{
|
|
|
CreateDate = DateTime.Now,
|
|
|
+ CreateMan = SysUserName,
|
|
|
UserId = user.Id, //创客
|
|
|
FromUserId = user.Id,//来源创客
|
|
|
ToUserId = toStore.UserId,//接收创客
|
|
|
@@ -1040,6 +1035,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
db.StoreChangeHistory.Add(new StoreChangeHistory()
|
|
|
{
|
|
|
CreateDate = DateTime.Now,
|
|
|
+ CreateMan = SysUserName,
|
|
|
UserId = user.Id, //创客
|
|
|
FromUserId = user.Id,//来源创客
|
|
|
ToUserId = toStore.UserId,//接收创客
|
DuGuYang