Merge branch 'feature-dgy-后台辅助工具' into DuGuYang

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -3588,6 +3588,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
+                pos.UpdateDate = DateTime.Now;
                 pos.BindMerchantId = posMerchant.Id;
                 db.SaveChanges();
                 function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + query + ":" + SysUserName + "-" + SysRealName, "根据机具号、商户号、商户姓名关联");
@@ -3681,28 +3682,41 @@ namespace MySystem.Areas.Admin.Controllers
                 return "请输入划拨对象创客编号";
             }
             var query = PosSn + "," + FromMakerCode + "," + ToMakerCode;
+            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(m => m.Id == user.UserId) ?? new Users();
+            var tUserId = db.Users.FirstOrDefault(m => m.Id == tuser.UserId) ?? new Users();
             var machineForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == PosSn) ?? new MachineForSnNo();
-            var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId) ?? new PosMachinesTwo();
+            var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId && m.BuyUserId == user.UserId) ?? 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(m => m.Id == user.UserId) ?? new Users();
             if (fUserId.Id == 0)
             {
                 return "来源创客" + FromMakerCode + "不存在";
             }
-            var tUserId = db.Users.FirstOrDefault(m => m.Id == tuser.UserId) ?? new Users();
             if (tUserId.Id == 0)
             {
                 return "划拨创客" + ToMakerCode + "不存在";
             }
             if (posInfo.BindingState == 0)
             {
-                posInfo.BuyUserId = tUserId.Id;
-                posInfo.UserId = tUserId.Id;
+                if (posInfo.UserId == 0 || posInfo.BuyUserId == posInfo.UserId)
+                {
+                    posInfo.BuyUserId = tUserId.Id;
+                    posInfo.UserId = tUserId.Id;
+                }
+                else
+                {
+                    posInfo.BuyUserId = tUserId.Id;
+                }
+                var fUserPos = db.UserMachineData.FirstOrDefault(m => m.IdBrand == fUserId.Id + "_" + posInfo.BrandId) ?? new UserMachineData();
+                var tUserPos = db.UserMachineData.FirstOrDefault(m => m.IdBrand == tUserId.Id + "_" + posInfo.BrandId) ?? new UserMachineData();
+                fUserPos.TotalMachineCount -= 1;
+                fUserPos.UnBindCount -= 1;
+                tUserPos.TotalMachineCount += 1;
+                tUserPos.UnBindCount += 1;
                 db.SaveChanges();
                 function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + query + ":" + SysUserName + "-" + SysRealName, "划拨创客机具");
             }
@@ -3733,7 +3747,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "请输入提现订单编号";
             }
-            string[] OrderNoList = OrderNo.Replace("\r","").Split('\n');
+            string[] OrderNoList = OrderNo.Replace("\r", "").Split('\n');
             var error = "";
             foreach (var item in OrderNoList)
             {

Areas/Admin/Views/MainServer/SysTools/TransferPos.cshtml

@@ -87,7 +87,7 @@
             }
             else {
                 var index = layer.confirm('确定要划拨吗？', function (index) {
-                    var index = layer.load(1, {
+                    var indexs = layer.load(1, {
                         shade: [0.5, '#000']
                     });
                     var userdata = $("#confirmFrm").serialize();