|
|
@@ -329,10 +329,11 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
JsonData dr = list[i];
|
|
|
string PosNo = dr[0].ToString(); // 机具Sn
|
|
|
- var Amount = double.Parse(dr[1].ToString()); // 调整费率
|
|
|
- int Kind = int.Parse(dr[2].ToString()); // 1 调升 2 调低(0.6) 3 调低(0.63)
|
|
|
+ var Amount = decimal.Parse(dr[1].ToString()); // 调整费率
|
|
|
+ int Kind = int.Parse(dr[2].ToString()); // 1 调升 2 调低(0.63) 3 调低(0.6)
|
|
|
var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosNo) ?? new PosMachinesTwo();
|
|
|
- if (pos.UpFeeFlag == 1 && pos.DownFeeFlag == 0)
|
|
|
+ var poschange = db.PosMachinesFeeChangeRecord.FirstOrDefault(m => m.PosId == pos.Id && m.ChangeFee == Amount) ?? new PosMachinesFeeChangeRecord();
|
|
|
+ if ((pos.UpFeeFlag == 1 && pos.DownFeeFlag == 0) || (pos.UpFeeFlag == 1 && pos.DownFeeFlag == 1 && poschange.Status == 0))
|
|
|
{
|
|
|
if (Kind < 2)
|
|
|
{
|
|
|
@@ -344,7 +345,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
pos.DownFeeFlag = 1;
|
|
|
pos.DownFeeDate = DateTime.Now;
|
|
|
pos.DownFeeMan = SysUserName + "_" + SysRealName;
|
|
|
- var poschange = db.PosMachinesFeeChangeRecord.FirstOrDefault(m => m.PosId == pos.Id);
|
|
|
+ pos.DownFee = Amount;
|
|
|
poschange.Status = 1;
|
|
|
db.SaveChanges();
|
|
|
dnposIds.Add(pos.Id);
|
|
|
@@ -358,7 +359,6 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
else
|
|
|
{
|
|
|
warning += PosNo + ",该机具不符合调低条件,请检查好后全部重新导入";
|