|
|
@@ -412,17 +412,11 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
error += "以下操作失败,机具" + PosSn + ',' + "对应的退押订单" + merchantDepositReturns.SeoKeyword + "该订单未找到或不符合规则" + '\n';
|
|
|
}
|
|
|
- if (Status == 1)
|
|
|
+ //失败
|
|
|
+ if (Status == 2)
|
|
|
{
|
|
|
- Status = 4;
|
|
|
- }
|
|
|
- else if (Status == 2)
|
|
|
- {
|
|
|
- Status = 5;
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- Status = 0;
|
|
|
+ var posm = db.PosMerchantInfo.FirstOrDefault(m => m.Id == merchantDepositReturns.MerchantId) ?? new PosMerchantInfo();
|
|
|
+ posm.StandardStatus = 101;
|
|
|
}
|
|
|
merchantDepositReturns.Status = Status;
|
|
|
merchantDepositReturns.UpdateDate = DateTime.Now;
|
|
|
@@ -460,17 +454,11 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
error += "以下操作失败,机具" + PosSn + ',' + "对应的退押订单" + merchantDepositReturns.SeoKeyword + "该订单未找到或不符合规则" + '\n';
|
|
|
}
|
|
|
- if (Status == 1)
|
|
|
- {
|
|
|
- Status = 4;
|
|
|
- }
|
|
|
- else if (Status == 2)
|
|
|
- {
|
|
|
- Status = 5;
|
|
|
- }
|
|
|
- else
|
|
|
+ //失败
|
|
|
+ if (Status == 2)
|
|
|
{
|
|
|
- Status = 0;
|
|
|
+ var posm = db.PosMerchantInfo.FirstOrDefault(m => m.Id == merchantDepositReturns.MerchantId) ?? new PosMerchantInfo();
|
|
|
+ posm.StandardStatus = 101;
|
|
|
}
|
|
|
merchantDepositReturns.Status = Status;
|
|
|
merchantDepositReturns.UpdateDate = DateTime.Now;
|