Merge branch 'feature-dgy-修复绑定数据统计' into DuGuYang

AppStart/Redis/MySql/MachineForQrCodeDbconn.cs

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

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<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 (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<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 (MachineForQrCode item in query.ToList())
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("SnNo", item.SnNo); //sn
@@ -781,7 +781,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);
+            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

@@ -8,7 +8,6 @@ using Microsoft.Extensions.Options;
 using Microsoft.AspNetCore.Authorization;
 using System.Web;
 using MySystem.Models.Main;
-using MySystem.Models.Main1;
 using LitJson;
 using Library;
 using MySystem.Service.Main;
@@ -43,8 +42,8 @@ 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>>();
-            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);
+            MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(MerchantId) ?? new MerchantInfo();
+            IQueryable<MerchantQrCode> query = maindb.MerchantQrCode.Where(m => m.MerchantId == MerchantId && m.QueryCount == 2);
             if (PageNum == 1)
             {
                 query = query.Take(PageSize);
@@ -54,7 +53,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 (MerchantQrCode subdata in query.ToList())
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("SnNo", subdata.SnNo); //Sn编号
@@ -113,10 +112,10 @@ namespace MySystem.Areas.Api.Controllers.v1
                 }
             }
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            Models.Main1.MerchantQrCode query = MerchantQrCodeService.Query(" SnNo='" + SnNo + "'");
+            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);
+            MerchantInfo merchant = MerchantInfoService.Query(MerchantId);
             int PosId = 0;
             if (SnNo == MachineNo || string.IsNullOrEmpty(MachineNo))
             {
@@ -124,10 +123,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 +131,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 +151,10 @@ namespace MySystem.Areas.Api.Controllers.v1
             else
             {
                 string DataId = PosId + "_2";
-                Models.Main1.MachineForQrCode forQrCode = main1db.MachineForQrCode.FirstOrDefault(m => m.DataId == DataId);
+                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 MachineForQrCode()
                     {
                         DataId = DataId,
                         SnNo = SnNo,
@@ -180,7 +171,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>();
@@ -203,7 +194,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 // string deviceId = jsonObj["alipay_commerce_iot_device_baseinfo_query_response"]["device_id"].ToString();
                 if(machines.BrandId == 1)
                 {
-                    Models.Main.MerchantAddInfo addinfo = MerchantAddInfoService.Query(MerchantId);
+                    MerchantAddInfo addinfo = MerchantAddInfoService.Query(MerchantId);
                     //通过商户smid(好哒认证成功后台提供)绑定支付宝设备
                     var result = AliIotFunction.Instance.IotBind(addinfo.AliMerchantId, MachineNo);
                     JsonData jsonObj = JsonMapper.ToObject(result);
@@ -228,13 +219,15 @@ 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 +252,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();
+            MerchantQrCode query = MerchantQrCodeService.Query(QrCodeId) ?? new 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()
+            MachineForQrCode qrcode = new MachineForQrCode()
             {
                 MerchantId = MerchantId,
                 DataId = QrCodeId + "_" + MachineId,
@@ -293,15 +286,15 @@ 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);
+                MachineForQrCode edit = maindb.MachineForQrCode.FirstOrDefault(m => m.DataId == sub.DataId);
                 if (edit != null)
                 {
                     if (edit.SnNo != edit.MachineSnNo)
                     {
-                        Models.Main.MerchantAddInfo addinfo = MerchantAddInfoService.Query(edit.MerchantId);
+                        MerchantAddInfo addinfo = MerchantAddInfoService.Query(edit.MerchantId);
                         Models.Main1.PosMachines machine = PosMachinesService.Query(" PosSn='" + edit.MachineSnNo + "'");
                         string result = AliIotFunction.Instance.IotUnBind(addinfo.AliMerchantId, machine.PosSn);
                         JsonData jsonObj = JsonMapper.ToObject(result);
@@ -316,16 +309,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);
+                    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

Areas/Api/Controllers/Main/PosMachinesController.cs

@@ -88,11 +88,11 @@ namespace MySystem.Areas.Api.Controllers.v1
                 curData.Add("MachineNo", subdata.Detail);
                 curData.Add("MerchantName", merchant.Name); //商户名称
                 string CheckKey = "_" + subdata.Id;
-                List<MachineForQrCode> QrCodes = MachineForQrCodeDbconn.Instance.GetList(BindMerchantId);
+                List<Models.Main.MachineForQrCode> QrCodes = MachineForQrCodeDbconn.Instance.GetList(BindMerchantId);
                 QrCodes = QrCodes.Where(m => m.DataId.EndsWith(CheckKey)).ToList();
                 curData.Add("BindCount", QrCodes.Count); //关联数量
                 List<Dictionary<string, object>> QrCodeList = new List<Dictionary<string, object>>();
-                foreach (MachineForQrCode QrCode in QrCodes)
+                foreach (Models.Main.MachineForQrCode QrCode in QrCodes)
                 {
                     Dictionary<string, object> item = new Dictionary<string, object>();
                     string DataId = QrCode.DataId;
@@ -163,9 +163,9 @@ namespace MySystem.Areas.Api.Controllers.v1
             int QrCodeId = int.Parse(function.CheckInt(data["QrCodeId"].ToString())); //二维码Id
             string MachineId = data["MachineId"].ToString(); //音箱Id
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantQrCode qrcode = MerchantQrCodeService.Query(QrCodeId);
+            Models.Main.MerchantQrCode qrcode = MerchantQrCodeService.Query(QrCodeId);
             PosMachines machine = PosMachinesDbconn.Instance.Get(MachineId) ?? new PosMachines();
-            MachineForQrCode query = new MachineForQrCode()
+            Models.Main.MachineForQrCode query = new Models.Main.MachineForQrCode()
             {
                 DataId = QrCodeId + "_" + MachineId,
                 MerchantId = BindMerchantId,
@@ -266,10 +266,10 @@ namespace MySystem.Areas.Api.Controllers.v1
             var list = main1db.MachineForQrCode.Select(m => new { m.MerchantId, m.DataId }).Where(m => m.MerchantId == BindMerchantId && m.DataId.EndsWith(CheckKey)).ToList();
             foreach (var sub in list)
             {
-                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)
                 {
-                    main1db.MachineForQrCode.Remove(edit);
+                    maindb.MachineForQrCode.Remove(edit);
                     int MachineId = int.Parse(function.CheckInt(edit.DataId.Split('_')[1]));
                     PosMachines machine = main1db.PosMachines.FirstOrDefault(m => m.BindMerchantId == MachineId);
                     if (machine != null)
@@ -354,7 +354,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                     Deposit = decimal.Parse(function.CheckNum(subdata.PrizeParams));
                 }
                 curData.Add("Deposit", Deposit);
-                MerchantAddInfo merchant = main1db.MerchantAddInfo.FirstOrDefault(m => m.Id == subdata.BindMerchantId) ?? new MerchantAddInfo();
+                Models.Main.MerchantAddInfo merchant = maindb.MerchantAddInfo.FirstOrDefault(m => m.Id == subdata.BindMerchantId) ?? new Models.Main.MerchantAddInfo();
                 curData.Add("BindedMerchant", merchant.CertMerchantName);
                 curData.Add("IsLeader", IsLeader);
                 dataList.Add(curData);

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;