查询商户接口区分音响和码牌

Areas/Api/Controllers/v1/MainServer/MerchantInfoController.cs

@@ -771,6 +771,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();
+            string Machine = data["Machine"].ToString();
             if(Sn.Length > 20)
             {
                 Sn = System.Web.HttpUtility.UrlDecode(Sn);
@@ -782,15 +783,30 @@ namespace MySystem.Areas.Api.Controllers.v1
                 Sn = Sn.TrimEnd('\0');
                 Sn = Sn.Substring(0, Sn.Length - 8);
             }
-            MerchantQrCode code = new MerchantQrCodeService().Query(Sn);
-            MerchantInfo query = new MerchantInfoService().Query(code.MerchantId);
-            MerchantParamSet set = new MerchantParamSetService().Query(code.MerchantId);
-            Obj.Add("Name", query.Name); //名称
-            Obj.Add("Mobile", query.Mobile); //手机号
-            Obj.Add("IsAuth", query.IsAuth); //是否认证
-            Obj.Add("Logo", DefaultPic(query.Logo)); //Logo图片
-            Obj.Add("DiviPercent", set.IsAll == 1 ? 0M : set.DiviPercent);
-            Obj.Add("MinPayMoney", set.MinPayMoney);
+            if(Machine == Sn)
+            {
+                MerchantQrCode code = new MerchantQrCodeService().Query(Sn);
+                MerchantInfo query = new MerchantInfoService().Query(code.MerchantId);
+                MerchantParamSet set = new MerchantParamSetService().Query(code.MerchantId);
+                Obj.Add("Name", query.Name); //名称
+                Obj.Add("Mobile", query.Mobile); //手机号
+                Obj.Add("IsAuth", query.IsAuth); //是否认证
+                Obj.Add("Logo", DefaultPic(query.Logo)); //Logo图片
+                Obj.Add("DiviPercent", set.IsAll == 1 ? 0M : set.DiviPercent);
+                Obj.Add("MinPayMoney", set.MinPayMoney);
+            }
+            else
+            {
+                PosMachines machine = new PosMachinesService().Query(Sn);
+                MainModels2.MerchantInfo query = new MerchantInfo2Service().Query(machine.BindMerchantId);
+                MainModels2.MerchantParamSet set = new MerchantParamSet2Service().Query(machine.BindMerchantId);
+                Obj.Add("Name", query.Name); //名称
+                Obj.Add("Mobile", query.Mobile); //手机号
+                Obj.Add("IsAuth", query.IsAuth); //是否认证
+                Obj.Add("Logo", DefaultPic(query.Logo)); //Logo图片
+                Obj.Add("DiviPercent", set.IsAll == 1 ? 0M : set.DiviPercent);
+                Obj.Add("MinPayMoney", set.MinPayMoney);
+            }
             return Obj;
         }
         #endregion

Services/MerchantInfo2Service.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MySystem.MainModels2;
+using Library;
+using LitJson;
+
+namespace MySystem
+{
+    public class MerchantInfo2Service
+    {
+        string _conn = "";
+        public MerchantInfo2Service()
+        {
+            _conn = ConfigurationManager.AppSettings["SqlConnStr2"].ToString();
+        }
+
+        /// <summary>
+        /// 查询列表
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <param name="page">页码</param>
+        /// <param name="limit">每页条数</param>
+        /// <returns></returns>
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantInfo", fields, orderby, "0", page, limit, condition);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public MerchantInfo Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantInfo editData = db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
+            db.Dispose();
+            return editData;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <returns></returns>
+        public int Add(Dictionary<string, object> Fields)
+        {
+            return new DbService(AppConfig.Base.mainTables, _conn).Add("MerchantInfo", Fields, 0);
+        }
+
+        /// <summary>
+        /// 修改数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <param name="Id">主键Id</param>
+        public void Edit(Dictionary<string, object> Fields, int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("MerchantInfo", Fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Delete("MerchantInfo", Id);
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <param name="Sort">排序序号</param>
+        public void Sort(int Id, int Sort)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Sort("MerchantInfo", Sort, Id);
+        }
+
+        /// <summary>
+        /// 导入数据
+        /// </summary>
+        /// <param name="ExcelData">json数据</param>
+        public void Import(string ExcelData)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            JsonData list = JsonMapper.ToObject(ExcelData);
+            for (int i = 1; i < list.Count;i++ )
+            {
+                JsonData dr = list[i];
+                
+                db.MerchantInfo.Add(new MerchantInfo()
+                {
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now,
+                    
+                });
+                db.SaveChanges();
+            }
+            db.Dispose();
+        }
+
+        /// <summary>
+        /// 导出excel表格
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        public Dictionary<string, object> ExportExcel(List<FieldItem> fields, string condition, string orderby = "Id desc")
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantInfo", fields, orderby, "0", 1, 20000, condition, "Id", false);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+            }
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result.Add("Status", "1");
+            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
+            result.Add("Obj", diclist);
+            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
+
+            result.Add("Fields", ReturnFields);
+            return result;
+        }
+    }
+}

Services/MerchantParamSet2Service.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MySystem.MainModels2;
+using Library;
+using LitJson;
+
+namespace MySystem
+{
+    public class MerchantParamSet2Service
+    {
+        string _conn = "";
+        public MerchantParamSet2Service()
+        {
+            _conn = ConfigurationManager.AppSettings["SqlConnStr2"].ToString();
+        }
+
+        /// <summary>
+        /// 查询列表
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <param name="page">页码</param>
+        /// <param name="limit">每页条数</param>
+        /// <returns></returns>
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantParamSet", fields, orderby, "0", page, limit, condition);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public MerchantParamSet Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantParamSet editData = db.MerchantParamSet.FirstOrDefault(m => m.Id == Id) ?? new MerchantParamSet();
+            db.Dispose();
+            return editData;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <returns></returns>
+        public int Add(Dictionary<string, object> Fields)
+        {
+            return new DbService(AppConfig.Base.mainTables, _conn).Add("MerchantParamSet", Fields, 0);
+        }
+
+        /// <summary>
+        /// 修改数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <param name="Id">主键Id</param>
+        public void Edit(Dictionary<string, object> Fields, int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("MerchantParamSet", Fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Delete("MerchantParamSet", Id);
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <param name="Sort">排序序号</param>
+        public void Sort(int Id, int Sort)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Sort("MerchantParamSet", Sort, Id);
+        }
+
+        /// <summary>
+        /// 导入数据
+        /// </summary>
+        /// <param name="ExcelData">json数据</param>
+        public void Import(string ExcelData)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            JsonData list = JsonMapper.ToObject(ExcelData);
+            for (int i = 1; i < list.Count;i++ )
+            {
+                JsonData dr = list[i];
+                
+                db.MerchantParamSet.Add(new MerchantParamSet()
+                {
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now,
+                    
+                });
+                db.SaveChanges();
+            }
+            db.Dispose();
+        }
+
+        /// <summary>
+        /// 导出excel表格
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        public Dictionary<string, object> ExportExcel(List<FieldItem> fields, string condition, string orderby = "Id desc")
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantParamSet", fields, orderby, "0", 1, 20000, condition, "Id", false);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+            }
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result.Add("Status", "1");
+            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
+            result.Add("Obj", diclist);
+            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
+
+            result.Add("Fields", ReturnFields);
+            return result;
+        }
+    }
+}

Services/PosMachinesService.cs

@@ -42,6 +42,13 @@ namespace MySystem
             db.Dispose();
             return editData;
         }
+        public PosMachines Query(string SnNo)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            PosMachines editData = db.PosMachines.FirstOrDefault(m => m.PosSn == SnNo) ?? new PosMachines();
+            db.Dispose();
+            return editData;
+        }
 
         /// <summary>
         /// 添加数据