|
|
@@ -556,7 +556,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
var amount = opdb.UserAccount.FirstOrDefault(m => m.UserId == sto.OpId) ?? new OpModels.UserAccount();
|
|
|
if (newdeposit > olddeposit)
|
|
|
{
|
|
|
- var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
|
|
|
+ var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord()
|
|
|
{
|
|
|
Version = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
|
|
|
CreateDate = DateTime.Now,
|
|
|
@@ -570,6 +570,19 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
AfterValidForGetAmount = amount.ValidForGetAmount,
|
|
|
AfterValidAmount = amount.ValidAmount + newdeposit - olddeposit,
|
|
|
}).Entity;
|
|
|
+
|
|
|
+ var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
|
|
|
+ {
|
|
|
+ AmountType = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ Title = "分仓押金变更",
|
|
|
+ UserId = sto.OpId, //运营中心Id
|
|
|
+ // CreateMan = SysUserName + "-" + SysRealName,
|
|
|
+ BeforeAmount = amount.ValidAmount,//使用前剩余额度
|
|
|
+ AfterAmount = amount.ValidAmount + newdeposit - olddeposit,//使用后剩余额度
|
|
|
+ ChangeAmount = newdeposit - olddeposit,//操作金额
|
|
|
+ OperateType = 1,//操作类别
|
|
|
+ }).Entity;
|
|
|
}
|
|
|
if (newdeposit < olddeposit)
|
|
|
{
|
|
|
@@ -587,6 +600,19 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
AfterValidForGetAmount = amount.ValidForGetAmount,
|
|
|
AfterValidAmount = amount.ValidAmount + newdeposit - olddeposit
|
|
|
}).Entity;
|
|
|
+
|
|
|
+ var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
|
|
|
+ {
|
|
|
+ AmountType = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ Title = "分仓押金变更",
|
|
|
+ UserId = sto.OpId, //运营中心Id
|
|
|
+ // CreateMan = SysUserName + "-" + SysRealName,
|
|
|
+ BeforeAmount = amount.ValidAmount,//使用前剩余额度
|
|
|
+ AfterAmount = amount.ValidAmount + newdeposit - olddeposit,//使用后剩余额度
|
|
|
+ ChangeAmount = olddeposit - newdeposit,//操作金额
|
|
|
+ OperateType = 2,//操作类别
|
|
|
+ }).Entity;
|
|
|
}
|
|
|
amount.ValidAmount -= sto.Deposit;
|
|
|
amount.ValidAmount += data.Deposit;
|
|
|
@@ -645,6 +671,19 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
AfterValidForGetAmount = amount.ValidForGetAmount,
|
|
|
AfterValidAmount = amount.ValidAmount + newdeposit - olddeposit
|
|
|
}).Entity;
|
|
|
+
|
|
|
+ var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
|
|
|
+ {
|
|
|
+ AmountType = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ Title = "分仓押金变更",
|
|
|
+ UserId = sto.OpId, //运营中心Id
|
|
|
+ // CreateMan = SysUserName + "-" + SysRealName,
|
|
|
+ BeforeAmount = amount.ValidAmount,//使用前剩余额度
|
|
|
+ AfterAmount = amount.ValidAmount + newdeposit - olddeposit,//使用后剩余额度
|
|
|
+ ChangeAmount = newdeposit - olddeposit,//操作金额
|
|
|
+ OperateType = 1,//操作类别
|
|
|
+ }).Entity;
|
|
|
}
|
|
|
if (newdeposit < olddeposit)
|
|
|
{
|
|
|
@@ -662,6 +701,19 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
AfterValidForGetAmount = amount.ValidForGetAmount,
|
|
|
AfterValidAmount = amount.ValidAmount + newdeposit - olddeposit
|
|
|
}).Entity;
|
|
|
+
|
|
|
+ var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
|
|
|
+ {
|
|
|
+ AmountType = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ Title = "分仓押金变更",
|
|
|
+ UserId = sto.OpId, //运营中心Id
|
|
|
+ // CreateMan = SysUserName + "-" + SysRealName,
|
|
|
+ BeforeAmount = amount.ValidAmount,//使用前剩余额度
|
|
|
+ AfterAmount = amount.ValidAmount + newdeposit - olddeposit,//使用后剩余额度
|
|
|
+ ChangeAmount = olddeposit - newdeposit,//操作金额
|
|
|
+ OperateType = 2,//操作类别
|
|
|
+ }).Entity;
|
|
|
}
|
|
|
amount.ValidAmount -= sto.Deposit;
|
|
|
amount.ValidAmount += data.Deposit;
|
|
|
@@ -2133,77 +2185,67 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
}
|
|
|
if (IsOk == "1")
|
|
|
{
|
|
|
-
|
|
|
- // if (deposit > tamount)
|
|
|
- // {
|
|
|
- // var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
|
|
|
- // {
|
|
|
- // CreateDate = DateTime.Now,
|
|
|
- // UserId = sysAdmin.UserId,
|
|
|
- // SeoDescription = "关联分仓",
|
|
|
- // OperateType = 1,
|
|
|
- // UseAmount = deposit - tamount,
|
|
|
- // BeforeAmount = TotalAmount,
|
|
|
- // AfterAmount = TotalAmount + deposit - tamount,
|
|
|
- // AfterTotalAmt = userAmount.TotalAmt,
|
|
|
- // AfterValidForGetAmount = userAmount.ValidForGetAmount,
|
|
|
- // AfterValidAmount = userAmount.ValidAmount,
|
|
|
- // }).Entity;
|
|
|
- // }
|
|
|
- // if (deposit < tamount)
|
|
|
- // {
|
|
|
- // var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
|
|
|
- // {
|
|
|
- // CreateDate = DateTime.Now,
|
|
|
- // UserId = sysAdmin.UserId,
|
|
|
- // SeoDescription = "关联分仓",
|
|
|
- // OperateType = 2,
|
|
|
- // UseAmount = tamount - deposit,
|
|
|
- // BeforeAmount = TotalAmount,
|
|
|
- // AfterAmount = TotalAmount + deposit - tamount,
|
|
|
- // AfterTotalAmt = userAmount.TotalAmt,
|
|
|
- // AfterValidForGetAmount = userAmount.ValidForGetAmount,
|
|
|
- // AfterValidAmount = userAmount.ValidAmount,
|
|
|
- // }).Entity;
|
|
|
- // }
|
|
|
+ var OperateType = 0;
|
|
|
+ var Amount = 0.00M;
|
|
|
+ if (deposit > tamount)
|
|
|
+ {
|
|
|
+ OperateType = 1;
|
|
|
+ Amount = deposit - tamount;
|
|
|
+ }
|
|
|
+ if (deposit < tamount)
|
|
|
+ {
|
|
|
+ OperateType = 2;
|
|
|
+ Amount = tamount - deposit;
|
|
|
+ }
|
|
|
+ var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
|
|
|
+ {
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ UserId = sysAdmin.UserId,
|
|
|
+ SeoDescription = "关联分仓",
|
|
|
+ OperateType = OperateType,
|
|
|
+ UseAmount = Amount,
|
|
|
+ BeforeAmount = TotalAmount,
|
|
|
+ AfterAmount = TotalAmount + deposit - tamount,
|
|
|
+ AfterTotalAmt = userAmount.TotalAmt,
|
|
|
+ AfterValidForGetAmount = userAmount.ValidForGetAmount,
|
|
|
+ AfterValidAmount = userAmount.ValidAmount,
|
|
|
+ }).Entity;
|
|
|
for (int i = 1; i <= 3; i++)
|
|
|
{
|
|
|
var UseAmount = 0.00M;
|
|
|
- if (i == 1) UseAmount = ValidAmount;
|
|
|
- if (i == 2) UseAmount = TotalAmt;
|
|
|
- if (i == 3) UseAmount = ValidForGetAmount;
|
|
|
- if (deposit > tamount && UseAmount > 0)
|
|
|
+ var BeforeAmount = 0.00M;
|
|
|
+ var AfterAmount = 0.00M;
|
|
|
+ if (i == 1)
|
|
|
{
|
|
|
- var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
|
|
|
- {
|
|
|
- Version = i,//1 未使用额度 2 可提现额度 3 关联分仓额度
|
|
|
- CreateDate = DateTime.Now,
|
|
|
- UserId = sysAdmin.UserId,
|
|
|
- SeoDescription = "关联分仓",
|
|
|
- OperateType = 1,
|
|
|
- UseAmount = UseAmount,
|
|
|
- BeforeAmount = TotalAmount,
|
|
|
- AfterAmount = TotalAmount + deposit - tamount,
|
|
|
- AfterTotalAmt = userAmount.TotalAmt,
|
|
|
- AfterValidForGetAmount = userAmount.ValidForGetAmount,
|
|
|
- AfterValidAmount = userAmount.ValidAmount,
|
|
|
- }).Entity;
|
|
|
+ UseAmount = TotalAmt;
|
|
|
+ BeforeAmount = userAmount.TotalAmt - UseAmount;
|
|
|
+ AfterAmount = userAmount.TotalAmt;
|
|
|
+ }
|
|
|
+ if (i == 2)
|
|
|
+ {
|
|
|
+ UseAmount = ValidForGetAmount;
|
|
|
+ BeforeAmount = userAmount.ValidForGetAmount - UseAmount;
|
|
|
+ AfterAmount = userAmount.ValidForGetAmount;
|
|
|
+ }
|
|
|
+ if (i == 3)
|
|
|
+ {
|
|
|
+ UseAmount = ValidAmount;
|
|
|
+ BeforeAmount = userAmount.ValidAmount - UseAmount;
|
|
|
+ AfterAmount = userAmount.ValidAmount;
|
|
|
}
|
|
|
- if (deposit < tamount && UseAmount > 0)
|
|
|
+ if (i > 0 && UseAmount > 0)
|
|
|
{
|
|
|
- var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
|
|
|
+ var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
|
|
|
{
|
|
|
- Version = i,//1 未使用额度 2 可提现额度 3 关联分仓额度
|
|
|
+ AmountType = i,//1 未使用额度 2 可提现额度 3 关联分仓额度
|
|
|
CreateDate = DateTime.Now,
|
|
|
- UserId = sysAdmin.UserId,
|
|
|
- SeoDescription = "关联分仓",
|
|
|
- OperateType = 2,
|
|
|
- UseAmount = UseAmount,
|
|
|
- BeforeAmount = TotalAmount,
|
|
|
- AfterAmount = TotalAmount + deposit - tamount,
|
|
|
- AfterTotalAmt = userAmount.TotalAmt,
|
|
|
- AfterValidForGetAmount = userAmount.ValidForGetAmount,
|
|
|
- AfterValidAmount = userAmount.ValidAmount,
|
|
|
+ Title = "关联分仓",
|
|
|
+ UserId = sysAdmin.UserId, //运营中心Id
|
|
|
+ // CreateMan = SysUserName + "-" + SysRealName,
|
|
|
+ BeforeAmount = BeforeAmount,//使用前剩余额度
|
|
|
+ AfterAmount = AfterAmount,//使用后剩余额度
|
|
|
+ ChangeAmount = UseAmount,//操作金额
|
|
|
+ OperateType = OperateType,//操作类别
|
|
|
}).Entity;
|
|
|
}
|
|
|
}
|
|
|
@@ -2401,45 +2443,62 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
|
|
|
sysAdmin.StoreCount -= idlist.Count();//减少关联分仓数
|
|
|
sysAdmin.TotalMachineCount -= pCount;//减少关联分仓机具数
|
|
|
- // if (deposit > tamount)
|
|
|
- // {
|
|
|
- // var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
|
|
|
- // {
|
|
|
- // CreateDate = DateTime.Now,
|
|
|
- // UserId = sysAdmin.UserId,
|
|
|
- // SeoDescription = "取消关联分仓",
|
|
|
- // OperateType = 2,
|
|
|
- // UseAmount = deposit - tamount,
|
|
|
- // BeforeAmount = TotalAmount,
|
|
|
- // AfterAmount = TotalAmount - deposit + tamount,
|
|
|
- // AfterTotalAmt = userAmount.TotalAmt,
|
|
|
- // AfterValidForGetAmount = userAmount.ValidForGetAmount,
|
|
|
- // AfterValidAmount = userAmount.ValidAmount,
|
|
|
- // }).Entity;
|
|
|
- // }
|
|
|
- // if (deposit < tamount)
|
|
|
- // {
|
|
|
- // var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
|
|
|
- // {
|
|
|
- // CreateDate = DateTime.Now,
|
|
|
- // UserId = sysAdmin.UserId,
|
|
|
- // SeoDescription = "取消关联分仓",
|
|
|
- // OperateType = 1,
|
|
|
- // UseAmount = tamount - deposit,
|
|
|
- // BeforeAmount = TotalAmount,
|
|
|
- // AfterAmount = TotalAmount - deposit + tamount,
|
|
|
- // AfterTotalAmt = userAmount.TotalAmt,
|
|
|
- // AfterValidForGetAmount = userAmount.ValidForGetAmount,
|
|
|
- // AfterValidAmount = userAmount.ValidAmount,
|
|
|
- // }).Entity;
|
|
|
- // }
|
|
|
+ // if (deposit > tamount)
|
|
|
+ // {
|
|
|
+ // var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
|
|
|
+ // {
|
|
|
+ // CreateDate = DateTime.Now,
|
|
|
+ // UserId = sysAdmin.UserId,
|
|
|
+ // SeoDescription = "取消关联分仓",
|
|
|
+ // OperateType = 2,
|
|
|
+ // UseAmount = deposit - tamount,
|
|
|
+ // BeforeAmount = TotalAmount,
|
|
|
+ // AfterAmount = TotalAmount - deposit + tamount,
|
|
|
+ // AfterTotalAmt = userAmount.TotalAmt,
|
|
|
+ // AfterValidForGetAmount = userAmount.ValidForGetAmount,
|
|
|
+ // AfterValidAmount = userAmount.ValidAmount,
|
|
|
+ // }).Entity;
|
|
|
+ // }
|
|
|
+ // if (deposit < tamount)
|
|
|
+ // {
|
|
|
+ // var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
|
|
|
+ // {
|
|
|
+ // CreateDate = DateTime.Now,
|
|
|
+ // UserId = sysAdmin.UserId,
|
|
|
+ // SeoDescription = "取消关联分仓",
|
|
|
+ // OperateType = 1,
|
|
|
+ // UseAmount = tamount - deposit,
|
|
|
+ // BeforeAmount = TotalAmount,
|
|
|
+ // AfterAmount = TotalAmount - deposit + tamount,
|
|
|
+ // AfterTotalAmt = userAmount.TotalAmt,
|
|
|
+ // AfterValidForGetAmount = userAmount.ValidForGetAmount,
|
|
|
+ // AfterValidAmount = userAmount.ValidAmount,
|
|
|
+ // }).Entity;
|
|
|
+ // }
|
|
|
|
|
|
for (int i = 1; i <= 3; i++)
|
|
|
{
|
|
|
var UseAmount = 0.00M;
|
|
|
- if (i == 1) UseAmount = ValidAmount;
|
|
|
- if (i == 2) UseAmount = TotalAmt;
|
|
|
- if (i == 3) UseAmount = ValidForGetAmount;
|
|
|
+ var BeforeAmount = 0.00M;
|
|
|
+ var AfterAmount = 0.00M;
|
|
|
+ if (i == 1)
|
|
|
+ {
|
|
|
+ UseAmount = TotalAmt;
|
|
|
+ BeforeAmount = userAmount.TotalAmt - UseAmount;
|
|
|
+ AfterAmount = userAmount.TotalAmt;
|
|
|
+ }
|
|
|
+ if (i == 2)
|
|
|
+ {
|
|
|
+ UseAmount = ValidForGetAmount;
|
|
|
+ BeforeAmount = userAmount.ValidForGetAmount - UseAmount;
|
|
|
+ AfterAmount = userAmount.ValidForGetAmount;
|
|
|
+ }
|
|
|
+ if (i == 3)
|
|
|
+ {
|
|
|
+ UseAmount = ValidAmount;
|
|
|
+ BeforeAmount = userAmount.ValidAmount - UseAmount;
|
|
|
+ AfterAmount = userAmount.ValidAmount;
|
|
|
+ }
|
|
|
if (deposit > tamount && UseAmount > 0)
|
|
|
{
|
|
|
var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
|
|
|
@@ -2456,6 +2515,19 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
AfterValidForGetAmount = userAmount.ValidForGetAmount,
|
|
|
AfterValidAmount = userAmount.ValidAmount,
|
|
|
}).Entity;
|
|
|
+
|
|
|
+ var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
|
|
|
+ {
|
|
|
+ AmountType = i,//1 未使用额度 2 可提现额度 3 关联分仓额度
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ Title = "取消关联分仓",
|
|
|
+ UserId = sysAdmin.UserId, //运营中心Id
|
|
|
+ // CreateMan = SysUserName + "-" + SysRealName,
|
|
|
+ BeforeAmount = BeforeAmount,//使用前剩余额度
|
|
|
+ AfterAmount = AfterAmount,//使用后剩余额度
|
|
|
+ ChangeAmount = UseAmount,//操作金额
|
|
|
+ OperateType = 1,//操作类别
|
|
|
+ }).Entity;
|
|
|
}
|
|
|
if (deposit < tamount && UseAmount > 0)
|
|
|
{
|
|
|
@@ -2473,6 +2545,19 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
AfterValidForGetAmount = userAmount.ValidForGetAmount,
|
|
|
AfterValidAmount = userAmount.ValidAmount,
|
|
|
}).Entity;
|
|
|
+
|
|
|
+ var amountChangeRecord = opdb.AmountChangeRecord.Add(new OpModels.AmountChangeRecord()
|
|
|
+ {
|
|
|
+ AmountType = i,//1 未使用额度 2 可提现额度 3 关联分仓额度
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ Title = "取消关联分仓",
|
|
|
+ UserId = sysAdmin.UserId, //运营中心Id
|
|
|
+ // CreateMan = SysUserName + "-" + SysRealName,
|
|
|
+ BeforeAmount = BeforeAmount,//使用前剩余额度
|
|
|
+ AfterAmount = AfterAmount,//使用后剩余额度
|
|
|
+ ChangeAmount = UseAmount,//操作金额
|
|
|
+ OperateType = 2,//操作类别
|
|
|
+ }).Entity;
|
|
|
}
|
|
|
}
|
|
|
opdb.SaveChanges();
|