备份

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

@@ -53,6 +53,63 @@ namespace MySystem.Areas.Api.Controllers.v1
         #endregion
 
 
+        #region 首页-客小爽产品-主界面产品数据
+        [Authorize]
+        public JsonResult MainStatData(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            List<Dictionary<string, object>> Obj = MainStatDataDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
+        }
+        public List<Dictionary<string, object>> MainStatDataDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string UserId = data["UserId"].ToString(); //创客Id
+            
+            List<Dictionary<string, object>> list = new List<Dictionary<string, object>>();
+            List<KqProducts> querys = KqProductsDbconn.Instance.GetList();
+            foreach (KqProducts query in querys)
+            {
+                Dictionary<string, object> Obj = new Dictionary<string, object>();
+                Obj.Add("Id", query.Id);
+                Obj.Add("Name", query.Name); //名称
+
+                UserMachineData MachineData = UserMachineDataDbconn.Instance.Get(UserId + "_" + query.Id) ?? new UserMachineData();
+                Dictionary<string, object> Machine = new Dictionary<string, object>();
+                Machine.Add("TotalMachineCount", MachineData.TotalMachineCount);  //总机具数
+                Machine.Add("UnBindCount", MachineData.UnBindCount); //未绑定机具数
+                Machine.Add("BindCount", MachineData.BindCount); //已绑定机具数
+                Obj.Add("Machine", Machine); //机具管理数据
+
+                Dictionary<string, object> Profit = new Dictionary<string, object>();
+                Profit.Add("TradeProfit", MachineData.TradeProfit); //交易分润
+                Profit.Add("ActProfit", MachineData.ActProfit); //激活奖励
+                Profit.Add("OpenProfit", MachineData.OpenProfit); //开机奖励
+                Profit.Add("DividendsProfit", MachineData.DividendsProfit); //分红奖励
+                Profit.Add("OtherProfit", MachineData.OtherProfit); //分润补贴
+                Profit.Add("FluxProfit", MachineData.FluxProfit); //流量卡分佣
+                Obj.Add("Profit", Profit); //收益查看数据
+
+                List<Dictionary<string, object>> Advertisment = new List<Dictionary<string, object>>();
+                string ColId = "";
+                List<Models.Advertisment> ads = AdvertismentDbconn.Instance.GetList(ColId);
+                foreach (Models.Advertisment ad in ads)
+                {
+                    Dictionary<string, object> item = new Dictionary<string, object>();
+                    item.Add("Url", ad.Url); //跳转地址
+                    item.Add("BannerPic", DefaultPic(ad.PicPath)); //广告图片
+                    item.Add("Id", ad.Id); //Id
+                    Advertisment.Add(item);
+                }
+                Obj.Add("Advertisment", Advertisment);
+                list.Add(Obj);
+            }
+            return list;
+        }
+        #endregion
+
+
 
 
 

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

@@ -150,7 +150,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             query.UpdateMan = AlipayMccCode;
             MerchantInfo merchant = maindb.MerchantInfo.FirstOrDefault(m => m.Id == query.Id);
             if(merchant == null)
-            {                
+            {
                 merchant = maindb.MerchantInfo.Add(new MerchantInfo()
                 {
                     Id = query.Id,
@@ -169,7 +169,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 merchant.QueryCount = 0;
                 // 如果提交完整资料，则发送到BsServer执行进件操作
-                RedisDbconn.Instance.AddList("MerchantConfirmQueue", merchant.Id.ToString());
+                RedisDbconn.Instance.AddList("MerchantConfirmQueue", "{\"MerchantId\":\"" + merchant.Id + "\"}");
             }
             maindb.SaveChanges();
             Obj.Add("Id", MerchantAddInfoId); //Id

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

@@ -275,6 +275,236 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
 
+        #region 首页-客小爽产品-机具管理-已绑定机具列表
+        [Authorize]
+        public JsonResult MyMachinesForBind(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = MyMachinesForBindDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
+        }
+        public List<Dictionary<string, object>> MyMachinesForBindDo(string value, out Dictionary<string, object> Other)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int UserId = int.Parse(function.CheckInt(data["UserId"].ToString())); //所属创客
+            int BrandId = int.Parse(function.CheckInt(data["BrandId"].ToString())); //产品类型
+            string SnNo = data["SnNo"].ToString(); //SN号
+            int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
+            int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            if (!string.IsNullOrEmpty(SnNo))
+            {
+                PageSize = 100000;
+            }
+            IQueryable<PosMachinesTwo> query = maindb.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId == UserId && m.BrandId == BrandId && m.BindingState == 1);
+            if (!string.IsNullOrEmpty(SnNo))
+            {
+                query = query.Where(m => m.PosSn == SnNo);
+            }
+            Other = new Dictionary<string, object>();
+            if (PageNum == 1)
+            {
+                Other.Add("count", query.Count());
+                query = query.Take(PageSize);
+            }
+            else
+            {
+                int skipNum = PageSize * (PageNum - 1);
+                query = query.Skip(skipNum).Take(PageSize);
+            }
+            foreach (var subdata in query.ToList())
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                int IsLeader = 0;//是否为大盟主机(0-否 1-是)
+                if (subdata.LeaderUserId > 0)
+                {
+                    IsLeader = 1;
+                }
+                else
+                {
+                    IsLeader = 0;
+                }
+                curData.Add("ActivationState", subdata.ActivationState == 1 ? "已激活" : "未激活"); //激活状态
+                curData.Add("PosSn", subdata.PosSn); //SN编号
+                curData.Add("PosSnType", RelationClass.GetPosSnTypeInfo(subdata.PosSnType)); //机具类型
+                curData.Add("Id", subdata.Id); //Id
+                decimal Deposit = 299;
+                if (BrandId == 6)
+                { 
+                    Deposit = 249;
+                }
+                if (!string.IsNullOrEmpty(subdata.PrizeParams))
+                {
+                    Deposit = decimal.Parse(function.CheckNum(subdata.PrizeParams));
+                }
+                curData.Add("Deposit", Deposit);
+                curData.Add("BindedMerchant", subdata.BuyUserId != subdata.UserId ? 1 : 0); //是否已绑定商户型创客
+                curData.Add("IsLeader",IsLeader);
+                dataList.Add(curData);
+            }
+            return dataList;
+        }
+        #endregion
+
+        #region 首页-客小爽产品-机具管理-总机具列表
+        [Authorize]
+        public JsonResult MyMachines(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = MyMachinesDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
+        }
+        public List<Dictionary<string, object>> MyMachinesDo(string value, out Dictionary<string, object> Other)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int UserId = int.Parse(function.CheckInt(data["UserId"].ToString())); //所属创客
+            int BrandId = int.Parse(function.CheckInt(data["BrandId"].ToString())); //产品类型
+            string SnNo = data["SnNo"].ToString(); //SN号
+            int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
+            int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            if (!string.IsNullOrEmpty(SnNo))
+            {
+                PageSize = 100000;
+            }
+            IQueryable<PosMachinesTwo> query = maindb.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId == UserId && m.BrandId == BrandId);
+            if (!string.IsNullOrEmpty(SnNo))
+            {
+                query = query.Where(m => m.PosSn == SnNo);
+            }
+            Other = new Dictionary<string, object>();
+            if (PageNum == 1)
+            {
+                Other.Add("count", query.Count());
+                query = query.Take(PageSize);
+            }
+            else
+            {
+                int skipNum = PageSize * (PageNum - 1);
+                query = query.Skip(skipNum).Take(PageSize);
+            }
+            foreach (var subdata in query.ToList())
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                int IsLeader = 0;//是否为大盟主机(0-否 1-是)
+                if (subdata.LeaderUserId > 0)
+                {
+                    IsLeader = 1;
+                }
+                else
+                {
+                    IsLeader = 0;
+                }
+                curData.Add("PosSn", subdata.PosSn); //SN编号
+                curData.Add("PosSnType", RelationClass.GetPosSnTypeInfo(subdata.PosSnType)); //机具类型
+                curData.Add("Id", subdata.Id); //Id
+                curData.Add("CreateDate", subdata.TransferTime == null ? "" : subdata.TransferTime.Value.ToString("yyyy-MM-dd HH:mm:ss")); //CreateDate
+                StoreHouse store = StoreHouseDbconn.Instance.Get(subdata.StoreId) ?? new StoreHouse();
+                curData.Add("FromStore", store.StoreName); //来自仓库
+                decimal Deposit = 299;
+                if (BrandId == 6)
+                { 
+                    Deposit = 249;
+                }
+                if (!string.IsNullOrEmpty(subdata.PrizeParams))
+                {
+                    Deposit = decimal.Parse(function.CheckNum(subdata.PrizeParams));
+                }
+                curData.Add("Deposit", Deposit);
+                curData.Add("IsLeader",IsLeader);
+                dataList.Add(curData);
+            }
+            return dataList;
+        }
+        #endregion
+
+        #region 首页-客小爽产品-机具管理-未绑定机具列表
+        [Authorize]
+        public JsonResult MyMachinesForUnBind(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = MyMachinesForUnBindDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
+        }
+        public List<Dictionary<string, object>> MyMachinesForUnBindDo(string value, out Dictionary<string, object> Other)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int UserId = int.Parse(function.CheckInt(data["UserId"].ToString())); //所属创客
+            int BrandId = int.Parse(function.CheckInt(data["BrandId"].ToString())); //产品类型
+            string SnNo = data["SnNo"].ToString(); //SN号
+            int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
+            int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            if (!string.IsNullOrEmpty(SnNo))
+            {
+                PageSize = 100000;
+            }
+            IQueryable<PosMachinesTwo> query = maindb.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId == UserId && m.BrandId == BrandId && m.BindingState == 0);
+            if (!string.IsNullOrEmpty(SnNo))
+            {
+                query = query.Where(m => m.PosSn == SnNo && m.PosSnType == 0);
+            }
+            Other = new Dictionary<string, object>();
+            if (PageNum == 1)
+            {
+                Other.Add("count", query.Count());
+                query = query.Take(PageSize);
+            }
+            else
+            {
+                int skipNum = PageSize * (PageNum - 1);
+                query = query.Skip(skipNum).Take(PageSize);
+            }
+            foreach (var subdata in query.ToList())
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                int IsLeader = 0;//是否为大盟主机(0-否 1-是)
+                if (subdata.LeaderUserId > 0)
+                {
+                    IsLeader = 1;
+                }
+                else
+                {
+                    IsLeader = 0;
+                }
+                curData.Add("PosSn", subdata.PosSn); //SN编号
+                curData.Add("PosSnType", RelationClass.GetPosSnTypeInfo(subdata.PosSnType)); //机具类型
+                curData.Add("Id", subdata.Id); //Id
+                if (subdata.RecycEndDate != null)
+                {
+                    TimeSpan ts = subdata.RecycEndDate.Value - DateTime.Now;
+                    curData.Add("ActDays", ts.TotalDays.ToString("f0")); //活动剩余天数
+                }
+                else
+                { 
+                    curData.Add("ActDays", 0); //活动剩余天数
+                }
+                curData.Add("CreateDate", subdata.CreateDate.Value.ToString("yyyy-MM-dd")); //机具初始日期
+                curData.Add("EndDate", subdata.RecycEndDate == null ? "" : subdata.RecycEndDate.Value.ToString("yyyy-MM-dd")); //截止日期
+                decimal Deposit = 299;
+                if (BrandId == 6)
+                { 
+                    Deposit = 249;
+                }
+                if (!string.IsNullOrEmpty(subdata.PrizeParams))
+                {
+                    Deposit = decimal.Parse(function.CheckNum(subdata.PrizeParams));
+                }
+                curData.Add("Deposit", Deposit);
+                curData.Add("IsLeader",IsLeader);
+                dataList.Add(curData);
+            }
+            return dataList;
+        }
+        #endregion
+
+
 
 
 

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

@@ -0,0 +1,153 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.AspNetCore.Authorization;
+using System.Web;
+using MySystem.MainModels;
+using LitJson;
+using Library;
+
+namespace MySystem.Areas.Api.Controllers.v1.pos
+{
+    [Area("Api")]
+    [Route("Api/v1/pos/[controller]/[action]")]
+    public class UserStoreChangeController : BaseController
+    {
+        public UserStoreChangeController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
+        {
+        }
+
+
+
+
+        #region 首页-客小爽产品-机具管理-未绑定-划拨
+        [Authorize]
+        public JsonResult Transfer(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = TransferDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        public AppResultJson TransferDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int UserId = int.Parse(function.CheckInt(data["UserId"].ToString())); //创客
+            int BrandId = int.Parse(function.CheckInt(data["BrandId"].ToString())); //产品类型
+            string SnIds = data["SnIds"].ToString(); //SN列表返回的Id
+            int ToUserId = int.Parse(function.CheckInt(data["ToUserId"].ToString())); //划拨对象创客Id
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
+            bool checkUser = maindb.Users.Any(m => m.Id == ToUserId);
+            if (!checkUser)
+            { 
+                return new AppResultJson() { Status = "-1", Info = "请输入正确的创客编号", Data = Obj };
+            }
+            Users user = maindb.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+            Users touser = maindb.Users.FirstOrDefault(m => m.Id == ToUserId) ?? new Users();            
+            if (!function.CheckNull(touser.ParentNav).Contains("," + UserId + ",") || function.CheckNull(user.ParentNav).Contains("," + ToUserId + ","))
+            {
+                return new AppResultJson() { Status = "-1", Info = "划拨对象不在您的权限范围", Data = Obj };
+            }
+            if (!string.IsNullOrEmpty(SnIds))
+            {
+                string[] SnIdList = SnIds.Split(',');
+                foreach (string SnId in SnIdList)
+                {
+                    int SnIdNum = int.Parse(SnId);
+                    PosMachinesTwo pos = maindb.PosMachinesTwo.FirstOrDefault(m => m.Status > -1 && m.Id == SnIdNum) ?? new PosMachinesTwo();
+                    if (pos.PosSnType == 1)
+                    {
+                        return new AppResultJson() { Status = "-1", Info = "机具" + pos.PosSn + "是循环机，请勿划拨", Data = Obj };
+                    }
+                    StoreHouse store = StoreHouseDbconn.Instance.Get(pos.StoreId) ?? new StoreHouse();
+                    string ChangeRecordNo = "SC" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
+                    UserStoreChange query = maindb.UserStoreChange.Add(new UserStoreChange()
+                    {
+                        CreateDate = DateTime.Now,
+                        UserId = UserId, //创客
+                        BrandId = BrandId, //产品类型
+                        ChangeRecordNo = ChangeRecordNo, //变更记录单号
+                        TransType = 11, //交易类型
+                        SnNo = pos.PosSn, //SN编号
+                        SnType = pos.PosSnType, //SN机具类型
+                        StockOpDirect = 1, //库存操作方向
+                        ToUserId = ToUserId, //收货创客
+                        SnStatus = 0, //SN状态
+                        BindStatus = (int)pos.BindingState, //绑定状态
+                        BindMerchantId = pos.BindMerchantId, //绑定商户
+                        ActiveStatus = (int)pos.ActivationState, //激活状态
+                        FromUserId = UserId, //出货创客
+                    }).Entity;
+                    maindb.SaveChanges();
+                    StoreChangeHistory history = maindb.StoreChangeHistory.Add(new StoreChangeHistory()
+                    {
+                        CreateDate = DateTime.Now,
+                        UserId = UserId, //创客
+                        BrandId = BrandId, //产品类型
+                        ChangeRecordNo = ChangeRecordNo, //变更记录单号
+                        TransType = 2, //交易类型
+                        SnNo = pos.PosSn, //SN编号
+                        SnType = pos.PosSnType, //SN机具类型
+                        StockOpDirect = 1, //库存操作方向
+                        DeviceVendor = pos.DeviceName, //设备厂商
+                        DeviceModel = pos.DeviceKind, //设备型号
+                        DeviceType = pos.DeviceType, //设备类型
+                        ToUserId = ToUserId, //收货创客
+                        FromUserId = store.UserId, //出货创客
+                        FromDate = DateTime.Now, //出库时间
+                        SourceStoreId = pos.SourceStoreId, //源仓库
+                        StoreId = store.Id, //仓库
+                    }).Entity;
+                    maindb.SaveChanges();
+                    StoreChangeItem item = new StoreChangeItem()
+                    {
+                        SnNo = pos.PosSn,
+                        SnType = pos.PosSnType,
+                        FromDate = DateTime.Now,
+                        Id = query.Id,
+                        UserId = ToUserId,
+                    };
+                    string IdBrand = UserId + "_" + BrandId;
+                    PublicFunction.StatUserMachineData(UserId, BrandId, -1);
+                    PublicFunction.StatUserMachineData(ToUserId, BrandId, 1);
+
+                    pos.BuyUserId = ToUserId;
+                    pos.UserId = ToUserId;
+                    pos.TransferTime = DateTime.Now;
+                    maindb.SaveChanges();
+                }
+            }
+            return new AppResultJson() { Status = "1", Info = "", Data = Obj };
+        }
+        #endregion
+
+
+
+        #region 检查签名是否合法，合法返回1，不合法返回提示信息
+
+        /// <summary>
+        /// 检查签名是否合法，合法返回1，不合法返回提示信息
+        /// </summary>
+        /// <param name="value">请求的参数(json字符串)</param>
+        /// <param name="signField">要签名的字段</param>
+        /// <returns></returns>
+        private string CheckSign(string value, string[] signField)
+        {
+            JsonData json = JsonMapper.ToObject(value);
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            for (int i = 0; i < signField.Length; i++)
+            {
+                dic.Add(signField[i], json[signField[i]].ToString());
+            }
+            string sign = json["sign"].ToString(); //客户端签名字符串
+            return new Sign().sign(dic, sign);
+        }
+
+        #endregion
+
+    }
+}