|
|
@@ -3411,6 +3411,14 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
function.WriteLog(DateTime.Now.ToString() + ":请求参数," + PosSn + ":" + SysUserName + "-" + SysRealName, "根据机具号同步商户激活状态");
|
|
|
db.SaveChanges();
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ return "机具绑定商户不存在";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ return "机具" + PosSn + "不存在";
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -3505,6 +3513,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string[] PosSnList = PosSn.Split('\n');
|
|
|
var PosId = "";
|
|
|
var RecordId = "";
|
|
|
+ var error = "";
|
|
|
foreach (var item in PosSnList)
|
|
|
{
|
|
|
var pos = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == item) ?? new MachineForSnNo();
|
|
|
@@ -3527,6 +3536,14 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
PosId += posInfo.Id + ",";
|
|
|
RecordId += query.Id + ",";
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ error += "机具" + PosSn + "不存在";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!string.IsNullOrEmpty(error))
|
|
|
+ {
|
|
|
+ return "Warning|" + error;
|
|
|
}
|
|
|
PosId = PosId.TrimEnd(',');
|
|
|
function.WriteLog(DateTime.Now.ToString() + ":请求参数," + PosId + ":" + SysUserName + "-" + SysRealName, "根据机具号设置费率");
|
|
|
@@ -3575,6 +3592,14 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
db.SaveChanges();
|
|
|
function.WriteLog(DateTime.Now.ToString() + ":请求参数," + query + ":" + SysUserName + "-" + SysRealName, "根据机具号、商户号、商户姓名关联");
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ return "机具" + PosSn + "不存在";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ return "商户" + MerchantNo + "不存在";
|
|
|
}
|
|
|
|
|
|
return "success";
|
|
|
@@ -3634,7 +3659,6 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
|
|
|
}
|
|
|
|
|
|
-
|
|
|
return "success";
|
|
|
}
|
|
|
#endregion
|
|
|
@@ -3667,11 +3691,23 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
}
|
|
|
var query = PosSn + "," + FromMakerCode + "," + ToMakerCode;
|
|
|
var machineForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == PosSn) ?? new MachineForSnNo();
|
|
|
- var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId);
|
|
|
+ var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId) ?? new PosMachinesTwo();
|
|
|
+ if (posInfo.Id == 0)
|
|
|
+ {
|
|
|
+ return "机具" + PosSn + "不存在";
|
|
|
+ }
|
|
|
var user = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == FromMakerCode) ?? new UserForMakerCode();
|
|
|
var tuser = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == ToMakerCode) ?? new UserForMakerCode();
|
|
|
- var fUserId = db.Users.FirstOrDefault(machineForSnNo => machineForSnNo.Id == user.UserId);
|
|
|
- var tUserId = db.Users.FirstOrDefault(machineForSnNo => machineForSnNo.Id == tuser.UserId);
|
|
|
+ var fUserId = db.Users.FirstOrDefault(machineForSnNo => machineForSnNo.Id == user.UserId) ?? new Users();
|
|
|
+ if (fUserId.Id == 0)
|
|
|
+ {
|
|
|
+ return "来源创客" + FromMakerCode + "不存在";
|
|
|
+ }
|
|
|
+ var tUserId = db.Users.FirstOrDefault(machineForSnNo => machineForSnNo.Id == tuser.UserId) ?? new Users();
|
|
|
+ if (tUserId.Id == 0)
|
|
|
+ {
|
|
|
+ return "划拨创客" + ToMakerCode + "不存在";
|
|
|
+ }
|
|
|
if (posInfo.BindingState == 0)
|
|
|
{
|
|
|
posInfo.BuyUserId = tUserId.Id;
|