|
@@ -8,6 +8,7 @@ using Microsoft.Extensions.Options;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using System.Web;
|
|
using System.Web;
|
|
using MySystem.Models.Main;
|
|
using MySystem.Models.Main;
|
|
|
|
+using MySystem.Models.Main1;
|
|
using LitJson;
|
|
using LitJson;
|
|
using Library;
|
|
using Library;
|
|
using MySystem.Service.Main;
|
|
using MySystem.Service.Main;
|
|
@@ -41,8 +42,8 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
|
|
int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
|
|
int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
|
|
int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
|
|
List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
|
|
List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
|
|
- MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(MerchantId) ?? new MerchantInfo();
|
|
|
|
- IQueryable<MerchantQrCode> query = maindb.MerchantQrCode.Where(m => m.MerchantId == MerchantId);
|
|
|
|
|
|
+ Models.Main.MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(MerchantId) ?? new Models.Main.MerchantInfo();
|
|
|
|
+ IQueryable<Models.Main1.MerchantQrCode> query = main1db.MerchantQrCode.Where(m => m.MerchantId == MerchantId);
|
|
if (PageNum == 1)
|
|
if (PageNum == 1)
|
|
{
|
|
{
|
|
query = query.Take(PageSize);
|
|
query = query.Take(PageSize);
|
|
@@ -52,14 +53,14 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
int skipNum = PageSize * (PageNum - 1);
|
|
int skipNum = PageSize * (PageNum - 1);
|
|
query = query.Skip(skipNum).Take(PageSize);
|
|
query = query.Skip(skipNum).Take(PageSize);
|
|
}
|
|
}
|
|
- foreach (MerchantQrCode subdata in query.ToList())
|
|
|
|
|
|
+ foreach (Models.Main1.MerchantQrCode subdata in query.ToList())
|
|
{
|
|
{
|
|
Dictionary<string, object> curData = new Dictionary<string, object>();
|
|
Dictionary<string, object> curData = new Dictionary<string, object>();
|
|
curData.Add("SnNo", subdata.SnNo); //Sn编号
|
|
curData.Add("SnNo", subdata.SnNo); //Sn编号
|
|
curData.Add("Id", subdata.Id); //Id
|
|
curData.Add("Id", subdata.Id); //Id
|
|
curData.Add("BindDate", subdata.CreateDate == null ? "" : subdata.CreateDate.Value.ToString("yyyy-MM-dd")); //绑定时间
|
|
curData.Add("BindDate", subdata.CreateDate == null ? "" : subdata.CreateDate.Value.ToString("yyyy-MM-dd")); //绑定时间
|
|
curData.Add("MerchantName", merchant.Name); //商户名称
|
|
curData.Add("MerchantName", merchant.Name); //商户名称
|
|
- PosMachines machine = PosMachinesDbconn.Instance.Get(subdata.MachineId) ?? new PosMachines();
|
|
|
|
|
|
+ Models.Main1.PosMachines machine = PosMachinesDbconn.Instance.Get(subdata.MachineId) ?? new Models.Main1.PosMachines();
|
|
curData.Add("MachineSnNo", machine.PosSn); //音箱SN
|
|
curData.Add("MachineSnNo", machine.PosSn); //音箱SN
|
|
curData.Add("BindFlag", machine.BindingState); //绑定状态
|
|
curData.Add("BindFlag", machine.BindingState); //绑定状态
|
|
dataList.Add(curData);
|
|
dataList.Add(curData);
|
|
@@ -85,9 +86,9 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
string SnNo = data["SnNo"].ToString(); //Sn编号
|
|
string SnNo = data["SnNo"].ToString(); //Sn编号
|
|
string MachineNo = data["Machine"].ToString(); //音箱码
|
|
string MachineNo = data["Machine"].ToString(); //音箱码
|
|
Dictionary<string, object> Obj = new Dictionary<string, object>();
|
|
Dictionary<string, object> Obj = new Dictionary<string, object>();
|
|
- MerchantQrCode query = MerchantQrCodeService.Query(SnNo);
|
|
|
|
- PosMachinesTwo pos = PosMachinesTwoService.Query(SnNo);
|
|
|
|
- MerchantInfo merchant = MerchantInfoService.Query(MerchantId);
|
|
|
|
|
|
+ Models.Main1.MerchantQrCode query = MerchantQrCodeService.Query(SnNo);
|
|
|
|
+ Models.Main1.PosMachinesTwo pos = PosMachinesTwoService.Query(SnNo);
|
|
|
|
+ Models.Main.MerchantInfo merchant = MerchantInfoService.Query(MerchantId);
|
|
if(pos.Id == 0)
|
|
if(pos.Id == 0)
|
|
{
|
|
{
|
|
return new AppResultJson() { Status = "-1", Info = "绑定失败" };
|
|
return new AppResultJson() { Status = "-1", Info = "绑定失败" };
|
|
@@ -115,10 +116,10 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
// }).Entity;
|
|
// }).Entity;
|
|
// maindb.SaveChanges();
|
|
// maindb.SaveChanges();
|
|
string DataId = query.Id + "_0";
|
|
string DataId = query.Id + "_0";
|
|
- MachineForQrCode forQrCode = maindb.MachineForQrCode.FirstOrDefault(m => m.DataId == DataId);
|
|
|
|
|
|
+ Models.Main1.MachineForQrCode forQrCode = main1db.MachineForQrCode.FirstOrDefault(m => m.DataId == DataId);
|
|
if (forQrCode == null)
|
|
if (forQrCode == null)
|
|
{
|
|
{
|
|
- forQrCode = maindb.MachineForQrCode.Add(new MachineForQrCode(){
|
|
|
|
|
|
+ forQrCode = main1db.MachineForQrCode.Add(new Models.Main1.MachineForQrCode(){
|
|
DataId = DataId,
|
|
DataId = DataId,
|
|
SnNo = SnNo,
|
|
SnNo = SnNo,
|
|
MachineSnNo = MachineNo,
|
|
MachineSnNo = MachineNo,
|
|
@@ -133,7 +134,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
forQrCode.BindDate = DateTime.Now;
|
|
forQrCode.BindDate = DateTime.Now;
|
|
forQrCode.MerchantId = MerchantId;
|
|
forQrCode.MerchantId = MerchantId;
|
|
}
|
|
}
|
|
- maindb.SaveChanges();
|
|
|
|
|
|
+ main1db.SaveChanges();
|
|
fields = new Dictionary<string, object>();
|
|
fields = new Dictionary<string, object>();
|
|
fields.Add("BuyUserId", merchant.UserId);
|
|
fields.Add("BuyUserId", merchant.UserId);
|
|
fields.Add("UserId", merchant.UserId);
|
|
fields.Add("UserId", merchant.UserId);
|
|
@@ -149,7 +150,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
// pos.BindMerchantId = MerchantId;
|
|
// pos.BindMerchantId = MerchantId;
|
|
// maindb.SaveChanges();
|
|
// maindb.SaveChanges();
|
|
|
|
|
|
- PublicFunction.BindUserMachineData(maindb, merchant.UserId, 0, 1, SnNo);
|
|
|
|
|
|
+ PublicFunction.BindUserMachineData(main1db, merchant.UserId, 0, 1, SnNo);
|
|
|
|
|
|
return new AppResultJson() { Status = "1", Info = "绑定成功" };
|
|
return new AppResultJson() { Status = "1", Info = "绑定成功" };
|
|
}
|
|
}
|
|
@@ -172,11 +173,11 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
int MachineId = int.Parse(function.CheckInt(data["MachineId"].ToString())); //设备
|
|
int MachineId = int.Parse(function.CheckInt(data["MachineId"].ToString())); //设备
|
|
int QrCodeId = int.Parse(function.CheckInt(data["QrCodeId"].ToString())); //收款码Id
|
|
int QrCodeId = int.Parse(function.CheckInt(data["QrCodeId"].ToString())); //收款码Id
|
|
Dictionary<string, object> Obj = new Dictionary<string, object>();
|
|
Dictionary<string, object> Obj = new Dictionary<string, object>();
|
|
- MerchantQrCode query = MerchantQrCodeService.Query(QrCodeId) ?? new MerchantQrCode();
|
|
|
|
- PosMachines machine = PosMachinesDbconn.Instance.Get(MachineId) ?? new PosMachines();
|
|
|
|
|
|
+ Models.Main1.MerchantQrCode query = MerchantQrCodeService.Query(QrCodeId) ?? new Models.Main1.MerchantQrCode();
|
|
|
|
+ Models.Main1.PosMachines machine = PosMachinesDbconn.Instance.Get(MachineId) ?? new Models.Main1.PosMachines();
|
|
query.MerchantId = MerchantId; //商户
|
|
query.MerchantId = MerchantId; //商户
|
|
query.MachineId = MachineId; //设备
|
|
query.MachineId = MachineId; //设备
|
|
- MachineForQrCode qrcode = new MachineForQrCode()
|
|
|
|
|
|
+ Models.Main1.MachineForQrCode qrcode = new Models.Main1.MachineForQrCode()
|
|
{
|
|
{
|
|
MerchantId = MerchantId,
|
|
MerchantId = MerchantId,
|
|
DataId = QrCodeId + "_" + MachineId,
|
|
DataId = QrCodeId + "_" + MachineId,
|
|
@@ -205,22 +206,22 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
|
|
int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
|
|
Dictionary<string, object> Obj = new Dictionary<string, object>();
|
|
Dictionary<string, object> Obj = new Dictionary<string, object>();
|
|
string CheckKey = Id + "_";
|
|
string CheckKey = Id + "_";
|
|
- var list = maindb.MachineForQrCode.Select(m => new { m.MerchantId, m.DataId }).Where(m => m.MerchantId == MerchantId && m.DataId.StartsWith(CheckKey)).ToList();
|
|
|
|
|
|
+ var list = main1db.MachineForQrCode.Select(m => new { m.MerchantId, m.DataId }).Where(m => m.MerchantId == MerchantId && m.DataId.StartsWith(CheckKey)).ToList();
|
|
foreach (var sub in list)
|
|
foreach (var sub in list)
|
|
{
|
|
{
|
|
- MachineForQrCode edit = maindb.MachineForQrCode.FirstOrDefault(m => m.DataId == sub.DataId);
|
|
|
|
|
|
+ Models.Main1.MachineForQrCode edit = main1db.MachineForQrCode.FirstOrDefault(m => m.DataId == sub.DataId);
|
|
if (edit != null)
|
|
if (edit != null)
|
|
{
|
|
{
|
|
- maindb.MachineForQrCode.Remove(edit);
|
|
|
|
|
|
+ main1db.MachineForQrCode.Remove(edit);
|
|
int MachineId = int.Parse(function.CheckInt(edit.DataId.Split('_')[1]));
|
|
int MachineId = int.Parse(function.CheckInt(edit.DataId.Split('_')[1]));
|
|
- MerchantQrCode qrCode = maindb.MerchantQrCode.FirstOrDefault(m => m.MerchantId == MachineId);
|
|
|
|
|
|
+ Models.Main1.MerchantQrCode qrCode = main1db.MerchantQrCode.FirstOrDefault(m => m.MerchantId == MachineId);
|
|
if (qrCode != null)
|
|
if (qrCode != null)
|
|
{
|
|
{
|
|
qrCode.MerchantId = 0;
|
|
qrCode.MerchantId = 0;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- maindb.SaveChanges();
|
|
|
|
|
|
+ main1db.SaveChanges();
|
|
return new AppResultJson() { Status = "1", Info = "", Data = Obj };
|
|
return new AppResultJson() { Status = "1", Info = "", Data = Obj };
|
|
}
|
|
}
|
|
#endregion
|
|
#endregion
|