|
@@ -49,7 +49,7 @@ namespace MySystem.Service.Main
|
|
fields.Add("ActivationStatus"); //激活状态
|
|
fields.Add("ActivationStatus"); //激活状态
|
|
fields.Add("ActivationDate"); //激活时间
|
|
fields.Add("ActivationDate"); //激活时间
|
|
|
|
|
|
- Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).IndexData("MerchantInfo", relationData, orderBy, page, limit, condition, fields);
|
|
|
|
|
|
+ Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).IndexData("PosMachines", relationData, orderBy, page, limit, condition, fields);
|
|
List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
|
|
List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
|
|
count = int.Parse(obj["count"].ToString());
|
|
count = int.Parse(obj["count"].ToString());
|
|
return diclist;
|
|
return diclist;
|
|
@@ -77,7 +77,7 @@ namespace MySystem.Service.Main
|
|
fields.Add("ActivationStatus"); //激活状态
|
|
fields.Add("ActivationStatus"); //激活状态
|
|
fields.Add("ActivationDate"); //激活时间
|
|
fields.Add("ActivationDate"); //激活时间
|
|
|
|
|
|
- Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).IndexData("MerchantInfo", relationData, orderBy, page, limit, condition, fields);
|
|
|
|
|
|
+ Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).IndexData("PosMachines", relationData, orderBy, page, limit, condition, fields);
|
|
List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
|
|
List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
|
|
return diclist;
|
|
return diclist;
|
|
}
|
|
}
|
|
@@ -87,26 +87,26 @@ namespace MySystem.Service.Main
|
|
/// </summary>
|
|
/// </summary>
|
|
/// <param name="Id">主键Id</param>
|
|
/// <param name="Id">主键Id</param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
- public static MerchantInfo Query(int Id)
|
|
|
|
|
|
+ public static PosMachines Query(int Id)
|
|
{
|
|
{
|
|
WebCMSEntities db = new WebCMSEntities();
|
|
WebCMSEntities db = new WebCMSEntities();
|
|
- MerchantInfo editData = db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
|
|
|
|
|
|
+ PosMachines editData = db.PosMachines.FirstOrDefault(m => m.Id == Id) ?? new PosMachines();
|
|
db.Dispose();
|
|
db.Dispose();
|
|
return editData;
|
|
return editData;
|
|
}
|
|
}
|
|
- public static MerchantInfo Query(string condition, string fields = "*")
|
|
|
|
|
|
+ public static PosMachines Query(string condition, string fields = "*")
|
|
{
|
|
{
|
|
- var merchantInfo = new DbService(AppConfig.Base.main1Tables, _conn).Query(fields, "MerchantInfo", condition);
|
|
|
|
- if (merchantInfo.Count > 0)
|
|
|
|
|
|
+ var PosMachines = new DbService(AppConfig.Base.main1Tables, _conn).Query(fields, "PosMachines", condition);
|
|
|
|
+ if (PosMachines.Count > 0)
|
|
{
|
|
{
|
|
- return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantInfo>(Newtonsoft.Json.JsonConvert.SerializeObject(merchantInfo));
|
|
|
|
|
|
+ return Newtonsoft.Json.JsonConvert.DeserializeObject<PosMachines>(Newtonsoft.Json.JsonConvert.SerializeObject(PosMachines));
|
|
}
|
|
}
|
|
- return new MerchantInfo();
|
|
|
|
|
|
+ return new PosMachines();
|
|
}
|
|
}
|
|
|
|
|
|
public static decimal Sum(string condition, string field)
|
|
public static decimal Sum(string condition, string field)
|
|
{
|
|
{
|
|
- var dt = new DbService(AppConfig.Base.main1Tables, _conn).Query("Sum(" + field + ") " + field, "MerchantInfo", condition);
|
|
|
|
|
|
+ var dt = new DbService(AppConfig.Base.main1Tables, _conn).Query("Sum(" + field + ") " + field, "PosMachines", condition);
|
|
decimal amount = 0;
|
|
decimal amount = 0;
|
|
if (dt.Count > 0)
|
|
if (dt.Count > 0)
|
|
{
|
|
{
|
|
@@ -122,7 +122,7 @@ namespace MySystem.Service.Main
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
public static int Count(string condition = "", string field = "Id")
|
|
public static int Count(string condition = "", string field = "Id")
|
|
{
|
|
{
|
|
- var dt = new DbService(AppConfig.Base.main1Tables, _conn).Query("Count(" + field + ") " + field, "MerchantInfo", condition);
|
|
|
|
|
|
+ var dt = new DbService(AppConfig.Base.main1Tables, _conn).Query("Count(" + field + ") " + field, "PosMachines", condition);
|
|
int result = 0;
|
|
int result = 0;
|
|
if (dt.Count > 0)
|
|
if (dt.Count > 0)
|
|
{
|
|
{
|
|
@@ -139,7 +139,7 @@ namespace MySystem.Service.Main
|
|
public static bool Exist(int Id)
|
|
public static bool Exist(int Id)
|
|
{
|
|
{
|
|
WebCMSEntities db = new WebCMSEntities();
|
|
WebCMSEntities db = new WebCMSEntities();
|
|
- bool check = db.MerchantInfo.Any(m => m.Id == Id);
|
|
|
|
|
|
+ bool check = db.PosMachines.Any(m => m.Id == Id);
|
|
db.Dispose();
|
|
db.Dispose();
|
|
return check;
|
|
return check;
|
|
}
|
|
}
|
|
@@ -163,7 +163,7 @@ namespace MySystem.Service.Main
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
- int Id = new DbService(AppConfig.Base.main1Tables, _conn).Add("MerchantInfo", fields, 0);
|
|
|
|
|
|
+ int Id = new DbService(AppConfig.Base.main1Tables, _conn).Add("PosMachines", fields, 0);
|
|
return new AppResultJson() { Status = "1", Data = Id };
|
|
return new AppResultJson() { Status = "1", Data = Id };
|
|
}
|
|
}
|
|
|
|
|
|
@@ -186,7 +186,7 @@ namespace MySystem.Service.Main
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
- new DbService(AppConfig.Base.main1Tables, _conn).Edit("MerchantInfo", fields, Id);
|
|
|
|
|
|
+ new DbService(AppConfig.Base.main1Tables, _conn).Edit("PosMachines", fields, Id);
|
|
return new AppResultJson() { Status = "1", Data = Id };
|
|
return new AppResultJson() { Status = "1", Data = Id };
|
|
}
|
|
}
|
|
|
|
|
|
@@ -198,7 +198,7 @@ namespace MySystem.Service.Main
|
|
{
|
|
{
|
|
Dictionary<string, object> fields = new Dictionary<string, object>();
|
|
Dictionary<string, object> fields = new Dictionary<string, object>();
|
|
fields.Add("Status", -1);
|
|
fields.Add("Status", -1);
|
|
- new DbService(AppConfig.Base.main1Tables, _conn).Edit("MerchantInfo", fields, Id);
|
|
|
|
|
|
+ new DbService(AppConfig.Base.main1Tables, _conn).Edit("PosMachines", fields, Id);
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -207,7 +207,7 @@ namespace MySystem.Service.Main
|
|
/// <param name="Id">主键Id</param>
|
|
/// <param name="Id">主键Id</param>
|
|
public static void Delete(int Id)
|
|
public static void Delete(int Id)
|
|
{
|
|
{
|
|
- new DbService(AppConfig.Base.main1Tables, _conn).Delete("MerchantInfo", Id);
|
|
|
|
|
|
+ new DbService(AppConfig.Base.main1Tables, _conn).Delete("PosMachines", Id);
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -217,7 +217,7 @@ namespace MySystem.Service.Main
|
|
/// <param name="Sort">排序序号</param>
|
|
/// <param name="Sort">排序序号</param>
|
|
public static void Sort(int Id, int Sort)
|
|
public static void Sort(int Id, int Sort)
|
|
{
|
|
{
|
|
- new DbService(AppConfig.Base.main1Tables, _conn).Sort("MerchantInfo", Sort, Id);
|
|
|
|
|
|
+ new DbService(AppConfig.Base.main1Tables, _conn).Sort("PosMachines", Sort, Id);
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -232,7 +232,7 @@ namespace MySystem.Service.Main
|
|
{
|
|
{
|
|
JsonData dr = list[i];
|
|
JsonData dr = list[i];
|
|
|
|
|
|
- db.MerchantInfo.Add(new MerchantInfo()
|
|
|
|
|
|
+ db.PosMachines.Add(new PosMachines()
|
|
{
|
|
{
|
|
CreateDate = DateTime.Now,
|
|
CreateDate = DateTime.Now,
|
|
UpdateDate = DateTime.Now,
|
|
UpdateDate = DateTime.Now,
|