Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -262,12 +262,15 @@ namespace MySystem.Areas.Admin.Controllers
                 var KqSnNo = dic["KqSnNo"].ToString();
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == KqSnNo) ?? new PosMachinesTwo();
                 //实际押金
-                string SeoKeyword = pos.SeoKeyword.ToString();
-                if (SeoKeyword.Length > 3)
+                string SeoKeyword = "0";
+                if (!string.IsNullOrEmpty(pos.SeoKeyword))
                 {
-                    SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
+                    if (SeoKeyword.Length > 3)
+                    {
+                        SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
+                    }
+                    ReturnAmounts += decimal.Parse(SeoKeyword);
                 }
-                ReturnAmounts += decimal.Parse(SeoKeyword);
                 dic["SeoKeyword"] = SeoKeyword;
 
                 //设置押金
@@ -779,7 +782,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 JsonData dr = list[i];
                 string KqMerNo = dr[0].ToString(); // 商户编号
-                string Amount = dr[0].ToString(); // 已退金额
+                string Amount = dr[1].ToString(); // 已退金额
                 var posMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == KqMerNo) ?? new PosMerchantInfo();
                 posMerchantInfo.StandardStatus = -2;
                 posMerchantInfo.Remark = Amount;

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4256,16 +4256,17 @@ namespace MySystem.Areas.Admin.Controllers
                 string OldSnNum = OldSnList[i];
                 MachineForSnNo oldForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == OldSnNum) ?? new MachineForSnNo();
                 PosMachinesTwo oldpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldForSnNo.SnId) ?? new PosMachinesTwo();
-                var store = db.StoreHouse.FirstOrDefault(m => m.Id == oldpos.StoreId) ?? new StoreHouse();
-                if (store.UserId != 142237)//判断是否是属于坏机仓的机具
-                {
-                    error += "以下操作失败" + OldSnNum + ',' + "该机具不在坏机仓或不存在" + '\n';
-                }
+                // var store = db.StoreHouse.FirstOrDefault(m => m.Id == oldpos.StoreId) ?? new StoreHouse();
+                // if (store.UserId != 142237)//判断是否是属于坏机仓的机具
+                // {
+                //     error += "以下操作失败" + OldSnNum + ',' + "该机具不在坏机仓或不存在" + '\n';
+                // }
                 if (!opData.Contains(oldpos.BuyUserId + ":" + oldpos.BrandId))
                 {
                     opData.Add(oldpos.BuyUserId + ":" + oldpos.BrandId);
                 }
                 oldpos.Status = 1;
+                oldpos.PosSnType= 0;
                 oldpos.QueryCount = 0;
                 oldpos.UpdateDate = null;
                 oldpos.ActivityList = null;