直连和银联数据分开存储

AppStart/Redis/MySql/UserMachineDataDbconn.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Library;
 using System.Linq;
-using MySystem.Models.Main1;
+using MySystem.Models.Main;
 
 namespace MySystem
 {

Areas/Api/Controllers/Main/KqProductsController.cs

@@ -72,15 +72,17 @@ namespace MySystem.Areas.Api.Controllers.v1
             List<Dictionary<string, object>> list = new List<Dictionary<string, object>>();
             Dictionary<string, object> Obj = new Dictionary<string, object>();
 
-            Models.Main1.UserMachineData MachineData = UserMachineDataDbconn.Instance.Get(UserId + "_0") ?? new Models.Main1.UserMachineData();
-            Models.Main1.UserMachineData MachineData2 = UserMachineDataDbconn.Instance.Get(UserId + "_1") ?? new Models.Main1.UserMachineData();
+            Models.Main.UserMachineData MachineData = UserMachineDataDbconn.Instance.Get(UserId + "_0") ?? new Models.Main.UserMachineData();
+            Models.Main.UserMachineData MachineData2 = UserMachineDataDbconn.Instance.Get(UserId + "_1") ?? new Models.Main.UserMachineData();
             Dictionary<string, object> Machine = new Dictionary<string, object>();
             Dictionary<string, object> Machine2 = new Dictionary<string, object>();
+            //码牌
             Machine.Add("TotalMachineCount", MachineData.TotalMachineCount);  //总机具数
             Machine.Add("UnBindCount", MachineData.UnBindCount); //未绑定机具数
             Machine.Add("BindCount", MachineData.BindCount); //已绑定机具数
             Obj.Add("Machine", Machine); //机具管理数据
 
+            //音响
             Machine2.Add("TotalMachineCount2", MachineData2.TotalMachineCount);  //总机具数
             Machine2.Add("UnBindCount2", MachineData2.UnBindCount); //未绑定机具数
             Machine2.Add("BindCount2", MachineData2.BindCount); //已绑定机具数

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -470,7 +470,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int PageSize = int.Parse(function.CheckInt(data.getItem("PageSize").ToString()));
             int PageNum = int.Parse(function.CheckInt(data.getItem("PageNum").ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            IQueryable<Models.Main1.MerchantQrCode> query = main1db.MerchantQrCode.Where(m => m.MerchantId == MerchantId && m.QueryCount == 2).OrderByDescending(m => m.Id);
+            IQueryable<Models.Main.MerchantQrCode> query = maindb.MerchantQrCode.Where(m => m.MerchantId == MerchantId && m.QueryCount == 2).OrderByDescending(m => m.Id);
             TotalCount = query.Count();
             if (PageNum == 1)
             {
@@ -481,7 +481,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 int skipNum = PageSize * (PageNum - 1);
                 query = query.Skip(skipNum).Take(PageSize);
             }
-            foreach (Models.Main1.MerchantQrCode item in query.ToList())
+            foreach (Models.Main.MerchantQrCode item in query.ToList())
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("SnNo", item.SnNo); //sn
@@ -513,7 +513,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int PageSize = int.Parse(function.CheckInt(data.getItem("PageSize").ToString()));
             int PageNum = int.Parse(function.CheckInt(data.getItem("PageNum").ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            IQueryable<Models.Main1.MachineForQrCode> query = main1db.MachineForQrCode.Where(m => m.MerchantId == MerchantId && m.DataId.EndsWith("_2") && m.MachineSnNo != m.SnNo && !string.IsNullOrEmpty(m.MachineSnNo)).OrderByDescending(m => m.MerchantId);
+            IQueryable<Models.Main.MachineForQrCode> query = maindb.MachineForQrCode.Where(m => m.MerchantId == MerchantId && m.DataId.EndsWith("_2") && m.MachineSnNo != m.SnNo && !string.IsNullOrEmpty(m.MachineSnNo)).OrderByDescending(m => m.MerchantId);
             TotalCount = query.Count();
             if (PageNum == 1)
             {
@@ -524,7 +524,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 int skipNum = PageSize * (PageNum - 1);
                 query = query.Skip(skipNum).Take(PageSize);
             }
-            foreach (Models.Main1.MachineForQrCode item in query.ToList())
+            foreach (Models.Main.MachineForQrCode item in query.ToList())
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("SnNo", item.SnNo); //sn
@@ -772,7 +772,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             JsonData data = JsonMapper.ToObject(value);
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             string Sn = data["Sn"].ToString();
-            Models.Main1.MerchantQrCode code = MerchantQrCodeService.Query(Sn);
+            Models.Main.MerchantQrCode code = MerchantQrCodeService.Query(Sn);
             MerchantInfo query = MerchantInfoService.Query(code.MerchantId);
             MerchantParamSet set = MerchantParamSetService.Query(code.MerchantId);
             Obj.Add("Name", query.Name); //名称

Areas/Api/Controllers/Main/MerchantQrCodeController.cs

@@ -44,7 +44,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int PageNum = int.Parse(function.CheckInt(data.getItem("PageNum").ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             Models.Main.MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(MerchantId) ?? new Models.Main.MerchantInfo();
-            IQueryable<Models.Main1.MerchantQrCode> query = main1db.MerchantQrCode.Where(m => m.MerchantId == MerchantId && m.QueryCount == 2);
+            IQueryable<Models.Main.MerchantQrCode> query = maindb.MerchantQrCode.Where(m => m.MerchantId == MerchantId && m.QueryCount == 2);
             if (PageNum == 1)
             {
                 query = query.Take(PageSize);
@@ -54,7 +54,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 int skipNum = PageSize * (PageNum - 1);
                 query = query.Skip(skipNum).Take(PageSize);
             }
-            foreach (Models.Main1.MerchantQrCode subdata in query.ToList())
+            foreach (Models.Main.MerchantQrCode subdata in query.ToList())
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("SnNo", subdata.SnNo); //Sn编号
@@ -113,7 +113,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 }
             }
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            Models.Main1.MerchantQrCode query = MerchantQrCodeService.Query(" SnNo='" + SnNo + "'");
+            Models.Main.MerchantQrCode query = MerchantQrCodeService.Query(" SnNo='" + SnNo + "'");
             Models.Main1.PosMachinesTwo pos = PosMachinesTwoService.Query(" PosSn='" + SnNo + "'");
             Models.Main1.PosMachines machines = PosMachinesService.Query(" PosSn='" + SnNo + "'");
             Models.Main.MerchantInfo merchant = MerchantInfoService.Query(MerchantId);
@@ -124,10 +124,6 @@ namespace MySystem.Areas.Api.Controllers.v1
                 {
                     return new AppResultJson() { Status = "-1", Info = "绑定失败" };
                 }
-                // if (pos.BuyUserId == 0)
-                // {
-                //     return new AppResultJson() { Status = "-1", Info = "码牌未授权" };
-                // }
                 PosId = pos.Id;
             }
             else if (SnNo != MachineNo)
@@ -136,10 +132,6 @@ namespace MySystem.Areas.Api.Controllers.v1
                 {
                     return new AppResultJson() { Status = "-1", Info = "绑定失败" };
                 }
-                // if (machines.BuyUserId == 0)
-                // {
-                //     return new AppResultJson() { Status = "-1", Info = "音响未授权" };
-                // }
                 PosId = machines.Id;
             }
             if (query.Id > 0)
@@ -160,10 +152,10 @@ namespace MySystem.Areas.Api.Controllers.v1
             else
             {
                 string DataId = PosId + "_2";
-                Models.Main1.MachineForQrCode forQrCode = main1db.MachineForQrCode.FirstOrDefault(m => m.DataId == DataId);
+                Models.Main.MachineForQrCode forQrCode = maindb.MachineForQrCode.FirstOrDefault(m => m.DataId == DataId);
                 if (forQrCode == null)
                 {
-                    forQrCode = main1db.MachineForQrCode.Add(new Models.Main1.MachineForQrCode()
+                    forQrCode = maindb.MachineForQrCode.Add(new Models.Main.MachineForQrCode()
                     {
                         DataId = DataId,
                         SnNo = SnNo,
@@ -180,7 +172,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                     forQrCode.MerchantId = MerchantId;
                 }
             }
-            main1db.SaveChanges();
+            maindb.SaveChanges();
             if (SnNo == MachineNo || string.IsNullOrEmpty(MachineNo))
             {
                 fields = new Dictionary<string, object>();
@@ -230,11 +222,11 @@ namespace MySystem.Areas.Api.Controllers.v1
             }
             if (SnNo == MachineNo || string.IsNullOrEmpty(MachineNo))
             {
-                PublicFunction.BindUserMachineData(main1db, merchant.UserId, 0, 1, SnNo);
+                PublicFunction.BindUserMachineData(maindb, merchant.UserId, 0, 1, SnNo);
             }
             else
             {
-                PublicFunction.BindUserMachineData(main1db, merchant.UserId, 1, 1, SnNo);
+                PublicFunction.BindUserMachineData(maindb, merchant.UserId, 1, 1, SnNo);
             }
 
             return new AppResultJson() { Status = "1", Info = "绑定成功" };
@@ -259,11 +251,11 @@ namespace MySystem.Areas.Api.Controllers.v1
             int MachineId = int.Parse(function.CheckInt(data.getItem("MachineId").ToString())); //设备
             int QrCodeId = int.Parse(function.CheckInt(data.getItem("QrCodeId").ToString())); //收款码Id
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            Models.Main1.MerchantQrCode query = MerchantQrCodeService.Query(QrCodeId) ?? new Models.Main1.MerchantQrCode();
+            Models.Main.MerchantQrCode query = MerchantQrCodeService.Query(QrCodeId) ?? new Models.Main.MerchantQrCode();
             Models.Main1.PosMachines machine = PosMachinesDbconn.Instance.Get(MachineId) ?? new Models.Main1.PosMachines();
             query.MerchantId = MerchantId; //商户
             query.MachineId = MachineId; //设备
-            Models.Main1.MachineForQrCode qrcode = new Models.Main1.MachineForQrCode()
+            Models.Main.MachineForQrCode qrcode = new Models.Main.MachineForQrCode()
             {
                 MerchantId = MerchantId,
                 DataId = QrCodeId + "_" + MachineId,
@@ -293,10 +285,10 @@ namespace MySystem.Areas.Api.Controllers.v1
             int Id = int.Parse(function.CheckInt(data.getItem("Id").ToString()));
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             string CheckKey = Id + "_";
-            var list = main1db.MachineForQrCode.Select(m => new { m.MerchantId, m.DataId }).Where(m => m.MerchantId == MerchantId && m.DataId.StartsWith(CheckKey)).ToList();
+            var list = maindb.MachineForQrCode.Select(m => new { m.MerchantId, m.DataId }).Where(m => m.MerchantId == MerchantId && m.DataId.StartsWith(CheckKey)).ToList();
             foreach (var sub in list)
             {
-                Models.Main1.MachineForQrCode edit = main1db.MachineForQrCode.FirstOrDefault(m => m.DataId == sub.DataId);
+                Models.Main.MachineForQrCode edit = maindb.MachineForQrCode.FirstOrDefault(m => m.DataId == sub.DataId);
                 if (edit != null)
                 {
                     if (edit.SnNo != edit.MachineSnNo)
@@ -316,16 +308,16 @@ namespace MySystem.Areas.Api.Controllers.v1
                             PosMachinesService.Edit(fields, machine.Id, false);
                         }
                     }
-                    main1db.MachineForQrCode.Remove(edit);
+                    maindb.MachineForQrCode.Remove(edit);
                     int MachineId = int.Parse(function.CheckInt(edit.DataId.Split('_')[1]));
-                    Models.Main1.MerchantQrCode qrCode = main1db.MerchantQrCode.FirstOrDefault(m => m.MerchantId == MachineId);
+                    Models.Main.MerchantQrCode qrCode = maindb.MerchantQrCode.FirstOrDefault(m => m.MerchantId == MachineId);
                     if (qrCode != null)
                     {
                         qrCode.MerchantId = 0;
                     }
                 }
             }
-            main1db.SaveChanges();
+            maindb.SaveChanges();
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }
         #endregion

Service/Main/MerchantQrCodeService.cs

@@ -6,7 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Data;
-using MySystem.Models.Main1;
+using MySystem.Models.Main;
 using Library;
 using LitJson;
 
@@ -14,8 +14,8 @@ namespace MySystem.Service.Main
 {
     public class MerchantQrCodeService
     {
-        // static string _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-        static string _conn = ConfigurationManager.AppSettings["ZsSqlConnStr"].ToString();
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+        // static string _conn = ConfigurationManager.AppSettings["ZsSqlConnStr"].ToString();
 
         /// <summary>
         /// 查询列表

Util/PublicFunction.cs

@@ -220,11 +220,13 @@ namespace MySystem
 
         #region 绑定
 
-        public static void BindUserMachineData(Models.Main1.WebCMSEntities db, int UserId, int BrandId, int Count, string PosSn)
+        public static void BindUserMachineData(Models.Main.WebCMSEntities db, int UserId, int BrandId, int Count, string PosSn)
         {
+            //主库
+            Models.Main1.WebCMSEntities main1db = new Models.Main1.WebCMSEntities();
             if(BrandId == 1)
             {
-                Models.Main1.PosMachines pos = db.PosMachines.FirstOrDefault(m => m.PosSn == PosSn) ?? new Models.Main1.PosMachines();
+                Models.Main1.PosMachines pos = main1db.PosMachines.FirstOrDefault(m => m.PosSn == PosSn) ?? new Models.Main1.PosMachines();
                 pos.BindingState = 1;
                 pos.BuyUserId = UserId;
                 pos.UserId = UserId;
@@ -232,17 +234,17 @@ namespace MySystem
             }
             else
             {
-                Models.Main1.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn) ?? new Models.Main1.PosMachinesTwo();
+                Models.Main1.PosMachinesTwo pos = main1db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn) ?? new Models.Main1.PosMachinesTwo();
                 pos.BindingState = 1;
                 pos.BuyUserId = UserId;
                 pos.UserId = UserId;
                 pos.BindingTime = DateTime.Now;
             }
             string IdBrand = UserId + "_" + BrandId;
-            Models.Main1.UserMachineData MachineData = db.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
+            Models.Main.UserMachineData MachineData = db.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
             if (MachineData == null)
             {
-                MachineData = db.UserMachineData.Add(new Models.Main1.UserMachineData()
+                MachineData = db.UserMachineData.Add(new Models.Main.UserMachineData()
                 {
                     IdBrand = IdBrand,
                 }).Entity;