|
|
@@ -355,41 +355,41 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
pos.BindMerchantId = merchant.Id;
|
|
|
}
|
|
|
- var makerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
|
|
|
- var prePos = db.PreSendStockDetail.FirstOrDefault(m => m.ToUserId == makerCode.UserId && m.SnId == pos.Id && m.CreateDate < DateTime.Now.AddDays(-30) && m.AuthFlag == 1 && m.ApplyFlag == 0) ?? new PreSendStockDetail();
|
|
|
- if (makerCode.UserId > 0 && prePos.Id > 0)
|
|
|
- {
|
|
|
- if (prePos.CreateDate <= DateTime.Now.AddDays(-30))
|
|
|
- {
|
|
|
- var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == prePos.BrandId);
|
|
|
- var amount = 0;
|
|
|
- if (brandInfo.Name.Contains("电签"))
|
|
|
- {
|
|
|
- amount = 200;
|
|
|
- }
|
|
|
- if (brandInfo.Name.Contains("大POS"))
|
|
|
- {
|
|
|
- amount = 300;
|
|
|
- }
|
|
|
- var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == makerCode.UserId) ?? new UserAccount();
|
|
|
- if (userAccount.Id > 0)
|
|
|
- {
|
|
|
- userAccount.SmallStoreDeposit -= amount;
|
|
|
- var add = db.UserAccountRecord.Add(new UserAccountRecord()
|
|
|
- {
|
|
|
- CreateDate = DateTime.Now,
|
|
|
- Remark = "小分仓押金退还",
|
|
|
- ChangeType = 65,
|
|
|
- BeforeBalanceAmount = userAccount.SmallStoreDeposit + amount, //变更前小分仓押金
|
|
|
- AfterBalanceAmount = userAccount.SmallStoreDeposit, //变更后小分仓押金
|
|
|
- ChangeAmount = amount,//变动金额
|
|
|
- UserId = userAccount.Id,
|
|
|
-
|
|
|
- }).Entity;
|
|
|
- db.SaveChanges();
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ // var makerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
|
|
|
+ // var prePos = db.PreSendStockDetail.FirstOrDefault(m => m.ToUserId == makerCode.UserId && m.SnId == pos.Id && m.CreateDate < DateTime.Now.AddDays(-30) && m.AuthFlag == 1 && m.ApplyFlag == 0) ?? new PreSendStockDetail();
|
|
|
+ // if (makerCode.UserId > 0 && prePos.Id > 0)
|
|
|
+ // {
|
|
|
+ // if (prePos.CreateDate <= DateTime.Now.AddDays(-30))
|
|
|
+ // {
|
|
|
+ // var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == prePos.BrandId);
|
|
|
+ // var amount = 0;
|
|
|
+ // if (brandInfo.Name.Contains("电签"))
|
|
|
+ // {
|
|
|
+ // amount = 200;
|
|
|
+ // }
|
|
|
+ // if (brandInfo.Name.Contains("大POS"))
|
|
|
+ // {
|
|
|
+ // amount = 300;
|
|
|
+ // }
|
|
|
+ // var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == makerCode.UserId) ?? new UserAccount();
|
|
|
+ // if (userAccount.Id > 0)
|
|
|
+ // {
|
|
|
+ // userAccount.SmallStoreDeposit -= amount;
|
|
|
+ // var add = db.UserAccountRecord.Add(new UserAccountRecord()
|
|
|
+ // {
|
|
|
+ // CreateDate = DateTime.Now,
|
|
|
+ // Remark = "小分仓押金退还",
|
|
|
+ // ChangeType = 65,
|
|
|
+ // BeforeBalanceAmount = userAccount.SmallStoreDeposit + amount, //变更前小分仓押金
|
|
|
+ // AfterBalanceAmount = userAccount.SmallStoreDeposit, //变更后小分仓押金
|
|
|
+ // ChangeAmount = amount,//变动金额
|
|
|
+ // UserId = userAccount.Id,
|
|
|
+
|
|
|
+ // }).Entity;
|
|
|
+ // db.SaveChanges();
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
db.SaveChanges();
|
|
|
function.WriteLog(DateTime.Now.ToString() + "\n" + SysUserName + "\nMakerCode:" + MakerCode + ", PosSn:" + PosSn + ", MerNo:" + MerNo + ", AddActPrize:" + AddActPrize + ", IsPre:" + IsPre, "机具补录日志");
|
|
|
return "success";
|