|
@@ -2795,6 +2795,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
{
|
|
|
return "您输入的旧机SN不存在或者不在" + MakerCode + "名下";
|
|
return "您输入的旧机SN不存在或者不在" + MakerCode + "名下";
|
|
|
}
|
|
}
|
|
|
|
|
+ int OldBuyUserId = oldpos.BuyUserId;
|
|
|
PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0 && m.ActivationState == 0 && m.BuyUserId == 0 && m.UserId == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();
|
|
PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0 && m.ActivationState == 0 && m.BuyUserId == 0 && m.UserId == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();
|
|
|
if (newpos.Id == 0)
|
|
if (newpos.Id == 0)
|
|
|
{
|
|
{
|
|
@@ -3055,7 +3056,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
{
|
|
|
if(!Utils.Instance.IsWifi(newpos.BrandId))
|
|
if(!Utils.Instance.IsWifi(newpos.BrandId))
|
|
|
{
|
|
{
|
|
|
- RedisDbconn.Instance.AddList("WifiWithholdBackQueue", "{\"UserId\":\"" + oldpos.BuyUserId + "\",\"SnNo\":\"" + oldpos.PosSn + "\"}");
|
|
|
|
|
|
|
+ RedisDbconn.Instance.AddList("WifiWithholdBackQueue", "{\"UserId\":\"" + OldBuyUserId + "\",\"SnNo\":\"" + oldpos.PosSn + "\"}");
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
@@ -3071,7 +3072,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
}
|
|
}
|
|
|
else if(toCharge.Status == 1)
|
|
else if(toCharge.Status == 1)
|
|
|
{
|
|
{
|
|
|
- RedisDbconn.Instance.AddList("WifiWithholdBackQueue", "{\"UserId\":\"" + oldpos.BuyUserId + "\",\"SnNo\":\"" + oldpos.PosSn + "\"}");
|
|
|
|
|
|
|
+ RedisDbconn.Instance.AddList("WifiWithholdBackQueue", "{\"UserId\":\"" + OldBuyUserId + "\",\"SnNo\":\"" + oldpos.PosSn + "\"}");
|
|
|
|
|
|
|
|
bool check = db.ToChargeBackRecord.Any(m => m.SeoDescription.Contains(newpos.PosSn) && (m.Status == 3 || m.Status == 0));
|
|
bool check = db.ToChargeBackRecord.Any(m => m.SeoDescription.Contains(newpos.PosSn) && (m.Status == 3 || m.Status == 0));
|
|
|
if(!check)
|
|
if(!check)
|