Merge branch 'DuGuYang' of http://47.109.31.237:13000/kxs-end/admin-server into feature-dgy-后台优化

AppStart/ExcelHelper.cs

@@ -152,13 +152,7 @@ namespace MySystem
                                             RedisDbconn.Instance.Set("MachineForSnNo:" + SnNo, machinefor);
                                             db.SaveChanges();
 
-                                            RedisDbconn.Instance.Set("PosMachinesTwo:" + pos.Id, pos);
                                             RedisDbconn.Instance.AddList("PosMachineList:" + storefor.StoreId, pos);
-                                            RedisDbconn.Instance.AddList("PosMachinesTwo:" + store.UserId + ":" + BrandId, new PosMachineList()
-                                            {
-                                                Id = pos.Id,
-                                                SnNo = SnNo,
-                                            });
 
                                             if (!storeData.ContainsKey(storefor.StoreId + "_" + BrandId))
                                             {
@@ -219,13 +213,10 @@ namespace MySystem
                                     store.TotalNum += OpStoreNum;
                                     store.LaveNum += OpStoreNum;
                                     db.SaveChanges();
-                                    RedisDbconn.Instance.Clear("StoreHouse:" + StoreId);
-                                    RedisDbconn.Instance.Clear("StoreHouseList:" + store.UserId);
                                 }
                                 db.SaveChanges();
 
                                 tran.Commit();
-                                RedisDbconn.Instance.Clear("StoreHouse");
                                 RedisDbconn.Instance.Set("CheckImport:" + checkKey, "success|" + SuccessCount);
                                 RedisDbconn.Instance.SetExpire("CheckImport:" + checkKey, 60000);
                             }
@@ -482,8 +473,6 @@ namespace MySystem
                                         db.SaveChanges();
                                         string SendData = "{\"Kind\":\"5\",\"Data\":{\"StoreId\":\"" + StoreId + "\",\"BrandId\":\"" + BrandId + "\",\"OpStoreNum\":\"" + OpStoreNum + "\"}}";
                                         RedisDbconn.Instance.AddList("StoreApplyQueue", SendData);
-                                        RedisDbconn.Instance.Clear("StoreHouse:" + StoreId);
-                                        RedisDbconn.Instance.Clear("StoreHouseList:" + store.UserId);
                                     }
                                     foreach (string key in toStoreData.Keys)
                                     {
@@ -523,8 +512,6 @@ namespace MySystem
                                         db.SaveChanges();
                                         string SendData = "{\"Kind\":\"5\",\"Data\":{\"StoreId\":\"" + StoreId + "\",\"BrandId\":\"" + BrandId + "\",\"OpStoreNum\":\"-" + OpStoreNum + "\"}}";
                                         RedisDbconn.Instance.AddList("StoreApplyQueue", SendData);
-                                        RedisDbconn.Instance.Clear("StoreHouse:" + StoreId);
-                                        RedisDbconn.Instance.Clear("StoreHouseList:" + store.UserId);
                                     }
                                     db.SaveChanges();
                                     tran.Commit();
@@ -594,153 +581,153 @@ namespace MySystem
                                                     PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.BuyUserId == 0 && m.UserId == 0) ?? new PosMachinesTwo();
                                                     if (machine.Id > 0)
                                                     {
-                                                        StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
-                                                        {
-                                                            CreateDate = DateTime.Now,
-                                                            CreateMan = Operator,
-                                                            StoreId = storefor.StoreId, //仓库
-                                                            BrandId = BrandId, //产品类型
-                                                            ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
-                                                            BizBatchNo = BatchNo, //业务批次号
-                                                            TransType = 2, //交易类型
-                                                            SnNo = SnNo, //SN编号
-                                                            SnType = machine.PosSnType, //SN机具类型
-                                                            StockOpDirect = 1, //库存操作方向
-                                                            SnStatus = 1, //SN状态
-                                                            BindStatus = machine.BindingState, //绑定状态
-                                                            BindMerchant = machine.BindMerchantId, //绑定商户
-                                                            ActiveStatus = machine.ActivationState, //激活状态
-                                                            ActRewardUserId = machine.BuyUserId, //激活奖励人
-                                                            DeviceVendor = machine.DeviceName, //设备厂商
-                                                            DeviceModel = machine.DeviceKind, //设备型号
-                                                            DeviceType = machine.DeviceType, //设备类型
-                                                            FromUserId = store.UserId, //出货人
-                                                            FromDate = DateTime.Now, //出库时间
-                                                            FromRemark = OutNote, //出库备注
-                                                            ToUserId = userfor.UserId, //收货人
-                                                            SourceStoreId = machine.SourceStoreId, //源仓库编号
-                                                            BrandType = machine.DeviceType, //品牌类型
-                                                        }).Entity;
-                                                        db.SaveChanges();
-                                                        string ChangeNo = "SC";
-                                                        int StoreStockChangeId = stockchange.Id;
-                                                        string StoreStockChangeIdString = StoreStockChangeId.ToString();
-                                                        for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
+                                                        if(machine.BrandId == BrandId)
                                                         {
-                                                            StoreStockChangeIdString = "0" + StoreStockChangeIdString;
-                                                        }
-                                                        ChangeNo += StoreStockChangeIdString;
-                                                        stockchange.ChangeNo = ChangeNo; //交易流水编号
-                                                        db.SaveChanges();
+                                                            StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                                                            {
+                                                                CreateDate = DateTime.Now,
+                                                                CreateMan = Operator,
+                                                                StoreId = storefor.StoreId, //仓库
+                                                                BrandId = BrandId, //产品类型
+                                                                ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
+                                                                BizBatchNo = BatchNo, //业务批次号
+                                                                TransType = 2, //交易类型
+                                                                SnNo = SnNo, //SN编号
+                                                                SnType = machine.PosSnType, //SN机具类型
+                                                                StockOpDirect = 1, //库存操作方向
+                                                                SnStatus = 1, //SN状态
+                                                                BindStatus = machine.BindingState, //绑定状态
+                                                                BindMerchant = machine.BindMerchantId, //绑定商户
+                                                                ActiveStatus = machine.ActivationState, //激活状态
+                                                                ActRewardUserId = machine.BuyUserId, //激活奖励人
+                                                                DeviceVendor = machine.DeviceName, //设备厂商
+                                                                DeviceModel = machine.DeviceKind, //设备型号
+                                                                DeviceType = machine.DeviceType, //设备类型
+                                                                FromUserId = store.UserId, //出货人
+                                                                FromDate = DateTime.Now, //出库时间
+                                                                FromRemark = OutNote, //出库备注
+                                                                ToUserId = userfor.UserId, //收货人
+                                                                SourceStoreId = machine.SourceStoreId, //源仓库编号
+                                                                BrandType = machine.DeviceType, //品牌类型
+                                                            }).Entity;
+                                                            db.SaveChanges();
+                                                            string ChangeNo = "SC";
+                                                            int StoreStockChangeId = stockchange.Id;
+                                                            string StoreStockChangeIdString = StoreStockChangeId.ToString();
+                                                            for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
+                                                            {
+                                                                StoreStockChangeIdString = "0" + StoreStockChangeIdString;
+                                                            }
+                                                            ChangeNo += StoreStockChangeIdString;
+                                                            stockchange.ChangeNo = ChangeNo; //交易流水编号
+                                                            db.SaveChanges();
 
-                                                        UserStoreChange userstore = db.UserStoreChange.Add(new UserStoreChange()
-                                                        {
-                                                            CreateDate = DateTime.Now,
-                                                            CreateMan = Operator,
-                                                            UserId = store.UserId, //创客
-                                                            BrandId = BrandId, //产品类型
-                                                            ChangeRecordNo = ChangeNo, //变更记录单号
-                                                            TransType = 0, //交易类型
-                                                            SnNo = SnNo, //SN编号
-                                                            SnType = machine.PosSnType, //SN机具类型
-                                                            StockOpDirect = 0, //库存操作方向
-                                                            DeviceVendor = machine.DeviceName, //设备厂商
-                                                            DeviceType = machine.DeviceKind, //设备类型
-                                                            DeviceModel = machine.DeviceType, //设备型号
-                                                            ToUserId = userfor.UserId, //收货创客
-                                                            ToDate = DateTime.Now, //入库时间
-                                                            ToRemark = OutNote, //入库备注
-                                                            SourceStoreId = machine.SourceStoreId, //源仓库
-                                                            SnStatus = 1, //SN状态
-                                                            BizBatchNo = BatchNo, //业务批次号
-                                                            BindStatus = (int)machine.BindingState, //绑定状态
-                                                            BindMerchantId = machine.BindMerchantId, //绑定商户
-                                                            ActiveStatus = (int)machine.ActivationState, //激活状态
-                                                            ActRewardUserId = machine.BuyUserId, //激活奖励创客
-                                                            BrandType = machine.DeviceType, //品牌类型
-                                                        }).Entity;
+                                                            UserStoreChange userstore = db.UserStoreChange.Add(new UserStoreChange()
+                                                            {
+                                                                CreateDate = DateTime.Now,
+                                                                CreateMan = Operator,
+                                                                UserId = store.UserId, //创客
+                                                                BrandId = BrandId, //产品类型
+                                                                ChangeRecordNo = ChangeNo, //变更记录单号
+                                                                TransType = 0, //交易类型
+                                                                SnNo = SnNo, //SN编号
+                                                                SnType = machine.PosSnType, //SN机具类型
+                                                                StockOpDirect = 0, //库存操作方向
+                                                                DeviceVendor = machine.DeviceName, //设备厂商
+                                                                DeviceType = machine.DeviceKind, //设备类型
+                                                                DeviceModel = machine.DeviceType, //设备型号
+                                                                ToUserId = userfor.UserId, //收货创客
+                                                                ToDate = DateTime.Now, //入库时间
+                                                                ToRemark = OutNote, //入库备注
+                                                                SourceStoreId = machine.SourceStoreId, //源仓库
+                                                                SnStatus = 1, //SN状态
+                                                                BizBatchNo = BatchNo, //业务批次号
+                                                                BindStatus = (int)machine.BindingState, //绑定状态
+                                                                BindMerchantId = machine.BindMerchantId, //绑定商户
+                                                                ActiveStatus = (int)machine.ActivationState, //激活状态
+                                                                ActRewardUserId = machine.BuyUserId, //激活奖励创客
+                                                                BrandType = machine.DeviceType, //品牌类型
+                                                            }).Entity;
 
-                                                        db.StoreChangeHistory.Add(new StoreChangeHistory()
-                                                        {
-                                                            CreateDate = DateTime.Now,
-                                                            CreateMan = Operator,
-                                                            UserId = store.UserId, //创客
-                                                            BrandId = BrandId, //产品类型
-                                                            ChangeRecordNo = ChangeNo, //变更记录单号
-                                                            BizBatchNo = BatchNo, //业务批次号
-                                                            TransType = 2, //交易类型
-                                                            SnNo = SnNo, //SN编号
-                                                            SnType = machine.PosSnType, //SN机具类型
-                                                            StockOpDirect = 1, //库存操作方向
-                                                            DeviceVendor = machine.DeviceName, //设备厂商
-                                                            DeviceModel = machine.DeviceKind, //设备型号
-                                                            DeviceType = machine.DeviceType, //设备类型
-                                                            FromUserId = store.UserId, //出货创客
-                                                            FromDate = DateTime.Now, //出库时间
-                                                            FromRemark = OutNote, //出库备注
-                                                            SourceStoreId = machine.SourceStoreId, //源仓库
-                                                            StoreId = store.Id, //仓库
-                                                        });
+                                                            db.StoreChangeHistory.Add(new StoreChangeHistory()
+                                                            {
+                                                                CreateDate = DateTime.Now,
+                                                                CreateMan = Operator,
+                                                                UserId = store.UserId, //创客
+                                                                BrandId = BrandId, //产品类型
+                                                                ChangeRecordNo = ChangeNo, //变更记录单号
+                                                                BizBatchNo = BatchNo, //业务批次号
+                                                                TransType = 2, //交易类型
+                                                                SnNo = SnNo, //SN编号
+                                                                SnType = machine.PosSnType, //SN机具类型
+                                                                StockOpDirect = 1, //库存操作方向
+                                                                DeviceVendor = machine.DeviceName, //设备厂商
+                                                                DeviceModel = machine.DeviceKind, //设备型号
+                                                                DeviceType = machine.DeviceType, //设备类型
+                                                                FromUserId = store.UserId, //出货创客
+                                                                FromDate = DateTime.Now, //出库时间
+                                                                FromRemark = OutNote, //出库备注
+                                                                SourceStoreId = machine.SourceStoreId, //源仓库
+                                                                StoreId = store.Id, //仓库
+                                                            });
 
-                                                        db.StoreChangeHistory.Add(new StoreChangeHistory()
-                                                        {
-                                                            CreateDate = DateTime.Now,
-                                                            CreateMan = Operator,
-                                                            UserId = touser.Id, //创客
-                                                            BrandId = BrandId, //产品类型
-                                                            ChangeRecordNo = ChangeNo, //变更记录单号
-                                                            BizBatchNo = BatchNo, //业务批次号
-                                                            TransType = 0, //交易类型
-                                                            SnNo = SnNo, //SN编号
-                                                            SnType = machine.PosSnType, //SN机具类型
-                                                            StockOpDirect = 0, //库存操作方向
-                                                            DeviceVendor = machine.DeviceName, //设备厂商
-                                                            DeviceModel = machine.DeviceKind, //设备型号
-                                                            DeviceType = machine.DeviceType, //设备类型
-                                                            ToUserId = touser.Id, //收货创客
-                                                            ToDate = DateTime.Now, //入库时间
-                                                            ToRemark = OutNote, //入库备注
-                                                            SourceStoreId = machine.SourceStoreId, //源仓库
-                                                        });
-                                                        machine.BuyUserId = touser.Id;
-                                                        machine.UserId = touser.Id;
-                                                        machine.TransferTime = DateTime.Now;
-                                                        machine.RecycEndDate = DateTime.Now.AddDays(180); // 循环结束时间
-                                                        db.SaveChanges();
-                                                        string IdBrand = touser.Id + "_" + BrandId;
-                                                        UserMachineData MachineData = db.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
-                                                        if (MachineData == null)
-                                                        {
-                                                            MachineData = db.UserMachineData.Add(new UserMachineData()
+                                                            db.StoreChangeHistory.Add(new StoreChangeHistory()
                                                             {
-                                                                IdBrand = IdBrand,
-                                                            }).Entity;
+                                                                CreateDate = DateTime.Now,
+                                                                CreateMan = Operator,
+                                                                UserId = touser.Id, //创客
+                                                                BrandId = BrandId, //产品类型
+                                                                ChangeRecordNo = ChangeNo, //变更记录单号
+                                                                BizBatchNo = BatchNo, //业务批次号
+                                                                TransType = 0, //交易类型
+                                                                SnNo = SnNo, //SN编号
+                                                                SnType = machine.PosSnType, //SN机具类型
+                                                                StockOpDirect = 0, //库存操作方向
+                                                                DeviceVendor = machine.DeviceName, //设备厂商
+                                                                DeviceModel = machine.DeviceKind, //设备型号
+                                                                DeviceType = machine.DeviceType, //设备类型
+                                                                ToUserId = touser.Id, //收货创客
+                                                                ToDate = DateTime.Now, //入库时间
+                                                                ToRemark = OutNote, //入库备注
+                                                                SourceStoreId = machine.SourceStoreId, //源仓库
+                                                            });
+                                                            machine.BuyUserId = touser.Id;
+                                                            machine.UserId = touser.Id;
+                                                            machine.TransferTime = DateTime.Now;
+                                                            machine.RecycEndDate = DateTime.Now.AddDays(180); // 循环结束时间
+                                                            db.SaveChanges();
+                                                            string IdBrand = touser.Id + "_" + BrandId;
+                                                            UserMachineData MachineData = db.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
+                                                            if (MachineData == null)
+                                                            {
+                                                                MachineData = db.UserMachineData.Add(new UserMachineData()
+                                                                {
+                                                                    IdBrand = IdBrand,
+                                                                }).Entity;
+                                                                db.SaveChanges();
+                                                            }
+                                                            MachineData.IdBrand = IdBrand;
+                                                            MachineData.TotalMachineCount += 1;
+                                                            MachineData.UnBindCount += 1;
                                                             db.SaveChanges();
-                                                        }
-                                                        MachineData.IdBrand = IdBrand;
-                                                        MachineData.TotalMachineCount += 1;
-                                                        MachineData.UnBindCount += 1;
-                                                        db.SaveChanges();
-                                                        RedisDbconn.Instance.Set("UserMachineData:" + IdBrand, MachineData);
-
-                                                        RemoveClass.DeletePosMachineList("PosMachineTwoList:" + storefor.StoreId, machine.Id);
-                                                        RedisDbconn.Instance.AddList("PosMachinesTwo:" + userfor.UserId + ":" + BrandId, new PosMachineList()
-                                                        {
-                                                            Id = machine.Id,
-                                                            SnNo = SnNo,
-                                                            IsBind = machine.BindingState == 1 ? true : false,
-                                                        });
 
-                                                        if (!storeData.ContainsKey(storefor.StoreId + "_" + BrandId))
-                                                        {
-                                                            storeData.Add(storefor.StoreId + "_" + BrandId, 1);
+                                                            RemoveClass.DeletePosMachineList("PosMachineTwoList:" + storefor.StoreId, machine.Id);
+                                                            
+                                                            if (!storeData.ContainsKey(storefor.StoreId + "_" + BrandId))
+                                                            {
+                                                                storeData.Add(storefor.StoreId + "_" + BrandId, 1);
+                                                            }
+                                                            else
+                                                            {
+                                                                storeData[storefor.StoreId + "_" + BrandId] += 1;
+                                                            }
+                                                            SuccessCount += 1;
+                                                            RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
                                                         }
                                                         else
                                                         {
-                                                            storeData[storefor.StoreId + "_" + BrandId] += 1;
+                                                            RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "与表格里填写的品牌不一致");
                                                         }
-                                                        SuccessCount += 1;
-                                                        RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
                                                     }
                                                     else
                                                     {
@@ -799,13 +786,10 @@ namespace MySystem
                                         store.LaveNum -= OpStoreNum;
                                         store.OutNum += OpStoreNum;
                                         db.SaveChanges();
-                                        RedisDbconn.Instance.Clear("StoreHouse:" + StoreId);
-                                        RedisDbconn.Instance.Clear("StoreHouseList:" + store.UserId);
                                     }
 
                                     db.SaveChanges();
                                     tran.Commit();
-                                    RedisDbconn.Instance.Clear("StoreHouse");
                                     RedisDbconn.Instance.Set("CheckImport:" + checkKey, "success|" + SuccessCount);
                                     RedisDbconn.Instance.SetExpire("CheckImport:" + checkKey, 60000);
                                 }
@@ -870,7 +854,7 @@ namespace MySystem
                                             if (store.Id > 0)
                                             {
                                                 StoreForCode tostorefor = db.StoreForCode.FirstOrDefault(m => m.Code == StoreNo) ?? new StoreForCode();
-                                                StoreHouse tostore = db.StoreHouse.FirstOrDefault(m => m.Id == tostorefor.StoreId) ?? new StoreHouse();
+                                                StoreHouse tostore = db.StoreHouse.FirstOrDefault(m => m.Id == tostorefor.StoreId && m.Status > -1) ?? new StoreHouse();
                                                 if (tostore.Id > 0)
                                                 {
                                                     MachineForSnNo machinefor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();

AppStart/Helper/ResetUserTradeService.cs

@@ -83,15 +83,6 @@ namespace MySystem
                                     }
                                     db.SaveChanges();
                                 }
-                                // RedisDbconn.Instance.Clear("TotalAmount:" + UserId);
-                                // RedisDbconn.Instance.Clear("TotalAmount:" + UserId + ":" + TradeMonth);
-                                // RedisDbconn.Instance.Clear("TotalCloudPayAmount:" + UserId + ":" + TradeMonth);
-                                // RedisDbconn.Instance.Clear("TotalPosAmount:" + UserId + ":" + TradeMonth);
-                                // RedisDbconn.Instance.Clear("TotalAmount:" + UserId + ":*:" + TradeMonth);
-                                // RedisDbconn.Instance.Clear("TotalAmount:" + UserId + ":" + TradeDate);
-                                // RedisDbconn.Instance.Clear("TotalCloudPayAmount:" + UserId + ":" + TradeDate);
-                                // RedisDbconn.Instance.Clear("TotalPosAmount:" + UserId + ":" + TradeDate);
-                                // RedisDbconn.Instance.Clear("TotalAmount:" + UserId + ":*:" + TradeDate);
                                 if (!string.IsNullOrEmpty(ParentNav))
                                 {
                                     ParentNav += "," + UserId + ",";
@@ -133,15 +124,6 @@ namespace MySystem
                                                 }
                                                 db.SaveChanges();
                                             }
-                                            // RedisDbconn.Instance.Clear("TeamTotalAmount:" + NavUserId);
-                                            // RedisDbconn.Instance.Clear("TeamTotalAmount:" + NavUserId + ":" + TradeMonth);
-                                            // RedisDbconn.Instance.Clear("TeamTotalCloudPayAmount:" + NavUserId + ":" + TradeMonth);
-                                            // RedisDbconn.Instance.Clear("TeamTotalPosAmount:" + NavUserId + ":" + TradeMonth);
-                                            // RedisDbconn.Instance.Clear("TeamTotalAmount:" + NavUserId + ":*:" + TradeMonth);
-                                            // RedisDbconn.Instance.Clear("TeamTotalAmount:" + NavUserId + ":" + TradeDate);
-                                            // RedisDbconn.Instance.Clear("TeamTotalCloudPayAmount:" + NavUserId + ":" + TradeDate);
-                                            // RedisDbconn.Instance.Clear("TeamTotalPosAmount:" + NavUserId + ":" + TradeDate);
-                                            // RedisDbconn.Instance.Clear("TeamTotalAmount:" + NavUserId + ":*:" + TradeDate);
                                         }
                                     }
                                 }

AppStart/Helper/SycnHelpProfitService.cs

@@ -121,7 +121,7 @@ namespace MySystem
                         AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
                         BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
                         AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                        Remark = user.RealName.Substring(0, 1) + "**:" + DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") + "交易" + TradeAmt.ToString("f2"),
+                        Remark = RewardType == 1 ? "直拓商户分润" : "推荐交易分润",
                     }).Entity;
                     db.SaveChanges();
                     tran.Commit();

AppStart/Helper/SycnSpTradeService.cs

@@ -13,11 +13,11 @@ namespace MySystem
         private SycnSpTradeService()
         { }
 
-        public void Start(string PosSn, DateTime start, DateTime end)
+        public void Start(string PosSn, DateTime start, DateTime end, int StartId = 0)
         {
             SpModels.WebCMSEntities spdb = new SpModels.WebCMSEntities();
             WebCMSEntities db = new WebCMSEntities();
-            IQueryable<SpModels.TradeRecord> trades = spdb.TradeRecord.Where(m => m.CreateDate >= start && m.CreateDate < end && m.TradeSnNo == PosSn);
+            IQueryable<SpModels.TradeRecord> trades = spdb.TradeRecord.Where(m => m.Id > StartId && m.CreateDate >= start && m.CreateDate < end && m.TradeSnNo == PosSn);
             foreach (SpModels.TradeRecord trade in trades.ToList())
             {
                 bool op = true;
@@ -79,8 +79,7 @@ namespace MySystem
                             {
                                 TopUserId = int.Parse(user.ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
                             }
-                            // TODO: 交易记录表，每月的Id单独存放，解决查询效率问题
-                            bool check = db.TradeRecord.Any(m => m.Id >= 700000 && m.RecordNo == trade.TradeSerialNo);
+                            bool check = db.SpOrderNos.Any(m => m.OrderNo == trade.TradeSerialNo);
                             if (!check)
                             {
                                 decimal TradeAmount = trade.TradeAmount;
@@ -248,7 +247,6 @@ namespace MySystem
                                         merchant.ActiveStatus = 1;
                                         merchant.MerStandardDate = DateTime.Now;
                                         db.SaveChanges();
-                                        RedisDbconn.Instance.Set("PosMerchantInfo:" + merchant.Id, merchant);
                                     }
                                     //发放大盟主奖励
                                     if(pos.LeaderUserId > 0)

AppStart/Redis/BothdisDbconn.cs

@@ -1,443 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Library;
-
-namespace MySystem
-{
-    public class BothdisDbconn
-    {
-        public readonly static BothdisDbconn Instance = new BothdisDbconn();
-
-        public void SendMq(string key, object obj)
-        {
-            SetRedisDataList data = new SetRedisDataList()
-            {
-                key = key,
-                val = Newtonsoft.Json.JsonConvert.SerializeObject(obj),
-            };
-            RabbitMQClient.Instance.SendMsg(Newtonsoft.Json.JsonConvert.SerializeObject(data), "SetRedisDataList");
-        }
-
-        #region 设置单个字段
-        public void Set(string key, object value)
-        {
-            try
-            {
-                if(RedisDbconn.Instance.Set(key, value))
-                {
-                    RedisDbconn.Instance.Clear(key);
-                }
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:Set");  // TODO:重新执行，最多重试3次
-            }
-        }
-        #endregion
-
-        #region 整数累加
-        public void AddInt(string key, long value = 1)
-        {
-            try
-            {
-                if (RedisDbconn.Instance.AddInt(key, value) > 0)
-                {
-                    RedisDbconn.Instance.Clear(key);
-                }
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddInt");  // TODO:重新执行，最多重试3次
-            }
-        }
-        #endregion
-
-        #region 数字累加
-        public void AddNumber(string key, decimal value = 1)
-        {
-            try
-            {
-                if (RedisDbconn.Instance.AddNumber(key, value) > 0)
-                {
-                    RedisDbconn.Instance.Clear(key);
-                }
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddNumber");  // TODO:重新执行，最多重试3次
-            }
-        }
-        #endregion
-
-        #region 获取单个字段
-        public T Get<T>(string key)
-        {
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                T obj = RedisDbconn.Instance.Get<T>(key);
-                if (obj != null)
-                {
-                    return obj;
-                }
-            }
-            T newobj = RedisDbconn.Instance.Get<T>(key);
-            if (newobj != null)
-            {
-                RedisDbconn.Instance.Set(key, newobj);
-            }
-            return newobj;
-        }
-        #endregion
-
-        #region 设置散列字段
-        public void HSet(string key, string field, object value)
-        {
-            try
-            {
-                RedisDbconn.Instance.HSet(key, field, value);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:HSet");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.HSet(key, field, value);
-        }
-        #endregion
-
-        #region 散列整数累加
-        public void HAddInt(string key, string field, long value = 1)
-        {
-            try
-            {
-                RedisDbconn.Instance.HAddInt(key, field, value);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:HAddInt");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.HAddInt(key, field, value);
-        }
-        #endregion
-
-        #region 散列数字累加
-        public void HAddNumber(string key, string field, decimal value = 1)
-        {
-            try
-            {
-                RedisDbconn.Instance.HAddNumber(key, field, value);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:HAddNumber");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.HAddNumber(key, field, value);
-        }
-        #endregion
-
-        #region 获取散列元素
-        public T HGet<T>(string key, string field)
-        {
-            if (RedisDbconn.Instance.HExists(key, field))
-            {
-                T obj = RedisDbconn.Instance.HGet<T>(key, field);
-                if (obj != null)
-                {
-                    return obj;
-                }
-            }
-            T newobj = RedisDbconn.Instance.HGet<T>(key, field);
-            // if (newobj != null)
-            // {
-            //     RedisDbconn.Instance.HSet(key, field, newobj);
-            // }
-            return newobj;
-        }
-        #endregion
-
-        #region 获取散列所有元素
-        public Dictionary<string, T> HGetAll<T>(string key)
-        {
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                Dictionary<string, T> obj = RedisDbconn.Instance.HGetAll<T>(key);
-                if (obj != null)
-                {
-                    return obj;
-                }
-            }
-            Dictionary<string, T> newobj = RedisDbconn.Instance.HGetAll<T>(key);
-            // if (newobj != null)
-            // {
-            //     foreach (string sub in newobj.Keys)
-            //     {
-            //         RedisDbconn.Instance.HSet(key, sub, newobj[sub]);
-            //     }
-            // }
-            return newobj;
-        }
-        #endregion
-
-        #region 添加集合对象
-        public void SAdd(string key, object value)
-        {
-            try
-            {
-                RedisDbconn.Instance.SAdd(key, value);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:SAdd");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.SAdd(key, value);
-        }
-        public void SAdd(string key, object[] value)
-        {
-            try
-            {
-                RedisDbconn.Instance.SAdd(key, value);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:SAdd");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.SAdd(key, value);
-        }
-        #endregion
-
-        #region 获取集合对象
-        public T[] SGetList<T>(string key)
-        {
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                T[] obj = RedisDbconn.Instance.SGetList<T>(key);
-                if (obj != null)
-                {
-                    if (obj.Length > 0)
-                    {
-                        return obj;
-                    }
-                }
-            }
-            T[] newobj = RedisDbconn.Instance.SGetList<T>(key);
-            // if (newobj != null)
-            // {
-            //     foreach (T sub in newobj)
-            //     {
-            //         RedisDbconn.Instance.SAdd(key, sub);
-            //     }
-            // }
-            return newobj;
-        }
-        #endregion
-
-        #region 添加列表对象
-        public void AddList(string key, object value)
-        {
-            try
-            {
-                if (RedisDbconn.Instance.AddList(key, value) > 0)
-                {
-                    RedisDbconn.Instance.Clear(key);
-                }
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddList");  // TODO:重新执行，最多重试3次
-            }
-        }
-        public void AddList(string key, object[] value)
-        {
-            try
-            {
-                RedisDbconn.Instance.AddList(key, value);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddList");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.AddList(key, value);
-            int Expired = 60 * 60 * 24 * 180;
-            RedisDbconn.Instance.SetExpire(key, Expired);
-        }
-        #endregion
-
-        #region 获取列表
-        public List<T> GetList<T>(string key, int pageNum = 1, int pageSize = 10)
-        {
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                List<T> list = RedisDbconn.Instance.GetList<T>(key, pageNum, pageSize);
-                if (list.Count > 0)
-                {
-                    return list;
-                }
-            }
-            List<T> tlist = RedisDbconn.Instance.GetList<T>(key, pageNum, pageSize);
-            if (tlist.Count > 0)
-            {
-                RedisDbconn.Instance.Clear(key);
-                object[] tmplist = new object[tlist.Count];
-                for (int i = 0; i < tlist.Count; i++)
-                {
-                    tmplist[i] = tlist[i];
-                }
-                RedisDbconn.Instance.AddList(key, tmplist);
-            }
-            return tlist;
-        }
-        #endregion
-
-        #region 添加排序列表对象
-        public void AddSort(string key, object value, decimal score)
-        {
-            try
-            {
-                RedisDbconn.Instance.AddSort(key, value, score);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    value = value,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddSort");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.AddSort(key, value, score);
-            int Expired = 60 * 60 * 24 * 180;
-            RedisDbconn.Instance.SetExpire(key, Expired);
-        }
-        #endregion
-
-        #region 获取排序列表
-        public List<T> GetSort<T>(string key, int pageNum = 1, int pageSize = 10)
-        {
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                List<T> list = RedisDbconn.Instance.GetSort<T>(key, pageNum, pageSize);
-                if (list.Count > 0)
-                {
-                    return list;
-                }
-            }
-            return RedisDbconn.Instance.GetSort<T>(key, pageNum, pageSize);
-        }
-        public List<T> GetSortDesc<T>(string key, int pageNum = 1, int pageSize = 10)
-        {
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                List<T> list = RedisDbconn.Instance.GetSortDesc<T>(key, pageNum, pageSize);
-                if (list.Count > 0)
-                {
-                    return list;
-                }
-            }
-            return RedisDbconn.Instance.GetSortDesc<T>(key, pageNum, pageSize);
-        }
-        #endregion
-
-        public void Remove(string key, long start, long end)
-        {
-            try
-            {
-                RedisDbconn.Instance.AddSort(key, start, end);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = key,
-                    start = start,
-                    end = end,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:Remove");  // TODO:重新执行，最多重试3次
-            }
-            RedisDbconn.Instance.Remove(key, start, end);
-        }
-
-        public void RemoveTop(string key, long count)
-        {
-            Remove(key, count, RedisDbconn.Instance.Count(key) - 1); ;
-        }
-
-        public void Clear(string pattern)
-        {
-            try
-            {
-                RedisDbconn.Instance.Clear(pattern);
-                RedisDbconn.Instance.Clear(pattern);
-            }
-            catch (Exception ex)
-            {
-                TendisErr err = new TendisErr()
-                {
-                    key = pattern,
-                    errMsg = ex.ToString(),
-                };
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:Clear");  // TODO:重新执行，最多重试3次
-            }
-        }
-    }
-}

AppStart/Redis/TendisDbconn.cs

@@ -1,217 +0,0 @@
-using System.Collections.Generic;
-using Library;
-using System.Linq;
-
-namespace MySystem
-{
-    public class TendisDbconn
-    {
-        public readonly static TendisDbconn Instance = new TendisDbconn();
-        public static CSRedis.CSRedisClient csredis;
-        private TendisDbconn()
-        {
-        }
-
-        #region 设置单个字段
-        public bool Set(string key, object value)
-        {
-            return csredis.Set(key, value);
-            // return false;
-        }
-        #endregion
-
-        #region 整数累加
-        public long AddInt(string key, long value = 1)
-        {
-            return csredis.IncrBy(key, value);
-            // return 0;
-        }
-        #endregion
-
-        #region 数字累加
-        public decimal AddNumber(string key, decimal value = 1)
-        {
-            return csredis.IncrByFloat(key, value);
-            // return 0;
-        }
-        #endregion
-
-        #region 获取单个字段
-        public T Get<T>(string key)
-        {
-            return csredis.Get<T>(key);
-        }
-        #endregion
-
-        #region 设置散列字段
-        public bool HSet(string key, string field, object value)
-        {
-            return csredis.HSet(key, field, value);
-            // return false;
-        }
-        #endregion
-
-        #region 散列整数累加
-        public long HAddInt(string key, string field, long value = 1)
-        {
-            return csredis.HIncrBy(key, field, value);
-            // return 0;
-        }
-        #endregion
-
-        #region 散列数字累加
-        public decimal HAddNumber(string key, string field, decimal value = 1)
-        {
-            return csredis.HIncrByFloat(key, field, value);
-            // return 0;
-        }
-        #endregion
-
-        #region 获取散列元素
-        public T HGet<T>(string key, string field)
-        {
-            return csredis.HGet<T>(key, field);
-        }
-        #endregion
-
-        #region 获取散列所有元素
-        public Dictionary<string, T> HGetAll<T>(string key)
-        {
-            return csredis.HGetAll<T>(key);
-        }
-        #endregion
-
-        #region 添加列表对象
-        public long AddList(string key, object value)
-        {
-            return csredis.LPush(key, value);
-            // return 0;
-        }
-        public long AddList(string key, object[] value)
-        {
-            return csredis.LPush(key, value);
-            // return 0;
-        }
-        public T RPop<T>(string key)
-        {
-            return csredis.RPop<T>(key);
-        }
-        #endregion
-
-        #region 添加集合对象
-        public long SAdd(string key, object value)
-        {
-            return csredis.SAdd(key, value);
-            // return 0;
-        }
-        public long SAdd(string key, object[] value)
-        {
-            return csredis.SAdd(key, value);
-            // return 0;
-        }
-        #endregion
-
-        #region 获取集合对象
-        public T[] SGetList<T>(string key)
-        {
-            return csredis.SMembers<T>(key);
-        }
-        #endregion
-
-        #region 修改列表对象
-        public bool SetList(string key, int index, object value)
-        {
-            long itemindex = csredis.LLen(key) - index - 1;
-            return csredis.LSet(key, itemindex, value);
-            // return false;
-        }
-        #endregion
-
-        #region 获取列表
-        public List<T> GetList<T>(string key, int pageNum = 1, int pageSize = 10)
-        {
-            int start = (pageNum - 1) * pageSize;
-            int end = start + pageSize - 1;
-            T[] list = csredis.LRange<T>(key, start, end);
-            return list.ToList();
-        }
-        #endregion
-
-        #region 删除列表元素
-        public void DelList<T>(string key, T item)
-        {
-            List<T> oldlist = GetList<T>(key, 1, 10000000);
-            oldlist.Remove(item);
-            Clear(key);
-            AddList(key, oldlist.ToArray());
-        }
-        #endregion
-
-        #region 添加排序列表对象
-        public long AddSort(string key, object value, decimal score)
-        {
-            return csredis.ZAdd(key, (score, value));
-            // return 0;
-        }
-        #endregion
-
-        #region 获取排序列表
-        public List<T> GetSort<T>(string key, int pageNum = 1, int pageSize = 10)
-        {
-            int start = (pageNum - 1) * pageSize;
-            int end = start + pageSize;
-            string[] list = csredis.ZRangeByScore(key, start, end);
-            List<T> lists = new List<T>();
-            foreach (string record in list)
-            { 
-                lists.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<T>(record));
-            }
-            return lists;
-        }
-        public List<T> GetSortDesc<T>(string key, int pageNum = 1, int pageSize = 10)
-        {
-            int start = (pageNum - 1) * pageSize;
-            int end = start + pageSize;
-            string[] list = csredis.ZRevRangeByScore(key, start, end);
-            List<T> lists = new List<T>();
-            foreach (string record in list)
-            { 
-                lists.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<T>(record));
-            }
-            return lists;
-        }
-        #endregion
-
-        public bool Remove(string key, long start, long end)
-        {
-            return csredis.LTrim(key, start, end);
-        }
-
-        public bool RemoveTop(string key, long count)
-        {
-            return RedisDbconn.Instance.Remove(key, count, RedisDbconn.Instance.Count(key) - 1);;
-        }
-
-        public long Count(string key)
-        {
-            return csredis.LLen(key);
-        }
-
-        public void Clear(string pattern)
-        {
-            string[] keys = csredis.Keys(pattern);
-            csredis.Del(keys);
-        }
-
-        public string[] GetKeys(string pattern)
-        { 
-            string[] keys = csredis.Keys(pattern);
-            return keys;
-        }
-
-        public void SetExpire(string key, int expire)
-        { 
-            csredis.Expire(key, expire); //秒为单位
-        }
-    }
-}

AppStart/RelationClassForConst.cs

@@ -162,6 +162,12 @@ namespace MySystem
                 case 7:
                     result = "系统扣减";
                     break;
+                case 114:
+                    result = "私董会分红";
+                    break;
+                case 115:
+                    result = "分仓奖励";
+                    break;
             }
             return result;
         }

Areas/Admin/Controllers/MainServer/HelpProfitExchangeController.cs

@@ -57,7 +57,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -304,7 +304,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -334,7 +334,7 @@ namespace MySystem.Areas.Admin.Controllers
             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>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("ExchangeCount", "兑换数量");
 

Areas/Admin/Controllers/MainServer/HelpProfitExchangeDetailController.cs

@@ -57,7 +57,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -316,7 +316,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -353,7 +353,7 @@ namespace MySystem.Areas.Admin.Controllers
             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>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("PosCouponId", "券码");
             ReturnFields.Add("ExchangeCode", "兑换券码");

Areas/Admin/Controllers/MainServer/HelpProfitMerchantForUserController.cs

@@ -60,15 +60,15 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //商户
             if (!string.IsNullOrEmpty(MerchantIdSelect))
@@ -301,15 +301,15 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //商户
             if (!string.IsNullOrEmpty(MerchantIdSelect))
@@ -336,7 +336,7 @@ namespace MySystem.Areas.Admin.Controllers
             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>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("MerchantId", "商户");
             ReturnFields.Add("MerNo", "商户编号");

Areas/Admin/Controllers/MainServer/HelpProfitRewardController.cs

@@ -91,9 +91,10 @@ namespace MySystem.Areas.Admin.Controllers
                 if (RewardType == 112) dic["RewardType"] = "推荐奖励";
                 if (RewardType == 0) dic["RewardType"] = "";
                 //验证和同步账户状态
-                int CheckStatus = int.Parse(dic["CheckStatus"].ToString());
-                if (CheckStatus == 0) dic["CheckStatus"] = "初始";
-                if (CheckStatus == 1) dic["CheckStatus"] = "已验证和同步";
+                int Status = int.Parse(dic["Status"].ToString());
+                if (Status == 0) dic["Status"] = "初始";
+                if (Status == 1) dic["Status"] = "已展示";
+                if (Status == 2) dic["Status"] = "已到账";
 
             }
             return Json(obj);
@@ -351,7 +352,7 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("TradeDate", "达标日期");
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("BrandId", "品牌");
             ReturnFields.Add("RewardType", "奖励类型");

Areas/Admin/Controllers/MainServer/MachineApplyController.cs

@@ -432,7 +432,6 @@ namespace MySystem.Areas.Admin.Controllers
                                 {
                                     function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(apply) + "#cut#" + Newtonsoft.Json.JsonConvert.SerializeObject(order) + "#cut#" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), "机具申请订单取消日志");
                                     pos.IsPurchase = 0;
-                                    RedisDbconn.Instance.Clear("PosMachinesTwo:" + pos.Id);
                                 }
                             }
                             db.MachineApply.Remove(apply);

Areas/Admin/Controllers/MainServer/MachineChangeController.cs

@@ -66,7 +66,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -81,12 +81,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and AuditResult=" + AuditResultSelect;
             }
-            //退回仓库仓库名称
+            //退回仓库名称
             if (!string.IsNullOrEmpty(BackStoreIdStoreName))
             {
                 condition += " and BackStoreId in (select BackStoreId from StoreHouseForStoreName where StoreName='" + BackStoreIdStoreName + "')";
             }
-            //退回仓库仓库编号
+            //退回仓库编号
             if (!string.IsNullOrEmpty(BackStoreIdStoreNo))
             {
                 condition += " and BackStoreId in (select BackStoreId from StoreHouseForStoreNo where StoreNo='" + BackStoreIdStoreNo + "')";
@@ -106,12 +106,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and OutProductType=" + OutProductTypeSelect;
             }
-            //出库仓库仓库名称
+            //出库仓库名称
             if (!string.IsNullOrEmpty(OutStoreIdStoreName))
             {
                 condition += " and OutStoreId in (select OutStoreId from StoreHouseForStoreName where StoreName='" + OutStoreIdStoreName + "')";
             }
-            //出库仓库仓库编号
+            //出库仓库编号
             if (!string.IsNullOrEmpty(OutStoreIdStoreNo))
             {
                 condition += " and OutStoreId in (select OutStoreId from StoreHouseForStoreNo where StoreNo='" + OutStoreIdStoreNo + "')";
@@ -387,7 +387,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -402,12 +402,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and AuditResult=" + AuditResultSelect;
             }
-            //退回仓库仓库名称
+            //退回仓库名称
             if (!string.IsNullOrEmpty(BackStoreIdStoreName))
             {
                 condition += " and BackStoreId in (select BackStoreId from StoreHouseForStoreName where StoreName='" + BackStoreIdStoreName + "')";
             }
-            //退回仓库仓库编号
+            //退回仓库编号
             if (!string.IsNullOrEmpty(BackStoreIdStoreNo))
             {
                 condition += " and BackStoreId in (select BackStoreId from StoreHouseForStoreNo where StoreNo='" + BackStoreIdStoreNo + "')";
@@ -427,12 +427,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and OutProductType=" + OutProductTypeSelect;
             }
-            //出库仓库仓库名称
+            //出库仓库名称
             if (!string.IsNullOrEmpty(OutStoreIdStoreName))
             {
                 condition += " and OutStoreId in (select OutStoreId from StoreHouseForStoreName where StoreName='" + OutStoreIdStoreName + "')";
             }
-            //出库仓库仓库编号
+            //出库仓库编号
             if (!string.IsNullOrEmpty(OutStoreIdStoreNo))
             {
                 condition += " and OutStoreId in (select OutStoreId from StoreHouseForStoreNo where StoreNo='" + OutStoreIdStoreNo + "')";
@@ -486,7 +486,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("ChangeNo", "转换单号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("BackProductType", "退回产品类型");
             ReturnFields.Add("ChangeDeviceNum", "转换机具数量");
             ReturnFields.Add("ChangeTime", "转换时间");
@@ -494,14 +494,14 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("AuditResult", "审核结果");
             ReturnFields.Add("AuditRemark", "审核备注");
             ReturnFields.Add("ChangeSnExpand", "转换机器SN来源");
-            ReturnFields.Add("BackStoreIdStoreName", "退回仓库仓库名称");
-            ReturnFields.Add("BackStoreIdStoreNo", "退回仓库仓库编号");
+            ReturnFields.Add("BackStoreIdStoreName", "退回仓库名称");
+            ReturnFields.Add("BackStoreIdStoreNo", "退回仓库编号");
             ReturnFields.Add("Remark", "订单备注");
             ReturnFields.Add("BackStoreUserIdMakerCode", "退回仓库归属人创客编号");
             ReturnFields.Add("BackStoreUserIdRealName", "退回仓库归属人真实姓名");
             ReturnFields.Add("OutProductType", "出库产品类型");
-            ReturnFields.Add("OutStoreIdStoreName", "出库仓库仓库名称");
-            ReturnFields.Add("OutStoreIdStoreNo", "出库仓库仓库编号");
+            ReturnFields.Add("OutStoreIdStoreName", "出库仓库名称");
+            ReturnFields.Add("OutStoreIdStoreNo", "出库仓库编号");
             ReturnFields.Add("OutStoreManagerMobile", "出库仓库联系人手机号");
 
             result.Add("Fields", ReturnFields);

Areas/Admin/Controllers/MainServer/MachineUnBindController.cs

@@ -386,7 +386,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("ApplyNo", "解绑申请单号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdMobile", "创客手机号");
             ReturnFields.Add("BrandId", "机具产品类型");
             ReturnFields.Add("SnNo", "机具SN");

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -81,7 +81,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -342,7 +342,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -382,7 +382,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("ReturnAmount", "返还金额");
             ReturnFields.Add("OperateMan", "操作人");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "MerchantDepositReturns", "ExportExcel");

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -123,7 +123,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
 
-            //仓库归属创客创客编号
+            //仓库归属创客编号
             if (!string.IsNullOrEmpty(StoreUserIdMakerCode))
             {
                 condition += " and StoreUserId in (select StoreUserId from UserForMakerCode where MakerCode='" + StoreUserIdMakerCode + "')";
@@ -295,7 +295,7 @@ namespace MySystem.Areas.Admin.Controllers
         public JsonResult IndexDatas(string UserIdMakerCode, string UserIdRealName, string PayModeSelect, string StoreIdStoreNo, string StoreIdStoreName, string RefundStatusSelect, string DeliveryTypeSelect, string SendStatusSelect, string ProductIdSelect, string StoreTypeSelect, string StoreUserIdMakerCode, string StoreUserIdRealName, string PayStatusSelect, int page = 1, int limit = 30)
         {
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -310,12 +310,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PayMode=" + PayModeSelect;
             }
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreIdStoreNo + "')";
             }
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdStoreName + "')";
@@ -345,7 +345,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and StoreType=" + StoreTypeSelect;
             }
-            //仓库归属创客创客编号
+            //仓库归属创客编号
             if (!string.IsNullOrEmpty(StoreUserIdMakerCode))
             {
                 condition += " and StoreUserId in (select StoreUserId from UserForMakerCode where MakerCode='" + StoreUserIdMakerCode + "')";
@@ -777,7 +777,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("TopUserId", "0");
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -792,12 +792,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PayMode=" + PayModeSelect;
             }
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from StoreHouseForStoreNo where StoreNo='" + StoreIdStoreNo + "')";
             }
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from StoreHouseForStoreName where StoreName='" + StoreIdStoreName + "')";
@@ -827,7 +827,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and StoreType=" + StoreTypeSelect;
             }
-            //仓库归属创客创客编号
+            //仓库归属创客编号
             if (!string.IsNullOrEmpty(StoreUserIdMakerCode))
             {
                 condition += " and StoreUserId in (select StoreUserId from UsersForMakerCode where MakerCode='" + StoreUserIdMakerCode + "')";
@@ -849,7 +849,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Orders", Fields, "Id desc", "0", 1, 20000, condition, "UserId,OrderNo,RealName,Mobile,TotalPrice,Areas,Address,ErpName,ErpCode,SendDate,PayMode,TradeNo,StoreId,RefundStatus,DeliveryType,SendStatus,ProductId,StoreContact,StoreType,StoreUserId,TopUserId,PayStatus,BuyCount,Remark,Id", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("OrderNo", "订单号");
             ReturnFields.Add("RealName", "姓名");

Areas/Admin/Controllers/MainServer/PosCouponOrdersController.cs

@@ -60,7 +60,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //来源创客创客编号
+            //来源创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
                 condition += " and FromUserId in (select UserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
@@ -70,7 +70,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and FromUserId in (select UserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
             }
-            //目标创客创客编号
+            //目标创客编号
             if (!string.IsNullOrEmpty(ToUserIdMakerCode))
             {
                 condition += " and ToUserId in (select UserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
@@ -325,7 +325,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //来源创客创客编号
+            //来源创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
                 condition += " and FromUserId in (select FromUserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
@@ -335,7 +335,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and FromUserId in (select FromUserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
             }
-            //目标创客创客编号
+            //目标创客编号
             if (!string.IsNullOrEmpty(ToUserIdMakerCode))
             {
                 condition += " and ToUserId in (select ToUserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
@@ -376,9 +376,9 @@ namespace MySystem.Areas.Admin.Controllers
             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>();
-            ReturnFields.Add("FromUserIdMakerCode", "来源创客创客编号");
+            ReturnFields.Add("FromUserIdMakerCode", "来源创客编号");
             ReturnFields.Add("FromUserIdRealName", "来源创客真实姓名");
-            ReturnFields.Add("ToUserIdMakerCode", "目标创客创客编号");
+            ReturnFields.Add("ToUserIdMakerCode", "目标创客编号");
             ReturnFields.Add("ToUserIdRealName", "目标创客真实姓名");
             ReturnFields.Add("OrderNo", "单号");
             ReturnFields.Add("BeforeStock", "变更前机具券库存");

Areas/Admin/Controllers/MainServer/PosCouponRecordController.cs

@@ -66,7 +66,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PosCouponId=" + PosCouponIdSelect;
             }
-            //来源创客创客编号
+            //来源创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
                 condition += " and FromUserId in (select FromUserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
@@ -76,7 +76,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and FromUserId in (select FromUserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
             }
-            //目标创客创客编号
+            //目标创客编号
             if (!string.IsNullOrEmpty(ToUserIdMakerCode))
             {
                 condition += " and ToUserId in (select ToUserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
@@ -335,7 +335,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PosCouponId=" + PosCouponIdSelect;
             }
-            //来源创客创客编号
+            //来源创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
                 condition += " and FromUserId in (select FromUserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
@@ -345,7 +345,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and FromUserId in (select FromUserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
             }
-            //目标创客创客编号
+            //目标创客编号
             if (!string.IsNullOrEmpty(ToUserIdMakerCode))
             {
                 condition += " and ToUserId in (select ToUserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
@@ -389,9 +389,9 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("PosCouponId", "机具券Id");
-            ReturnFields.Add("FromUserIdMakerCode", "来源创客创客编号");
+            ReturnFields.Add("FromUserIdMakerCode", "来源创客编号");
             ReturnFields.Add("FromUserIdRealName", "来源创客真实姓名");
-            ReturnFields.Add("ToUserIdMakerCode", "目标创客创客编号");
+            ReturnFields.Add("ToUserIdMakerCode", "目标创客编号");
             ReturnFields.Add("ToUserIdRealName", "目标创客真实姓名");
             ReturnFields.Add("OrderNo", "单号");
             ReturnFields.Add("ChangeKind", "变更类型");

Areas/Admin/Controllers/MainServer/PosCouponsController.cs

@@ -451,7 +451,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //来源创客创客编号
+            //来源创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
                 condition += " and FromUserId in (select FromUserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
@@ -461,7 +461,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and FromUserId in (select FromUserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
             }
-            //目标创客创客编号
+            //目标创客编号
             if (!string.IsNullOrEmpty(ToUserIdMakerCode))
             {
                 condition += " and ToUserId in (select ToUserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
@@ -502,9 +502,9 @@ namespace MySystem.Areas.Admin.Controllers
             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>();
-            ReturnFields.Add("FromUserIdMakerCode", "来源创客创客编号");
+            ReturnFields.Add("FromUserIdMakerCode", "来源创客编号");
             ReturnFields.Add("FromUserIdRealName", "来源创客真实姓名");
-            ReturnFields.Add("ToUserIdMakerCode", "目标创客创客编号");
+            ReturnFields.Add("ToUserIdMakerCode", "目标创客编号");
             ReturnFields.Add("ToUserIdRealName", "目标创客真实姓名");
             ReturnFields.Add("OrderNo", "单号");
             ReturnFields.Add("BeforeStock", "变更前机具券库存");

Areas/Admin/Controllers/MainServer/PosMachinesController.cs

@@ -70,7 +70,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ActivationState=" + ActivationStateSelect;
             }
-            //所属创客创客编号
+            //所属创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -351,7 +351,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ActivationState=" + ActivationStateSelect;
             }
-            //所属创客创客编号
+            //所属创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/PosMachinesFeeChangeRecordController.cs

@@ -63,7 +63,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status >=-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -465,7 +465,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1 and Sort = " + data.Sort + "";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -520,7 +520,7 @@ namespace MySystem.Areas.Admin.Controllers
             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>();
-            // ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            // ReturnFields.Add("UserIdMakerCode", "创客编号");
             // ReturnFields.Add("UserIdRealName", "创客真实姓名");
             // ReturnFields.Add("ChangeFee", "调整费率");
             ReturnFields.Add("PosSn", "机具SN");

Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -228,10 +228,6 @@ namespace MySystem.Areas.Admin.Controllers
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
             int TotalCount = 0;//总机具数
-            string KysCount99 = "0.00";
-            string KssCount99 = "0.00";
-            string KssCoun198 = "0.00";
-            string KssCount298 = "0.00";
             DataTable dt = OtherMySqlConn.dtable("select count(0) from PosMachinesTwo where 1=1" + condition);
             if (dt.Rows.Count > 0)
             {
@@ -327,7 +323,6 @@ namespace MySystem.Areas.Admin.Controllers
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("PosMachinesTwo", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "PosMachinesTwo", "update");
             db.SaveChanges();
-            RedisDbconn.Instance.Clear("PosMachinesTwo:" + data.Id);
             return "success";
         }
 
@@ -369,7 +364,6 @@ namespace MySystem.Areas.Admin.Controllers
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("PosMachinesTwo", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "PosMachinesTwo", "home");
             db.SaveChanges();
-            RedisDbconn.Instance.Clear("PosMachinesTwo:" + data.Id);
             return "success";
         }
 
@@ -503,48 +497,48 @@ namespace MySystem.Areas.Admin.Controllers
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("PosMachinesTwo", Fields, id);
 
             }
-            string[] lists = userIds.TrimEnd(',').Split(new char[] { ',' });
-            int times = lists.ToList().Count;
-            if (upposIds.Count > 0)
-            {
-                //调升
-                for (int i = 0; i < times; i++)
-                {
-                    var UserId = lists[i];
-                    var posInfo = db.PosMachinesTwo.Where(m => upposIds.Contains(m.Id) && m.BuyUserId == Convert.ToInt32(UserId)).ToList();
-                    string snhtml = "<div style='margin-bottom: .48rem;'>";
-                    foreach (var items in posInfo)
-                    {
-                        var mer = db.PosMerchantInfo.FirstOrDefault(m => m.Id == items.BindMerchantId);
-                        string Name = mer.MerchantName;
-                        if (mer.BrandId == 2)
-                        {
-                            if (Name.Contains("-"))
-                            {
-                                Name = Name.Split('-')[1];
-                            }
-                            else if (Name.Contains("_"))
-                            {
-                                Name = Name.Split('_')[1];
-                            }
-                        }
-                        var brand = db.KqProducts.FirstOrDefault(m => m.Id == items.BrandId);
-                        snhtml += "<div style='margin-bottom: .48rem;'><div class='f16'>商户姓名：" + Name + "</div>";
-                        snhtml += "<div class='f16'>机具品牌：" + brand.Name + "</div>";
-                        snhtml += "<div class='f16'>SN：" + items.PosSn + "</div></div>";
-                    }
-                    snhtml += "</div>";
-                    RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
-                    {
-                        UserId = Convert.ToInt32(UserId), //创客
-                        Title = "商户费率变更通知", //标题
-                        Content = "<div class='f16' style='margin-bottom: .72rem'>您的部分机具已绑定超过180天，刷卡费率已自动变更为0.63%，如需调整费率，请前往我的商户-商户详情中调整费率</div>" + snhtml, //内容
-                        Summary = "您的部分机具已绑定超过180天，刷卡费率已自动变更为0.63%，如需调整费率，请前往我的商户-商户详情中调整费率",
-                        CreateDate = DateTime.Now,
-
-                    }));
-                }
-            }
+            // string[] lists = userIds.TrimEnd(',').Split(new char[] { ',' });
+            // int times = lists.ToList().Count;
+            // if (upposIds.Count > 0)
+            // {
+            //     //调升
+            //     for (int i = 0; i < times; i++)
+            //     {
+            //         var UserId = lists[i];
+            //         var posInfo = db.PosMachinesTwo.Where(m => upposIds.Contains(m.Id) && m.BuyUserId == Convert.ToInt32(UserId)).ToList();
+            //         string snhtml = "<div style='margin-bottom: .48rem;'>";
+            //         foreach (var items in posInfo)
+            //         {
+            //             var mer = db.PosMerchantInfo.FirstOrDefault(m => m.Id == items.BindMerchantId);
+            //             string Name = mer.MerchantName;
+            //             if (mer.BrandId == 2)
+            //             {
+            //                 if (Name.Contains("-"))
+            //                 {
+            //                     Name = Name.Split('-')[1];
+            //                 }
+            //                 else if (Name.Contains("_"))
+            //                 {
+            //                     Name = Name.Split('_')[1];
+            //                 }
+            //             }
+            //             var brand = db.KqProducts.FirstOrDefault(m => m.Id == items.BrandId);
+            //             snhtml += "<div style='margin-bottom: .48rem;'><div class='f16'>商户姓名：" + Name + "</div>";
+            //             snhtml += "<div class='f16'>机具品牌：" + brand.Name + "</div>";
+            //             snhtml += "<div class='f16'>SN：" + items.PosSn + "</div></div>";
+            //         }
+            //         snhtml += "</div>";
+            //         RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+            //         {
+            //             UserId = Convert.ToInt32(UserId), //创客
+            //             Title = "商户费率变更通知", //标题
+            //             Content = "<div class='f16' style='margin-bottom: .72rem'>您的部分机具已绑定超过180天，刷卡费率已自动变更为0.63%，如需调整费率，请前往我的商户-商户详情中调整费率</div>" + snhtml, //内容
+            //             Summary = "您的部分机具已绑定超过180天，刷卡费率已自动变更为0.63%，如需调整费率，请前往我的商户-商户详情中调整费率",
+            //             CreateDate = DateTime.Now,
+
+            //         }));
+            //     }
+            // }
             db.SaveChanges();
             return "success";
         }
@@ -827,7 +821,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ActivationState=" + ActivationStateSelect;
             }
-            //所属创客创客编号
+            //所属创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -181,10 +181,6 @@ namespace MySystem.Areas.Admin.Controllers
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
             int TotalCount = 0;//总机具数
-            string KysCount99 = "0.00";
-            string KssCount99 = "0.00";
-            string KssCoun198 = "0.00";
-            string KssCount298 = "0.00";
             DataTable dt = OtherMySqlConn.dtable("select count(0) from PosMachinesTwo where 1=1" + condition);
             if (dt.Rows.Count > 0)
             {
@@ -280,7 +276,6 @@ namespace MySystem.Areas.Admin.Controllers
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("PosMachinesTwo", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "PosMachinesTwo", "update");
             db.SaveChanges();
-            RedisDbconn.Instance.Clear("PosMachinesTwo:" + data.Id);
             return "success";
         }
 
@@ -322,7 +317,6 @@ namespace MySystem.Areas.Admin.Controllers
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("PosMachinesTwo", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "PosMachinesTwo", "home");
             db.SaveChanges();
-            RedisDbconn.Instance.Clear("PosMachinesTwo:" + data.Id);
             return "success";
         }
 
@@ -493,6 +487,7 @@ namespace MySystem.Areas.Admin.Controllers
                         StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
                         {
                             CreateDate = DateTime.Now,
+                            CreateMan = SysUserName,
                             StoreId = storehouse.Id, //出货 仓库
                             BrandId = Convert.ToInt32(BrandId), //产品类型
                             ProductName = RelationClass.GetKqProductBrandInfo(Convert.ToInt32(BrandId)), //产品名称
@@ -564,7 +559,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ActivationState=" + ActivationStateSelect;
             }
-            //所属创客创客编号
+            //所属创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/PreSendStockDetailController.cs

@@ -64,12 +64,12 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from SmallStoreHouseForStoreName where StoreName='" + StoreIdStoreName + "')";
             }
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from SmallStoreHouseForStoreNo where StoreNo='" + StoreIdStoreNo + "')";
@@ -89,12 +89,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ToUserId in (select ToUserId from UsersForRealName where RealName='" + ToUserIdRealName + "')";
             }
-            //收货仓库仓库编号
+            //收货仓库编号
             if (!string.IsNullOrEmpty(ToStoreIdStoreNo))
             {
                 condition += " and ToStoreId in (select ToStoreId from StoreHouseForStoreNo where StoreNo='" + ToStoreIdStoreNo + "')";
             }
-            //收货仓库仓库名称
+            //收货仓库名称
             if (!string.IsNullOrEmpty(ToStoreIdStoreName))
             {
                 condition += " and ToStoreId in (select ToStoreId from StoreHouseForStoreName where StoreName='" + ToStoreIdStoreName + "')";
@@ -109,7 +109,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and SourceStoreId in (select SourceStoreId from StoreHouseForStoreName where StoreName='" + SourceStoreIdStoreName + "')";
             }
-            //出货创客创客编号
+            //出货创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
                 condition += " and FromUserId in (select FromUserId from UsersForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
@@ -119,12 +119,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and FromUserId in (select FromUserId from UsersForRealName where RealName='" + FromUserIdRealName + "')";
             }
-            //出货仓库仓库编号
+            //出货仓库编号
             if (!string.IsNullOrEmpty(FromStoreIdStoreNo))
             {
                 condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreNo where StoreNo='" + FromStoreIdStoreNo + "')";
             }
-            //出货仓库仓库名称
+            //出货仓库名称
             if (!string.IsNullOrEmpty(FromStoreIdStoreName))
             {
                 condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreName where StoreName='" + FromStoreIdStoreName + "')";
@@ -421,12 +421,12 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from SmallStoreHouseForStoreName where StoreName='" + StoreIdStoreName + "')";
             }
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from SmallStoreHouseForStoreNo where StoreNo='" + StoreIdStoreNo + "')";
@@ -446,12 +446,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ToUserId in (select ToUserId from UsersForRealName where RealName='" + ToUserIdRealName + "')";
             }
-            //收货仓库仓库编号
+            //收货仓库编号
             if (!string.IsNullOrEmpty(ToStoreIdStoreNo))
             {
                 condition += " and ToStoreId in (select ToStoreId from StoreHouseForStoreNo where StoreNo='" + ToStoreIdStoreNo + "')";
             }
-            //收货仓库仓库名称
+            //收货仓库名称
             if (!string.IsNullOrEmpty(ToStoreIdStoreName))
             {
                 condition += " and ToStoreId in (select ToStoreId from StoreHouseForStoreName where StoreName='" + ToStoreIdStoreName + "')";
@@ -466,7 +466,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and SourceStoreId in (select SourceStoreId from StoreHouseForStoreName where StoreName='" + SourceStoreIdStoreName + "')";
             }
-            //出货创客创客编号
+            //出货创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
                 condition += " and FromUserId in (select FromUserId from UsersForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
@@ -476,12 +476,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and FromUserId in (select FromUserId from UsersForRealName where RealName='" + FromUserIdRealName + "')";
             }
-            //出货仓库仓库编号
+            //出货仓库编号
             if (!string.IsNullOrEmpty(FromStoreIdStoreNo))
             {
                 condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreNo where StoreNo='" + FromStoreIdStoreNo + "')";
             }
-            //出货仓库仓库名称
+            //出货仓库名称
             if (!string.IsNullOrEmpty(FromStoreIdStoreName))
             {
                 condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreName where StoreName='" + FromStoreIdStoreName + "')";
@@ -542,23 +542,23 @@ namespace MySystem.Areas.Admin.Controllers
             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>();
-            ReturnFields.Add("StoreIdStoreName", "仓库仓库名称");
-            ReturnFields.Add("StoreIdStoreNo", "仓库仓库编号");
+            ReturnFields.Add("StoreIdStoreName", "仓库名称");
+            ReturnFields.Add("StoreIdStoreNo", "仓库编号");
             ReturnFields.Add("BrandId", "产品类型");
             ReturnFields.Add("SnNo", "SN编号");
             ReturnFields.Add("SnId", "SNID");
             ReturnFields.Add("ToUserIdMakerCode", "收货人创客编号");
             ReturnFields.Add("ToUserIdRealName", "收货人真实姓名");
-            ReturnFields.Add("ToStoreIdStoreNo", "收货仓库仓库编号");
-            ReturnFields.Add("ToStoreIdStoreName", "收货仓库仓库名称");
+            ReturnFields.Add("ToStoreIdStoreNo", "收货仓库编号");
+            ReturnFields.Add("ToStoreIdStoreName", "收货仓库名称");
             ReturnFields.Add("SourceStoreIdStoreNo", "源仓库编号仓库编号");
             ReturnFields.Add("SourceStoreIdStoreName", "源仓库编号仓库名称");
             ReturnFields.Add("ApplyFlag", "申请标记");
             ReturnFields.Add("ApplyDate", "申请时间");
-            ReturnFields.Add("FromUserIdMakerCode", "出货创客创客编号");
+            ReturnFields.Add("FromUserIdMakerCode", "出货创客编号");
             ReturnFields.Add("FromUserIdRealName", "出货创客真实姓名");
-            ReturnFields.Add("FromStoreIdStoreNo", "出货仓库仓库编号");
-            ReturnFields.Add("FromStoreIdStoreName", "出货仓库仓库名称");
+            ReturnFields.Add("FromStoreIdStoreNo", "出货仓库编号");
+            ReturnFields.Add("FromStoreIdStoreName", "出货仓库名称");
             ReturnFields.Add("CancelFlag", "撤回标记");
             ReturnFields.Add("CancelDate", "撤回时间");
 

Areas/Admin/Controllers/MainServer/ProfitRewardRecordController.cs

@@ -105,6 +105,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
 
+            // TODO: 读取太慢，要优化
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitRewardRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
@@ -176,26 +177,27 @@ namespace MySystem.Areas.Admin.Controllers
             string CreditTradeAmount = "0.00";//贷记卡交易总金额
             string MerchantProfitAmount = "0.00";//商户交易分润总金额
             string CreditProfitAmount = "0.00";//贷记卡分润总金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmt) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                MerchantTradeAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
-            }
-            dt = OtherMySqlConn.dtable("select sum(CreditTradeAmt) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                CreditTradeAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
-            }
-            dt = OtherMySqlConn.dtable("select sum(TradeProfit) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                MerchantProfitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
-            }
-            dt = OtherMySqlConn.dtable("select sum(CreditTradeProfit) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                CreditProfitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
-            }
+            // TODO: 读取太慢，要优化
+            // DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmt) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     MerchantTradeAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(CreditTradeAmt) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     CreditTradeAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TradeProfit) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     MerchantProfitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(CreditTradeProfit) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     CreditProfitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
+            // }
             other.Add("MerchantTradeAmount", MerchantTradeAmount);
             other.Add("CreditTradeAmount", CreditTradeAmount);
             other.Add("MerchantProfitAmount", MerchantProfitAmount);

Areas/Admin/Controllers/MainServer/PullNewDetailController.cs

@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -324,7 +324,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/PullnewSummaryController.cs

@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -308,7 +308,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/SchoolSignInRecordController.cs

@@ -60,7 +60,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -298,7 +298,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -328,7 +328,7 @@ namespace MySystem.Areas.Admin.Controllers
             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>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
 
             result.Add("Fields", ReturnFields);

Areas/Admin/Controllers/MainServer/SchoolSignInTaskRecordController.cs

@@ -60,7 +60,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -307,7 +307,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -344,7 +344,7 @@ namespace MySystem.Areas.Admin.Controllers
             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>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("TaskId", "任务");
 

Areas/Admin/Controllers/MainServer/SmallStoreHouseController.cs

@@ -324,12 +324,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId=" + UserIdSelect;
             }
-            //出货仓库仓库编号
+            //出货仓库编号
             if (!string.IsNullOrEmpty(FromStoreIdStoreNo))
             {
                 condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreNo where StoreNo='" + FromStoreIdStoreNo + "')";
             }
-            //出货仓库仓库名称
+            //出货仓库名称
             if (!string.IsNullOrEmpty(FromStoreIdStoreName))
             {
                 condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreName where StoreName='" + FromStoreIdStoreName + "')";
@@ -361,8 +361,8 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("TotalNum", "总库存数");
             ReturnFields.Add("LaveNum", "剩余库存数");
             ReturnFields.Add("Mobile", "仓库归属人手机号");
-            ReturnFields.Add("FromStoreIdStoreNo", "出货仓库仓库编号");
-            ReturnFields.Add("FromStoreIdStoreName", "出货仓库仓库名称");
+            ReturnFields.Add("FromStoreIdStoreNo", "出货仓库编号");
+            ReturnFields.Add("FromStoreIdStoreName", "出货仓库名称");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "SmallStoreHouse", "ExportExcel");

Areas/Admin/Controllers/MainServer/StoreBalanceController.cs

@@ -60,12 +60,12 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreIdStoreNo + "')";
             }
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from StoreForStoreName where Name='" + StoreIdStoreName + "')";
@@ -357,12 +357,12 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from StoreForStoreNo where StoreNo='" + StoreIdStoreNo + "')";
             }
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from StoreForStoreName where StoreName='" + StoreIdStoreName + "')";
@@ -409,8 +409,8 @@ namespace MySystem.Areas.Admin.Controllers
             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>();
-            ReturnFields.Add("StoreIdStoreNo", "仓库仓库编号");
-            ReturnFields.Add("StoreIdStoreName", "仓库仓库名称");
+            ReturnFields.Add("StoreIdStoreNo", "仓库编号");
+            ReturnFields.Add("StoreIdStoreName", "仓库名称");
             ReturnFields.Add("TransRecordNo", "交易流水编号");
             ReturnFields.Add("TransType", "交易类型");
             ReturnFields.Add("BrandId", "产品类型");

Areas/Admin/Controllers/MainServer/StoreHouseAmountRecordController.cs

@@ -65,7 +65,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -336,7 +336,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -383,7 +383,7 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("ApplyId", "申请单");
             ReturnFields.Add("UseAmount", "使用额度");
             ReturnFields.Add("BeforeAmount", "使用前剩余额度");

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -271,11 +271,19 @@ namespace MySystem.Areas.Admin.Controllers
                         });
                         RedisDbconn.Instance.Set("StoreForCode:" + No, Id);
                     }
-                    db.StoreForName.Add(new StoreForName()
+                    StoreForName storeForName = db.StoreForName.FirstOrDefault(m => m.Name == data.StoreName);
+                    if(storeForName == null)
                     {
-                        Name = data.StoreName + "-" + pro.Name,
-                        StoreId = Id,
-                    });
+                        db.StoreForName.Add(new StoreForName()
+                        {
+                            Name = data.StoreName,
+                            StoreId = Id,
+                        });
+                    }
+                    else
+                    {
+                        storeForName.StoreId = Id;
+                    }
                     UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == user.UserId);
                     if (account == null)
                     {
@@ -467,11 +475,19 @@ namespace MySystem.Areas.Admin.Controllers
                 });
                 RedisDbconn.Instance.Set("StoreForCode:" + No, Id);
             }
-            db.StoreForName.Add(new StoreForName()
+            StoreForName storeForName = db.StoreForName.FirstOrDefault(m => m.Name == data.StoreName);
+            if(storeForName == null)
             {
-                Name = data.StoreName,
-                StoreId = Id,
-            });
+                db.StoreForName.Add(new StoreForName()
+                {
+                    Name = data.StoreName,
+                    StoreId = Id,
+                });
+            }
+            else
+            {
+                storeForName.StoreId = Id;
+            }
             RedisDbconn.Instance.Set("StoreForName:" + data.StoreName, Id);
             AddSysLog(data.Id.ToString(), "StoreHouse", "add");
             db.SaveChanges();
@@ -1362,19 +1378,6 @@ namespace MySystem.Areas.Admin.Controllers
         {
             if (UserId > 0)
             {
-                RedisDbconn.Instance.Clear("StoreHouseList:" + UserId);
-                List<StoreHouse> stores = db.StoreHouse.Where(m => m.Status > -1 && m.UserId == UserId).OrderByDescending(m => m.Sort).ThenByDescending(m => m.Id).ToList();
-
-                RedisDbconn.Instance.Clear("StoreHouse");
-                stores = db.StoreHouse.Where(m => m.Status > -1).OrderByDescending(m => m.Sort).ThenByDescending(m => m.Id).ToList();
-            }
-            if (Id > 0)
-            {
-                StoreHouse edit = db.StoreHouse.FirstOrDefault(m => m.Id == Id);
-                if (edit != null)
-                {
-                    RedisDbconn.Instance.Clear("StoreHouse:" + Id);
-                }
             }
         }
 

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -73,7 +73,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -378,7 +378,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -414,7 +414,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("SendMode", "发货方式");
             ReturnFields.Add("ErpCode", "快递单号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "StoreMachineApply", "ExportExcel");
@@ -553,7 +553,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (BrandId == 7) FromStoreId = 1047;
                 if (BrandId == 8) FromStoreId = 4831;
                 if (BrandId == 9) FromStoreId = 4832;
-                tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString());
+                tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString() && m.Status > -1);
                 SendInfo item = sendInfos.FirstOrDefault(m => m.FromStoreId == FromStoreId && m.ToStoreId == tostore.Id && m.BrandId == BrandId);
                 if (item == null)
                 {
@@ -574,72 +574,80 @@ namespace MySystem.Areas.Admin.Controllers
                 apply.SeoDescription = function.CheckString(SnNo) + ',';
 
                 fromstore = db.StoreHouse.FirstOrDefault(m => m.Id == FromStoreId);
-                tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString());
+                tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString() && m.Status > -1);
 
                 MachineForSnNo machinefor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
                 PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.BuyUserId == 0 && m.UserId == 0) ?? new PosMachinesTwo();
                 if (machine.Id > 0)
                 {
-                    StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                    if(machine.BrandId != BrandId)
                     {
-                        CreateDate = DateTime.Now,
-                        Sort = data.Id,//库存变动关联申请记录表
-                        StoreId = FromStoreId, //出货仓库
-                        BrandId = BrandId, //产品类型
-                        ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
-                        BizBatchNo = BatchNo, //业务批次号
-                        TransType = 1, //交易类型
-                        SnNo = SnNo, //SN编号
-                        StockOpDirect = 1, //库存操作方向
-                        SnStatus = 1, //SN状态
-                        DeviceVendor = machine.DeviceName, //设备厂商
-                        DeviceModel = machine.DeviceKind, //设备型号
-                        DeviceType = machine.DeviceType, //设备类型
-                        FromUserId = fromstore.UserId, //出货人
-                        FromDate = DateTime.Now, //出库时间
-                        FromRemark = OutNote, //出库备注
-                        ToUserId = tostore.UserId, //收货人
-                        ToStoreId = fromstore.Id, //退货收货仓库                        
-                        SourceStoreId = machine.SourceStoreId, //源仓库编号
-                        BrandType = machine.DeviceType, //品牌类型
-                    }).Entity;
-
-                    string ChangeNo = "CS";
-                    int StoreStockChangeId = stockchange.Id;
-                    string StoreStockChangeIdString = StoreStockChangeId.ToString();
-                    for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
-                    {
-                        StoreStockChangeIdString = "0" + StoreStockChangeIdString;
+                        return machine.PosSn + "与表格里填写的品牌不一致";
                     }
-                    ChangeNo += StoreStockChangeIdString;
-                    stockchange.ChangeNo = ChangeNo; //交易流水编号
-                    machine.StoreId = tostore.Id;
-
-                    db.StoreChangeHistory.Add(new StoreChangeHistory()
+                    else
                     {
-                        CreateDate = DateTime.Now,
-                        UserId = fromstore.UserId, //创客
-                        BrandId = BrandId, //产品类型
-                        ChangeRecordNo = ChangeNo, //变更记录单号
-                        BizBatchNo = BatchNo, //业务批次号
-                        TransType = 1, //交易类型
-                        SnNo = SnNo, //SN编号
-                        SnType = machine.PosSnType, //SN机具类型
-                        StockOpDirect = 1, //库存操作方向
-                        DeviceVendor = machine.DeviceName, //设备厂商
-                        DeviceModel = machine.DeviceKind, //设备型号
-                        DeviceType = machine.DeviceType, //设备类型
-                        FromUserId = fromstore.UserId, //出货创客
-                        FromDate = DateTime.Now, //出库时间
-                        FromRemark = OutNote, //出库备注
-                        SourceStoreId = machine.SourceStoreId, //源仓库
-                        StoreId = fromstore.Id, //仓库
-                        ToUserId = tostore.UserId,//收货创客
-                    });
-
-                    //修改机具所属仓库
-                    machine.StoreId = tostore.Id;
-                    machine.UpdateDate = DateTime.Now;
+                        StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                        {
+                            CreateDate = DateTime.Now,
+                            CreateMan = SysUserName,
+                            Sort = data.Id,//库存变动关联申请记录表
+                            StoreId = FromStoreId, //出货仓库
+                            BrandId = BrandId, //产品类型
+                            ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
+                            BizBatchNo = BatchNo, //业务批次号
+                            TransType = 1, //交易类型
+                            SnNo = SnNo, //SN编号
+                            StockOpDirect = 1, //库存操作方向
+                            SnStatus = 1, //SN状态
+                            DeviceVendor = machine.DeviceName, //设备厂商
+                            DeviceModel = machine.DeviceKind, //设备型号
+                            DeviceType = machine.DeviceType, //设备类型
+                            FromUserId = fromstore.UserId, //出货人
+                            FromDate = DateTime.Now, //出库时间
+                            FromRemark = OutNote, //出库备注
+                            ToUserId = tostore.UserId, //收货人
+                            ToStoreId = fromstore.Id, //退货收货仓库                        
+                            SourceStoreId = machine.SourceStoreId, //源仓库编号
+                            BrandType = machine.DeviceType, //品牌类型
+                        }).Entity;
+
+                        string ChangeNo = "CS";
+                        int StoreStockChangeId = stockchange.Id;
+                        string StoreStockChangeIdString = StoreStockChangeId.ToString();
+                        for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
+                        {
+                            StoreStockChangeIdString = "0" + StoreStockChangeIdString;
+                        }
+                        ChangeNo += StoreStockChangeIdString;
+                        stockchange.ChangeNo = ChangeNo; //交易流水编号
+                        machine.StoreId = tostore.Id;
+
+                        db.StoreChangeHistory.Add(new StoreChangeHistory()
+                        {
+                            CreateDate = DateTime.Now,
+                            UserId = fromstore.UserId, //创客
+                            BrandId = BrandId, //产品类型
+                            ChangeRecordNo = ChangeNo, //变更记录单号
+                            BizBatchNo = BatchNo, //业务批次号
+                            TransType = 1, //交易类型
+                            SnNo = SnNo, //SN编号
+                            SnType = machine.PosSnType, //SN机具类型
+                            StockOpDirect = 1, //库存操作方向
+                            DeviceVendor = machine.DeviceName, //设备厂商
+                            DeviceModel = machine.DeviceKind, //设备型号
+                            DeviceType = machine.DeviceType, //设备类型
+                            FromUserId = fromstore.UserId, //出货创客
+                            FromDate = DateTime.Now, //出库时间
+                            FromRemark = OutNote, //出库备注
+                            SourceStoreId = machine.SourceStoreId, //源仓库
+                            StoreId = fromstore.Id, //仓库
+                            ToUserId = tostore.UserId,//收货创客
+                        });
+
+                        //修改机具所属仓库
+                        machine.StoreId = tostore.Id;
+                        machine.UpdateDate = DateTime.Now;
+                    }
                 }
                 else
                 {

Areas/Admin/Controllers/MainServer/StoreSnActivateSummaryController.cs

@@ -57,12 +57,12 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreIdStoreNo + "')";
             }
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdStoreName + "')";
@@ -330,12 +330,12 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreIdStoreNo + "')";
             }
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdStoreName + "')";
@@ -385,8 +385,8 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("TradeDate", "交易日");
             ReturnFields.Add("TradeMonth", "交易月");
-            ReturnFields.Add("StoreIdStoreNo", "仓库仓库编号");
-            ReturnFields.Add("StoreIdStoreName", "仓库仓库名称");
+            ReturnFields.Add("StoreIdStoreNo", "仓库编号");
+            ReturnFields.Add("StoreIdStoreName", "仓库名称");
             ReturnFields.Add("AgentStoreIdStoreNo", "代理分仓仓库编号");
             ReturnFields.Add("AgentStoreIdStoreName", "代理分仓仓库名称");
             ReturnFields.Add("BrandId", "产品类型");

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -147,36 +147,47 @@ namespace MySystem.Areas.Admin.Controllers
                 }
             }
             decimal CreditTrade = 0;
-            bool check = spdb.TradeRecord.Any(m => m.TradeSnNo == pos.PosSn);
+            string BindingTime = pos.BindingTime == null ? DateTime.Now.AddMonths(-1).ToString("yyyyMM") : pos.BindingTime.Value.ToString("yyyyMM");
+            string SpTradeRecordId = function.ReadInstance("/PublicParams/SpTradeRecordId" + BindingTime + ".txt");
+            int StartId = int.Parse(function.CheckInt(SpTradeRecordId));
+            bool check = spdb.TradeRecord.Any(m => m.Id > StartId && m.TradeSnNo == pos.PosSn);
             if (check)
             {
                 if (pos.BrandId == 1)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M700")).Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M700")).Sum(m => m.TradeAmount) / 100;
                 }
                 else if (pos.BrandId == 2)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "2").Sum(m => m.TradeAmount);
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "2").Sum(m => m.TradeAmount);
                 }
                 else if (pos.BrandId == 3)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M900")).Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M900")).Sum(m => m.TradeAmount) / 100;
                 }
-                else if (pos.BrandId == 4 || pos.BrandId == 5 || pos.BrandId == 8 || pos.BrandId == 9)
+                else if (pos.BrandId == 4 || pos.BrandId == 5)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
                 }
                 else if (pos.BrandId == 6)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "6").Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "6").Sum(m => m.TradeAmount) / 100;
                 }
                 else if (pos.BrandId == 7)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "7" && m.TradeStatus == "00").Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "7" && m.TradeStatus == "00").Sum(m => m.TradeAmount) / 100;
+                }
+                else if (pos.BrandId == 8)
+                {
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "8").Sum(m => m.TradeAmount) / 100;
+                }
+                else if (pos.BrandId == 9)
+                {
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "9").Sum(m => m.TradeAmount) / 100;
                 }
                 pos.CreditTrade = CreditTrade;
                 db.SaveChanges();
-                StatTradeAmount(pos.PosSn);
+                StatTradeAmount(pos.PosSn, StartId);
             }
             if (AddActPrize == 1)
             {
@@ -197,7 +208,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (pos.BindingTime != null && pos.ActivationTime != null)
                 {
                     TimeSpan ts = pos.ActivationTime.Value - pos.BindingTime.Value;
-                    if (ts.TotalDays <= 30)
+                    if (ts.TotalDays <= 30 || SysUserName == "admin")
                     {
                         AddAct(pos.Id);
                     }
@@ -217,7 +228,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (pos.BindingTime != null && pos.ActivationTime != null)
                 {
                     TimeSpan ts = pos.ActivationTime.Value - pos.BindingTime.Value;
-                    if (ts.TotalDays > 30)
+                    if (ts.TotalDays > 30 && SysUserName != "admin")
                     {
                         return "机具划拨后已超过30天";
                     }
@@ -261,7 +272,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             pos.UserId = user.Id;
             pos.BuyUserId = user.Id;
-            if (pos.CreditTrade >= CheckMoney && pos.ActivationState == 0 && pos.BindingTime > DateTime.Now.AddDays(-30))
+            if (pos.CreditTrade >= CheckMoney && pos.ActivationState == 0 && (pos.BindingTime > DateTime.Now.AddDays(-30) || SysUserName == "admin"))
             {
                 // pos.IsPurchase = 0;
                 pos.ActivationState = 1;
@@ -392,25 +403,36 @@ namespace MySystem.Areas.Admin.Controllers
             bool check = spdb.TradeRecord.Any(m => m.TradeSnNo == pos.PosSn);
             if (check)
             {
+                string BindingTime = pos.BindingTime == null ? DateTime.Now.AddMonths(-1).ToString("yyyyMM") : pos.BindingTime.Value.ToString("yyyyMM");
+                string SpTradeRecordId = function.ReadInstance("/PublicParams/SpTradeRecordId" + BindingTime + ".txt");
+                int StartId = int.Parse(function.CheckInt(SpTradeRecordId));
                 if (pos.BrandId == 1)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M700")).Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M700")).Sum(m => m.TradeAmount) / 100;
                 }
                 else if (pos.BrandId == 2)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "2").Sum(m => m.TradeAmount);
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "2").Sum(m => m.TradeAmount);
                 }
                 else if (pos.BrandId == 3)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M900")).Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M900")).Sum(m => m.TradeAmount) / 100;
                 }
-                else if (pos.BrandId == 4 || pos.BrandId == 5 || pos.BrandId == 8 || pos.BrandId == 9)
+                else if (pos.BrandId == 4 || pos.BrandId == 5)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
                 }
                 else if (pos.BrandId == 6)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "6").Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "6").Sum(m => m.TradeAmount) / 100;
+                }
+                else if (pos.BrandId == 8)
+                {
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "8").Sum(m => m.TradeAmount) / 100;
+                }
+                else if (pos.BrandId == 9)
+                {
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "9").Sum(m => m.TradeAmount) / 100;
                 }
                 pos.CreditTrade = CreditTrade;
                 db.SaveChanges();
@@ -448,7 +470,6 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         mer.ActiveStatus = 1;
                         mer.MerStandardDate = DateTime.Now;
-                        RedisDbconn.Instance.Clear("PosMerchantInfo:" + mer.Id);
                     }
                 }
                 else if (pos.CreditTrade >= 1000 && pos.ActivationState == 1)
@@ -463,7 +484,6 @@ namespace MySystem.Areas.Admin.Controllers
                     }
                 }
                 db.SaveChanges();
-                RedisDbconn.Instance.Clear("PosMachinesTwo:" + pos.Id);
                 return "success";
             }
             pos.UserId = user.Id;
@@ -556,8 +576,6 @@ namespace MySystem.Areas.Admin.Controllers
                 pos.BindMerchantId = merchant.Id;
             }
             db.SaveChanges();
-            RedisDbconn.Instance.Clear("PosMerchantInfo:" + merchant.Id);
-            RedisDbconn.Instance.Clear("PosMachinesTwo:" + pos.Id);
             return "success";
         }
         public void AddAct(int posid = 0)
@@ -671,7 +689,6 @@ namespace MySystem.Areas.Admin.Controllers
                                 }
                                 userData.ActProfit += prize;
                                 db.SaveChanges();
-                                RedisDbconn.Instance.Set("UserMachineData:" + IdBrand, userData);
                                 UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == GetUserId);
                                 if (account == null)
                                 {
@@ -745,7 +762,7 @@ namespace MySystem.Areas.Admin.Controllers
             db.Dispose();
         }
         //重置交易额
-        public void StatTradeAmount(string PosSn)
+        public void StatTradeAmount(string PosSn, int StartId = 0)
         {
             DateTime start = DateTime.Parse(DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00");
             if (DateTime.Now.Day == 1)
@@ -753,7 +770,7 @@ namespace MySystem.Areas.Admin.Controllers
                 start = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01 00:00:00");
             }
             DateTime end = DateTime.Now;
-            SycnSpTradeService.Instance.Start(PosSn, start, end);
+            SycnSpTradeService.Instance.Start(PosSn, start, end, StartId);
             RedisDbconn.Instance.AddList("ResetTradeAmountList", PosSn);
         }
 
@@ -1101,6 +1118,7 @@ namespace MySystem.Areas.Admin.Controllers
             string SendDate = applyorder.SendDate == null ? "" : applyorder.SendDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string CreateDate = pos.CreateDate == null ? "" : pos.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string TransferTime = pos.TransferTime == null ? "" : pos.TransferTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+            string RecycEndDate = pos.RecycEndDate == null ? "" : pos.RecycEndDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string ActiveTime = reward.CreateDate == null ? "" : reward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string ActiveTime6 = lisreward.CreateDate == null ? "" : lisreward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string result = "";
@@ -1126,6 +1144,7 @@ namespace MySystem.Areas.Admin.Controllers
                 result += "机具所属小分仓：暂无小分仓\n";
             }
             result += "入库时间：" + CreateDate + "\n";
+            result += "循环到期时间：" + RecycEndDate + "\n";
             result += "划拨时间：" + TransferTime + "\n";
             result += "绑定状态：" + bindResult + "(绑定时间：" + bindTime + ")\n";
             result += "激活状态：" + activeResult + "(激活时间：" + activeTime + ")\n";
@@ -1978,7 +1997,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "机具未绑定，不支持解绑";
             }
-            if (pos.BindingTime < DateTime.Now.AddDays(-30))
+            if (pos.BindingTime < DateTime.Now.AddDays(-30) && SysUserName != "admin")
             {
                 return "机具绑定已超过30天，不支持解绑";
             }
@@ -2143,47 +2162,7 @@ namespace MySystem.Areas.Admin.Controllers
             ViewBag.SwapSnExpand = SwapSnExpand;
             ViewBag.SnNos = SnNos;
 
-            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            var machineApplie = db.MachineApply.Where(m => m.Status > -1).ToList();
-            var orders = db.Orders.Where(m => m.Status > -1).ToList();
-            if (!string.IsNullOrEmpty(SwapSnExpand))
-            {
-                var machineApplie1 = machineApplie.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SwapSnExpand)).ToList();
-                foreach (var item in machineApplie1)
-                {
-                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
-                    Dictionary<string, object> data = new Dictionary<string, object>();
-                    data["ApplyNo"] = item.ApplyNo.ToString();
-                    data["OrderNo"] = orders1.OrderNo.ToString();
-                    data["MakerCode"] = item.ApplyNo.ToString();
-                    data["RealName"] = item.ApplyNo.ToString();
-                    data["ComeSn"] = item.ApplyNo.ToString();
-                    data["SendSn"] = item.ApplyNo.ToString();
-                    data["CreateDate"] = item.ApplyNo.ToString();
-                    data["Status"] = item.ApplyNo.ToString();
-                    dataList.Add(data);
-                }
-            }
-            if (!string.IsNullOrEmpty(SnNos))
-            {
-                var machineApplie1 = machineApplie.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SnNos)).ToList();
-                foreach (var item in machineApplie1)
-                {
-                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
-                    Dictionary<string, object> data = new Dictionary<string, object>();
-                    data["ApplyNo"] = item.ApplyNo.ToString();
-                    data["OrderNo"] = orders1.OrderNo.ToString();
-                    data["MakerCode"] = item.ApplyNo.ToString();
-                    data["RealName"] = item.ApplyNo.ToString();
-                    data["ComeSn"] = item.ApplyNo.ToString();
-                    data["SendSn"] = item.ApplyNo.ToString();
-                    data["CreateDate"] = item.ApplyNo.ToString();
-                    data["Status"] = item.ApplyNo.ToString();
-                    dataList.Add(data);
-                }
-            }
-            return View(dataList);
-            // return View();
+            return View();
         }
 
         #endregion
@@ -2201,100 +2180,69 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SwapSnExpand", "1"); //申请机具SN
             Fields.Add("SnNos", "1"); //发货机具SN
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            var machineApplie = db.MachineApply.Where(m => m.Status > -1).ToList();
-            var orders = db.Orders.Where(m => m.Status > -1).ToList();
 
             if (!string.IsNullOrEmpty(SwapSnExpand))
             {
-                var machineApplie1 = machineApplie.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SwapSnExpand)).ToList();
-                foreach (var item in machineApplie1)
+                var apply = db.MachineApply.FirstOrDefault(m => m.Status > -1 && m.SwapSnExpand.Contains(SwapSnExpand)) ?? new MachineApply();
+                var order = db.Orders.FirstOrDefault(m => m.Id == apply.QueryCount) ?? new Orders();
+                var user = db.Users.FirstOrDefault(m => m.Id == apply.UserId) ?? new Users();
+                string[] SnNoList = function.CheckNull(apply.SwapSnExpand).TrimEnd('\n').Split('\n');
+                string[] OrderSnNo = function.CheckNull(order.SnNos).Split(',');
+                for (int i = 0; i < SnNoList.Length; i++)
                 {
-                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
                     Dictionary<string, object> data = new Dictionary<string, object>();
-                    data["ApplyNo"] = item.ApplyNo.ToString();
-                    data["OrderNo"] = orders1.OrderNo.ToString();
-                    data["MakerCode"] = item.ApplyNo.ToString();
-                    data["RealName"] = item.ApplyNo.ToString();
-                    data["ComeSn"] = item.ApplyNo.ToString();
-                    data["SendSn"] = item.ApplyNo.ToString();
-                    data["CreateDate"] = item.ApplyNo.ToString();
-                    data["Status"] = item.ApplyNo.ToString();
+                    data["ApplyNo"] = apply.ApplyNo;
+                    data["OrderNo"] = order.OrderNo;
+                    data["MakerCode"] = user.MakerCode;
+                    data["RealName"] = user.RealName;
+                    if(SnNoList.Length > i)
+                    {
+                        data["ComeSn"] = SnNoList[i];
+                        data["ComeSnParam"] = SnNoList[i].Split(':')[0];
+                    }
+                    if(OrderSnNo.Length > i)
+                    {
+                        data["SendSn"] = OrderSnNo[i];
+                    }
+                    data["CreateDate"] = apply.CreateDate == null ? "" : apply.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    data["Status"] = order.Status == 2 ? "已发货" : "未发货";
                     dataList.Add(data);
                 }
             }
             else if (!string.IsNullOrEmpty(SnNos))
             {
-                var machineApplie1 = machineApplie.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SnNos)).ToList();
-                foreach (var item in machineApplie1)
-                {
-                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
-                    Dictionary<string, object> data = new Dictionary<string, object>();
-                    data["ApplyNo"] = item.ApplyNo.ToString();
-                    data["OrderNo"] = orders1.OrderNo.ToString();
-                    data["MakerCode"] = item.ApplyNo.ToString();
-                    data["RealName"] = item.ApplyNo.ToString();
-                    data["ComeSn"] = item.ApplyNo.ToString();
-                    data["SendSn"] = item.ApplyNo.ToString();
-                    data["CreateDate"] = item.ApplyNo.ToString();
-                    data["Status"] = item.ApplyNo.ToString();
-                    dataList.Add(data);
-                }
-            }
-            else
-            {
-                foreach (var item in machineApplie)
+                var order = db.Orders.FirstOrDefault(m => m.Status > -1 && m.SnNos.Contains(SnNos)) ?? new Orders();
+                var apply = db.MachineApply.FirstOrDefault(m => m.Id == order.Sort) ?? new MachineApply();
+                var user = db.Users.FirstOrDefault(m => m.Id == apply.UserId) ?? new Users();
+                string[] SnNoList = function.CheckNull(apply.SwapSnExpand).TrimEnd('\n').Split('\n');
+                string[] OrderSnNo = function.CheckNull(order.SnNos).Split(',');
+                for (int i = 0; i < OrderSnNo.Length; i++)
                 {
-                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount) ?? new Orders();
-                    var user = db.Users.FirstOrDefault(m => m.Id == item.UserId) ?? new Users();
                     Dictionary<string, object> data = new Dictionary<string, object>();
-                    data["ApplyNo"] = item.ApplyNo.ToString();
-                    if (!string.IsNullOrEmpty(orders1.OrderNo))
-                    {
-                        data["OrderNo"] = orders1.OrderNo.ToString();
-                    }
-                    if (string.IsNullOrEmpty(orders1.OrderNo))
-                    {
-                        data["OrderNo"] = "";
-                    }
-                    if (!string.IsNullOrEmpty(orders1.SnNos))
-                    {
-                        data["SendSn"] = orders1.SnNos.ToString();
+                    data["ApplyNo"] = apply.ApplyNo;
+                    data["OrderNo"] = order.OrderNo;
+                    data["MakerCode"] = user.MakerCode;
+                    data["RealName"] = user.RealName;
+                    if(SnNoList.Length > i)
+                    {
+                        data["ComeSn"] = SnNoList[i];
+                        data["ComeSnParam"] = SnNoList[i].Split(':')[0];
                     }
-                    if (string.IsNullOrEmpty(orders1.SnNos))
+                    if(OrderSnNo.Length > i)
                     {
-                        data["SendSn"] = "";
-                    }
-                    if (!string.IsNullOrEmpty(user.MakerCode))
-                    {
-                        data["MakerCode"] = user.MakerCode.ToString();
-                    }
-                    if (string.IsNullOrEmpty(user.MakerCode))
-                    {
-                        data["MakerCode"] = "";
-                    }
-                    if (!string.IsNullOrEmpty(user.RealName))
-                    {
-                        data["RealName"] = user.RealName.ToString();
-                    }
-                    if (string.IsNullOrEmpty(user.RealName))
-                    {
-                        data["RealName"] = "";
-                    }
-                    data["ComeSn"] = item.SwapSnExpand.ToString();
-                    data["CreateDate"] = item.CreateDate.ToString();
-                    if (item.ApplyNo.ToString() == "0")
-                    {
-                        data["Status"] = "待处理";
-                    }
-                    if (item.ApplyNo.ToString() == "1")
-                    {
-                        data["Status"] = "成功";
+                        data["SendSn"] = OrderSnNo[i];
                     }
+                    data["CreateDate"] = apply.CreateDate == null ? "" : apply.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    data["Status"] = order.Status == 2 ? "已发货" : "未发货";
                     dataList.Add(data);
                 }
             }
-            dataList = dataList.Skip((page - 1) * limit).Take(limit).ToList();//分页的重点
-            return Json(dataList);
+            Dictionary<string, object> obj = new Dictionary<string, object>();
+            obj.Add("code", 0);
+            obj.Add("msg", "");
+            obj.Add("count", dataList.Count);
+            obj.Add("data", dataList);
+            return Json(obj);
         }
 
         #endregion
@@ -2474,6 +2422,519 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
+        #region 查询机具开机奖
+
+        public IActionResult OpenPrize(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        [HttpPost]
+        public Dictionary<string, string> OpenPrizeDo(string PosSn)
+        {
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            string result = "";
+            PosMachinesTwo pos = db.PosMachinesTwo .FirstOrDefault(m => m.PosSn == PosSn);
+            if (pos == null)
+            {
+                result += "机具SN号不存在\n";
+                dic.Add("code", "1");
+                dic.Add("result", result);
+                return dic;
+            }
+            if(pos.BindingState == 0)
+            {
+                result += "机具未绑定\n";
+                dic.Add("code", "1");
+                dic.Add("result", result);
+                return dic;
+            }
+            if(pos.ActivationState == 0)
+            {
+                result += "机具未激活\n";
+                dic.Add("code", "1");
+                dic.Add("result", result);
+                return dic;
+            }
+            PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
+            if (merchant == null)
+            {
+                result += "商户不存在\n";
+                dic.Add("code", "1");
+                dic.Add("result", result);
+                return dic;
+            }
+            Users buyuser = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId) ?? new Users();
+            result += "机具号：" + PosSn + "\n";
+            result += "机具所属人：\n创客编号：" + buyuser.MakerCode + "，姓名：" + buyuser.RealName + "，手机号：" + buyuser.Mobile + "\n";
+            result += "商户信息\n商户编号：" + merchant.KqMerNo + "，姓名：" + merchant.MerchantName + "，手机号：" + merchant.MerchantMobile + "\n";
+            string OpenUser10 = "未领取";
+            string OpenUser20 = "未领取";
+            var OpenRewardDetail = db.OpenRewardDetail.Where(m => m.SnNo == pos.PosSn).ToList();
+            OpenRewardDetail openreward = OpenRewardDetail.FirstOrDefault(m => m.CreditRewardAmount == 20) ?? new OpenRewardDetail();
+            if (openreward.Id > 0)
+            {
+                Users user = db.Users.FirstOrDefault(m => m.Id == openreward.UserId) ?? new Users();
+                OpenUser20 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
+            }
+            openreward = OpenRewardDetail.FirstOrDefault(m => m.CreditRewardAmount == 10) ?? new OpenRewardDetail();
+            if (openreward.Id > 0)
+            {
+                Users user = db.Users.FirstOrDefault(m => m.Id == openreward.UserId) ?? new Users();
+                OpenUser10 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
+            }
+            result += "开机奖20：" + OpenUser20 + "\n";
+            result += "开机奖10：" + OpenUser10 + "\n";
+            dic.Add("id", pos.Id.ToString());
+            dic.Add("code", "0");
+            dic.Add("result", result);
+            return dic;
+        }
+        public string AddOpenPrize(int Id)
+        {
+            PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == Id && m.ActivationState == 1);
+            if (pos == null)
+            {
+                return "机具未激活";
+            }
+            if (pos.BindingTime < DateTime.Now.AddDays(-30))
+            {
+                return "绑定已超过30天";
+            }
+            decimal ActPrize = decimal.Parse(function.CheckNum(pos.SeoKeyword));
+            if (ActPrize == 0)
+            {
+                return "机具无押金";
+            }
+            PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
+            if (merchant == null)
+            {
+                return "商户不存在";
+            }
+            bool check = db.OpenRewardDetail.Any(m => m.SnNo == pos.PosSn);
+            if(check)
+            {
+                return "开机奖励已发放，请勿重复操作";
+            }
+            // 从机具所属人上级开始分开机奖励
+            Users user = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId);
+            if (user != null)
+            {
+                if (!string.IsNullOrEmpty(user.ParentNav))
+                {
+                    decimal Prize = 20;
+                    List<string> PrizeFlag = new List<string>();
+                    string[] ParentNavs = user.ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                    for (int i = ParentNavs.Length - 1; i >= 0; i--)
+                    {
+                        int UserId = int.Parse(ParentNavs[i]);
+                        Users puser = db.Users.FirstOrDefault(m => m.Id == UserId && m.AuthFlag == 1);
+                        if (puser != null && Prize > 0)
+                        {
+                            int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.PosSnType == 0); //判断是否拥有3台购买机
+                            int ActiveCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.ActivationState == 1); //判断是否拥有3台激活机（不限购买或赠送）
+                            int couponCount = db.PosCoupons.Count(m => m.UserId == puser.Id && m.IsUse == 0); //判断是否拥有3张券
+                            if (machineCount + ActiveCount + couponCount >= 3)
+                            {
+                                int pTopUserId = 0;
+                                if (!string.IsNullOrEmpty(puser.ParentNav))
+                                {
+                                    pTopUserId = int.Parse(puser.ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
+                                }
+                                Users machineUser = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId) ?? new Users();
+                                OpenRewardDetail detail = db.OpenRewardDetail.Add(new OpenRewardDetail()
+                                {
+                                    CreateDate = DateTime.Now,
+                                    UpdateDate = DateTime.Now,
+                                    TradeMonth = DateTime.Now.ToString("yyyyMM"), //交易月
+                                    TradeDate = pos.ActivationTime, //达标日期
+                                    UserId = puser.Id, //创客
+                                    BrandId = pos.BrandId, //品牌
+                                    ProductName = RelationClass.GetKqProductBrandInfo(pos.BrandId), //产品名称
+                                    MerchantId = pos.BindMerchantId, //商户
+                                    DirectUserId = merchant.UserId, //商户直属人
+                                    SnNo = pos.PosSn, //SN号
+                                    MerNo = merchant.KqMerNo, //渠道商户号
+                                    SnType = pos.PosSnType, //机具类型
+                                    StandardDate = pos.ActivationTime, //商户的激活日期
+                                    SnStoreId = pos.StoreId, //SN仓库
+                                    MerBuddyType = puser.MerchantType, //商户创客类型
+                                    RewardType = 1, //奖励类型 1-开机直接奖励，2-开机间接奖励
+                                    RewardTips = "开机奖励", //奖励描述
+                                    CreditTradeAmt = pos.CreditTrade, //贷记卡交易总金额
+                                    DebitTradeAmt = pos.DebitCardTrade, //借记卡交易总金额
+                                    CreditRewardAmount = Prize, //贷记卡交易奖励金额
+                                    RewardDesc = "开机奖励", //奖励描述
+                                    TopUserId = pTopUserId, //顶级创客
+                                    SeoTitle = machineUser.RealName,
+                                }).Entity;
+                                db.OpenReward.Add(new OpenReward()
+                                {
+                                    CreateDate = DateTime.Now,
+                                    UpdateDate = DateTime.Now,
+                                    TradeMonth = DateTime.Now.ToString("yyyyMM"), //交易月
+                                    TradeDate = DateTime.Now, //达标日期
+                                    UserId = puser.Id, //创客
+                                    BrandId = pos.BrandId, //品牌
+                                    RewardType = 2, //奖励类型
+                                    CreditTradeAmt = pos.CreditTrade, //贷记卡交易总金额
+                                    DebitTradeAmt = pos.DebitCardTrade, //借记卡交易总金额
+                                    CreditRewardAmount = Prize, //贷记卡交易奖励金额
+                                    RewardDesc = "开机奖励", //奖励描述
+                                    TopUserId = pTopUserId, //顶级创客
+                                });
+                                string IdBrand = puser.Id + "_" + pos.BrandId;
+                                UserMachineData userData = db.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
+                                if (userData == null)
+                                {
+                                    userData = db.UserMachineData.Add(new UserMachineData()
+                                    {
+                                        IdBrand = IdBrand,
+                                    }).Entity;
+                                    db.SaveChanges();
+                                }
+                                userData.OpenProfit += Prize;
+                                db.SaveChanges();
+                                //账户入库
+                                UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == puser.Id);
+                                if (account == null)
+                                {
+                                    account = db.UserAccount.Add(new UserAccount()
+                                    {
+                                        Id = puser.Id,
+                                        UserId = puser.Id,
+                                    }).Entity;
+                                    db.SaveChanges();
+                                }
+                                //收支明细入库
+                                decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                                decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                                decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                                account.BalanceAmount += Prize;
+                                account.TotalAmount += Prize;
+                                decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                                decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                                decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                                UserAccountRecord userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord()
+                                {
+                                    CreateDate = DateTime.Now,
+                                    UpdateDate = DateTime.Now,
+                                    UserId = puser.Id, //创客
+                                    ChangeType = 50, //变动类型
+                                    ProductType = pos.BrandId, //产品类型
+                                    ChangeAmount = Prize, //变更金额
+                                    BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                                    AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                                    BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                                    AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                                    BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                                    AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                                }).Entity;
+                                db.SaveChanges();
+                                RedisDbconn.Instance.Set("UserAccount:" + puser.Id, account);
+
+                                string dateString = DateTime.Now.ToString("yyyyMMdd");
+                                string monthString = DateTime.Now.ToString("yyyyMM");
+                                // 开机奖励列表
+                                List<string> dates = RedisDbconn.Instance.GetList<string>("OpenRewardDay:" + puser.Id + ":" + pos.BrandId);
+                                if (!dates.Contains(dateString))
+                                {
+                                    RedisDbconn.Instance.AddList("OpenRewardDay:" + puser.Id + ":" + pos.BrandId, dateString);
+                                }
+                                RedisDbconn.Instance.AddNumber("OpenRewardAmt:" + puser.Id + ":" + pos.BrandId + ":" + dateString, Prize);
+
+                                List<string> months = RedisDbconn.Instance.GetList<string>("OpenRewardMonth:" + puser.Id + ":" + pos.BrandId);
+                                if (!months.Contains(monthString))
+                                {
+                                    RedisDbconn.Instance.AddList("OpenRewardMonth:" + puser.Id + ":" + pos.BrandId, monthString);
+                                }
+                                RedisDbconn.Instance.AddNumber("OpenRewardAmt:" + puser.Id + ":" + pos.BrandId + ":" + monthString, Prize);
+
+                                // 开机奖励详情
+                                RedisDbconn.Instance.AddList("OpenRewardDetail:" + puser.Id + ":" + pos.BrandId + ":" + dateString, detail);
+
+                                //收支明细
+                                RedisDbconn.Instance.AddList("UserAccountRecord:" + puser.Id + ":1:" + monthString, userAccountRecord);
+                                RedisDbconn.Instance.AddNumber("UserAccount:" + puser.Id + ":1:" + monthString, Prize);
+
+                                Prize -= 10;
+                                PrizeFlag.Add(Prize.ToString("f0"));
+                            }
+                        }
+                    }
+                    string result = "";
+                    if(!PrizeFlag.Contains("20"))
+                    {
+                        result += "20元奖励未发，请检查上级是否满足条件\n";
+                    }
+                    if(!PrizeFlag.Contains("10"))
+                    {
+                        result += "10元奖励未发，请检查上级是否满足条件\n";
+                    }
+                    if(string.IsNullOrEmpty(result))
+                    {
+                        return "发放成功";
+                    }
+                    return result;
+                }
+            }
+            db.Dispose();
+            return "操作失败";
+        }
+        
+        #endregion
+
+        #region 查询机具流量费分佣
+
+        public IActionResult FluxPrize(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        [HttpPost]
+        public Dictionary<string, string> FluxPrizeDo(string PosSn)
+        {
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            string result = "";
+            PosMachinesTwo pos = db.PosMachinesTwo .FirstOrDefault(m => m.PosSn == PosSn);
+            if (pos == null)
+            {
+                result += "机具SN号不存在\n";
+                dic.Add("code", "1");
+                dic.Add("result", result);
+                return dic;
+            }
+            if(pos.BindingState == 0)
+            {
+                result += "机具未绑定\n";
+                dic.Add("code", "1");
+                dic.Add("result", result);
+                return dic;
+            }
+            if(pos.ActivationState == 0)
+            {
+                result += "机具未激活\n";
+                dic.Add("code", "1");
+                dic.Add("result", result);
+                return dic;
+            }
+            PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
+            if (merchant == null)
+            {
+                result += "商户不存在\n";
+                dic.Add("code", "1");
+                dic.Add("result", result);
+                return dic;
+            }
+            Users buyuser = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId) ?? new Users();
+            result += "机具号：" + PosSn + "\n";
+            result += "机具所属人：\n创客编号：" + buyuser.MakerCode + "，姓名：" + buyuser.RealName + "，手机号：" + buyuser.Mobile + "\n";
+            result += "商户信息\n商户编号：" + merchant.KqMerNo + "，姓名：" + merchant.MerchantName + "，手机号：" + merchant.MerchantMobile + "\n";
+            string FluxGet6 = "未领取";
+            string FluxUser6 = "";
+            FluxProfitDetail flux = db.FluxProfitDetail.FirstOrDefault(m => m.SnNo == pos.PosSn) ?? new FluxProfitDetail();
+            if (flux.Id > 0)
+            {
+                Users user = db.Users.FirstOrDefault(m => m.Id == flux.UserId) ?? new Users();
+                FluxGet6 = "已领取（领取时间：" + flux.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "）";
+                FluxUser6 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
+            }
+            result += "流量费：" + FluxGet6 + "\n";
+            result += "流量费发放对象：" + FluxUser6 + "\n";
+            dic.Add("id", pos.Id.ToString());
+            dic.Add("code", "0");
+            dic.Add("result", result);
+            return dic;
+        }
+        public string AddFluxPrize(int Id)
+        {
+            PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == Id && m.ActivationState == 1);
+            if (pos == null)
+            {
+                return "机具未激活";
+            }
+            if (pos.BindingTime < DateTime.Now.AddDays(-30))
+            {
+                return "绑定已超过30天";
+            }
+            decimal ActPrize = decimal.Parse(function.CheckNum(pos.SeoKeyword));
+            if (ActPrize == 0)
+            {
+                return "机具无押金";
+            }
+            PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
+            if (merchant == null)
+            {
+                return "商户不存在";
+            }
+            if(pos.BrandId == 6)
+            {
+                return "立刷不支持流量费分佣";
+            }
+            if(decimal.Parse(function.CheckNum(pos.SeoKeyword)) <= 0)
+            {
+                return "无押金机，不支持流量费分佣";
+            }
+            bool check = db.FluxProfitDetail.Any(m => m.MerNo == merchant.KqMerNo);
+            if(check)
+            {
+                return "开机奖励已发放，请勿重复操作";
+            }
+            SpModels.TradeFluxRecord trade = spdb.TradeFluxRecord.FirstOrDefault(m => m.TradeSnNo == pos.PosSn);
+            if(trade != null)
+            {
+                try
+                {
+                    string OrderNo = trade.TradeSerialNo; //单号
+                    DateTime TradeDate = trade.CreateDate.Value;
+                    string TradeMonth = TradeDate.ToString("yyyyMM");
+                    decimal FeeAmount = trade.FeeAmount; //流量费
+                    if (trade.ProductType == "1" || trade.ProductType == "4" || trade.ProductType == "6" || trade.ProductType == "8" || trade.ProductType == "9")
+                    {
+                        FeeAmount = FeeAmount / 100;
+                    }
+                    string TradeSnNo = trade.TradeSnNo; //机具SN
+                    decimal FluxProfit = 0;
+                    if (trade.ProductType == "1" && FeeAmount == 60)
+                    {
+                        FluxProfit = 24;
+                    }
+                    else if (trade.ProductType == "7" && FeeAmount == 46)
+                    {
+                        FluxProfit = 10;
+                    }
+                    else if (trade.ProductType != "1" && FeeAmount == 48)
+                    {
+                        FluxProfit = 12;
+                    }
+                    if (FluxProfit > 0)
+                    {
+                        Users user = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId) ?? new Users();
+                        int GetUserId = user.Id;
+                        int TopUserId = 0;
+                        string ParentNav = user.ParentNav;
+                        if (!string.IsNullOrEmpty(ParentNav))
+                        {
+                            string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                            if (ParentNavList.Length > 1)
+                            {
+                                TopUserId = int.Parse(ParentNavList[1]);
+                            }
+                            else if (ParentNavList.Length == 1)
+                            {
+                                TopUserId = int.Parse(ParentNavList[0]);
+                            }
+                        }
+                        FluxProfitSummary fluxProfit = db.FluxProfitSummary.FirstOrDefault(m => m.UserId == GetUserId && m.BrandId == pos.BrandId && m.TradeMonth == TradeMonth);
+                        if (fluxProfit == null)
+                        {
+                            fluxProfit = db.FluxProfitSummary.Add(new FluxProfitSummary()
+                            {
+                                CreateDate = DateTime.Now,
+                                UpdateDate = DateTime.Now,
+                                UserId = GetUserId, //创客
+                                BrandId = pos.BrandId,
+                                TopUserId = TopUserId, //顶级创客
+                                TradeMonth = TradeMonth, //交易月
+                                MerUserType = user.MerchantType, //商户创客类型
+                                Remark = "流量卡分佣", //备注
+                            }).Entity;
+                            db.SaveChanges();
+                        }
+                        fluxProfit.FluxProfitAmt += FluxProfit; //流量分润总金额
+                        db.FluxProfitDetail.Add(new FluxProfitDetail()
+                        {
+                            CreateDate = DateTime.Now,
+                            UpdateDate = DateTime.Now,
+                            RecordNo = OrderNo, //单号
+                            TradeDate = TradeDate.ToString("yyyyMMdd"), //交易日期
+                            TradeTime = TradeDate.ToString("HHmmss"), //交易时间
+                            TradeMonth = TradeMonth, //交易月
+                            UserId = GetUserId, //创客
+                            MerchantId = pos.BindMerchantId, //商户
+                            MerchantUserId = pos.UserId, //商户直属人
+                            MerNo = merchant.KqMerNo, //渠道商户编号
+                            SnNo = pos.PosSn, //渠道SN号
+                            FluxOrderNo = OrderNo, //流量扣费单号
+                            TradeOrderNo = OrderNo, //交易流水号
+                            TradeAmt = trade.TradeAmount, //商户交易额
+                            FluxFeeAmt = FeeAmount, //流量费
+                            FluxProfitAmt = FluxProfit, //流量分润总金额
+                            PosType = pos.PosSnType.ToString(), //POS类型
+                            Remark = "流量卡分佣", //备注
+                            BrandId = pos.BrandId, //品牌
+                            TopUserId = TopUserId, //顶级创客
+                            MerUserType = user.MerchantType, //商户创客类型
+                        });
+                        string IdBrand = user.Id + "_" + pos.BrandId;
+                        UserMachineData userData = db.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
+                        if (userData == null)
+                        {
+                            userData = db.UserMachineData.Add(new UserMachineData()
+                            {
+                                IdBrand = IdBrand,
+                            }).Entity;
+                            db.SaveChanges();
+                        }
+                        userData.FluxProfit += FluxProfit;
+                        db.SaveChanges();
+                        UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == GetUserId);
+                        if (account == null)
+                        {
+                            account = db.UserAccount.Add(new UserAccount()
+                            {
+                                Id = GetUserId,
+                                UserId = GetUserId,
+                            }).Entity;
+                            db.SaveChanges();
+                        }
+                        decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                        decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                        decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                        account.BalanceAmount += FluxProfit;
+                        account.TotalAmount += FluxProfit;
+                        decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                        decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                        decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                        UserAccountRecord userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord()
+                        {
+                            CreateDate = DateTime.Now,
+                            UpdateDate = DateTime.Now,
+                            UserId = GetUserId, //创客
+                            ChangeType = 60, //变动类型
+                            ProductType = pos.BrandId, //产品类型
+                            ChangeAmount = FluxProfit, //变更金额
+                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                        }).Entity;
+                        db.SaveChanges();
+                        spdb.Dispose();
+                        db.Dispose();
+                        return "发放成功";
+                    }
+                }
+                catch (Exception ex)
+                {
+                    function.WriteLog(DateTime.Now.ToString() + "\n$" + trade.Id + "$\n" + ex.ToString(), "流量卡分佣异常");
+                }
+            }
+            spdb.Dispose();
+            db.Dispose();
+            return "操作失败";
+        }
+        
+        #endregion
+
         #region 设置立刷费率
 
         public IActionResult LisFee(string right)

Areas/Admin/Controllers/MainServer/TeamApplyController.cs

@@ -91,7 +91,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and NotifyFlag=" + NotifyFlagSelect;
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UsersForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -456,7 +456,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and NotifyFlag=" + NotifyFlagSelect;
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UsersForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -516,7 +516,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("TeamName", "队伍名称");
             ReturnFields.Add("UserIdMakerCode", "队长创客编号");
             ReturnFields.Add("UserIdRealName", "队长真实姓名");
-            ReturnFields.Add("TopUserIdMakerCode", "顶级创客创客编号");
+            ReturnFields.Add("TopUserIdMakerCode", "顶级创客编号");
             ReturnFields.Add("TopUserIdRealName", "顶级创客真实姓名");
             ReturnFields.Add("Areas", "特训营所在地区");
             ReturnFields.Add("EffectStartDate", "活动开始时间");

Areas/Admin/Controllers/MainServer/TeamBlackListController.cs

@@ -60,7 +60,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -70,7 +70,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -321,7 +321,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -331,7 +331,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/TeamDayTopController.cs

@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -79,7 +79,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and TeamId in (select TeamId from TeamApplyForTeamName where TeamName='" + TeamIdTeamName + "')";
             }
-            //团队长创客创客编号
+            //团队长创客编号
             if (!string.IsNullOrEmpty(TeamUserIdMakerCode))
             {
                 condition += " and TeamUserId in (select TeamUserId from UserForMakerCode where MakerCode='" + TeamUserIdMakerCode + "')";
@@ -327,7 +327,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -347,7 +347,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and TeamId in (select TeamId from TeamApplyForTeamName where TeamName='" + TeamIdTeamName + "')";
             }
-            //团队长创客创客编号
+            //团队长创客编号
             if (!string.IsNullOrEmpty(TeamUserIdMakerCode))
             {
                 condition += " and TeamUserId in (select TeamUserId from UserForMakerCode where MakerCode='" + TeamUserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/TeamOfferApplyController.cs

@@ -78,7 +78,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and NotifyFlag=" + NotifyFlagSelect;
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -108,7 +108,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and TeamLeader in (select TeamLeader from UserForRealName where RealName='" + TeamLeaderRealName + "')";
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -455,7 +455,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and NotifyFlag=" + NotifyFlagSelect;
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -485,7 +485,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and TeamLeader in (select TeamLeader from UserForRealName where RealName='" + TeamLeaderRealName + "')";
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -570,7 +570,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("TeamIdTeamName", "团队队伍名称");
             ReturnFields.Add("TeamLeaderMakerCode", "队长创客编号");
             ReturnFields.Add("TeamLeaderRealName", "队长真实姓名");
-            ReturnFields.Add("TopUserIdMakerCode", "顶级创客创客编号");
+            ReturnFields.Add("TopUserIdMakerCode", "顶级创客编号");
             ReturnFields.Add("TopUserIdRealName", "顶级创客真实姓名");
             ReturnFields.Add("Areas", "特训营所在地区");
             ReturnFields.Add("EffectStartDate", "活动开始时间");

Areas/Admin/Controllers/MainServer/TeamPersonDayTopController.cs

@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -69,7 +69,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -89,7 +89,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and TeamId in (select TeamId from TeamApplyForTeamName where TeamName='" + TeamIdTeamName + "')";
             }
-            //团队长创客创客编号
+            //团队长创客编号
             if (!string.IsNullOrEmpty(TeamUserIdMakerCode))
             {
                 condition += " and TeamUserId in (select TeamUserId from UserForMakerCode where MakerCode='" + TeamUserIdMakerCode + "')";
@@ -343,7 +343,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -353,7 +353,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -373,7 +373,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and TeamId in (select TeamId from TeamApplyForTeamName where TeamName='" + TeamIdTeamName + "')";
             }
-            //团队长创客创客编号
+            //团队长创客编号
             if (!string.IsNullOrEmpty(TeamUserIdMakerCode))
             {
                 condition += " and TeamUserId in (select TeamUserId from UserForMakerCode where MakerCode='" + TeamUserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/UserSnActInfoController.cs

@@ -60,7 +60,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -337,7 +337,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -407,13 +407,13 @@ namespace MySystem.Areas.Admin.Controllers
             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>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("BrandId", "产品类型");
             ReturnFields.Add("SnNo", "SN编号");
             ReturnFields.Add("SnType", "SN机具类型");
-            ReturnFields.Add("SnStoreIdStoreNo", "SN仓库仓库编号");
-            ReturnFields.Add("SnStoreIdStoreName", "SN仓库仓库名称");
+            ReturnFields.Add("SnStoreIdStoreNo", "SN仓库编号");
+            ReturnFields.Add("SnStoreIdStoreName", "SN仓库名称");
             ReturnFields.Add("EffectStartCycleDate", "有效开始循环时间");
             ReturnFields.Add("EffectEndCycleDate", "有效结束循环时间");
             ReturnFields.Add("ActUserId", "激活奖励创客");

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -574,26 +574,20 @@ namespace MySystem.Areas.Admin.Controllers
                         // return Json(new AppResultJson() { Status = "-1", Info = "注销失败，未满足条件：名下无未绑定机具、机具券，无未申请的循环机。如有疑问，请联系客服" });
                         return "注销失败，未满足条件：名下无未绑定机具、机具券，无未申请的循环机。如有疑问，请联系客服";
                     }
-                    UserForMobile forMobile = db.UserForMobile.FirstOrDefault(m => m.Mobile == user.Mobile);
-                    if (forMobile != null)
-                    {
-                        db.Remove(forMobile);
-                    }
-                    user.Status = -1;
-                    user.Mobile += "d";
-                    user.CertId += "d";
                 }
-                else
+                UserForMobile forMobile = db.UserForMobile.FirstOrDefault(m => m.Mobile == user.Mobile);
+                if (forMobile != null)
                 {
-                    UserForMobile forMobile = db.UserForMobile.FirstOrDefault(m => m.Mobile == user.Mobile);
-                    if (forMobile != null)
-                    {
-                        db.Remove(forMobile);
-                    }
-                    user.Status = -1;
-                    user.Mobile += "d";
-                    user.CertId += "d";
+                    db.UserForMobile.Remove(forMobile);
+                }
+                UserForMakerCode forCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == user.MakerCode);
+                if (forCode != null)
+                {
+                    db.UserForMakerCode.Remove(forCode);
                 }
+                user.Status = -1;
+                user.Mobile += "d";
+                user.CertId += "d";
                 function.WriteLog(user.Id + "于" + DateTime.Now.ToString() + "注销账号", "创客注销日志");
                 // TODO: 每月扫描一次注销的创客，把注销创客伞下创客全部挂到注销创客的上级
                 // TODO: 清除token,token登录返回
@@ -805,7 +799,6 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("LoginPwd", function.MD532(NewPwd));
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("Users", Fields, Id);
             AddSysLog(Id, "Users", "ResetPwd");
-            RedisDbconn.Instance.Clear("Users:" + Id);
             return "success|" + NewPwd;
         }
 
@@ -1240,8 +1233,6 @@ namespace MySystem.Areas.Admin.Controllers
             foreach (var Brand in Brands)
             {
                 PublicFunction.SycnMachineCount(Id, Brand.Id);
-                // RedisDbconn.Instance.Set("UserMachineData:" + IdBrand, machineData);
-                // RedisDbconn.Instance.SetExpire("UserMachineData:" + IdBrand, function.get_Random(1800, 5400));
             }
             AddSysLog(Id, "Users", "SycnData");
             db.SaveChanges();

Areas/Admin/Views/MainServer/HelpProfitMerchantForUser/Index.cshtml

@@ -127,7 +127,7 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules/HelpProfitMerchantForUser_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/layuiadmin/modules_main/HelpProfitMerchantForUser_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
         
     </script>

Areas/Admin/Views/MainServer/Products/Add.cshtml

@@ -58,7 +58,7 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label">商品名称</label>
                         <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="ProductName" name="ProductName" maxlength="100" lay-verify="" autocomplete="off" placeholder="请输入商品名称">
+                            <input class="layui-input" type="text" id="ProductName" name="ProductName" maxlength="100" lay-verify="required" autocomplete="off" placeholder="请输入商品名称">
                         </div>
                     </div>
                     <div class="layui-form-item">

Areas/Admin/Views/MainServer/Products/Edit.cshtml

@@ -61,7 +61,7 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label">商品名称</label>
                         <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="ProductName" name="ProductName" value="@editData.ProductName" maxlength="100" lay-verify="" autocomplete="off" placeholder="请输入商品名称">
+                            <input class="layui-input" type="text" id="ProductName" name="ProductName" value="@editData.ProductName" maxlength="100" lay-verify="required" autocomplete="off" placeholder="请输入商品名称">
                         </div>
                     </div>
                     <div class="layui-form-item">

Areas/Admin/Views/MainServer/SysTools/FluxPrize.cshtml

@@ -0,0 +1,143 @@
+@{
+    string RightInfo = ViewBag.RightInfo as string;
+    string right = ViewBag.right as string;
+    
+}
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>补录流量卡分佣</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <script src="/admin/js/LAreaData2.js"></script>
+</head>
+<body>
+
+    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
+        <form class="layui-form" id="confirmFrm">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="layui-tab" lay-filter="mytabbar">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this" lay-id="1">基本信息</li>
+                        </ul>
+                        <div class="layui-tab-content mt20">
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">机具SN</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" type="text" id="PosSn"
+                                            name="PosSn" maxlength="50" autocomplete="off" placeholder="请输入机具SN">
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+                    <div class="layui-form-item ml10">
+                        <div class="layui-input-block">
+                            <button type="button" class="layui-btn" onclick="save()">提交</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+        function save() {
+            var loadindex = layer.load(1, {
+                shade: [0.5, '#000']
+            });
+            var userdata = $("#confirmFrm").serialize();
+            $.ajax({
+                type: "POST",
+                url: "/Admin/SysTools/OpenPrizeDo?r=" + Math.random(1),
+                data: userdata,
+                dataType: "json",
+                success: function (data) {
+                    layer.close(loadindex);
+                    if (data.code == '1') {
+                        layer.alert(data.result.replace(/\n/g, '<br />'), { area: ['680px', '460px'] });
+                    } else {
+                        var index = layer.confirm(data.result.replace(/\n/g, '<br />') + '<br />是否立即补发？', { area: ['500px', '460px'] }, function (index) {
+                            $.ajax({
+                                type: "POST",
+                                url: "/Admin/SysTools/AddOpenPrize?r=" + Math.random(1),
+                                data: "Id=" + data.id,
+                                dataType: "text",
+                                success: function (data) {
+                                    if (data == "success") {
+                                        layer.close(index);
+                                        layer.msg("补发成功");
+                                    } else {
+                                        layer.msg(data);
+                                    }
+                                }
+                            });
+                        });
+                    }
+                }
+            });
+        }
+        
+                    
+        //编辑器
+        KindEditor.ready(function (K) {
+            
+        });
+                
+        var tree;
+        var element;
+        var upload;
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util;
+            tree = layui.tree;
+            element = layui.element;
+            upload = layui.upload;
+        
+            //Hash地址的定位
+            var layid = location.hash.replace(/^#test=/, '');
+            element.tabChange('test', layid);
+            element.on('tab(test)', function (elem) {
+                location.hash = 'test=' + $(this).attr('lay-id');
+            });
+    
+            //日期
+            
+
+            //上传文件
+            
+
+            //穿梭框
+            
+
+            //TreeView，比如权限管理
+            
+
+            //省市区
+            
+        })
+
+    </script>
+</body>
+</html>

Areas/Admin/Views/MainServer/SysTools/Loop.cshtml

@@ -1,13 +1,8 @@
-@using MySystem.Models;
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    string SelfId = ViewBag.SelfId as string;
-    string ParentId = ViewBag.ParentId as string;
-    string UserId = ViewBag.Id as string;
-    string MakerCode = ViewBag.MakerCode as string;
-    List<Users> TopUsers = ViewBag.TopUsers as List<Users>;
-    List<UserLevelSet> Levels = ViewBag.Levels as List<UserLevelSet>;
+    string SwapSnExpand = ViewBag.SwapSnExpand as string;
+    string SnNos = ViewBag.SnNos as string;
 }
 <!DOCTYPE html>
 <html>
@@ -54,21 +49,21 @@
                         <div class="layui-inline">
                             <label class="layui-form-label">来源机具SN</label>
                             <div class="layui-input-inline">
-                                <input class="layui-input" type="text" name="ComeSn" id="ComeSn" autocomplete="off">
+                                <input class="layui-input" type="text" name="SwapSnExpand" id="SwapSnExpand" autocomplete="off">
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">发货机具SN</label>
                             <div class="layui-input-inline">
-                                <input class="layui-input" type="text" name="SendSn" id="SendSn" autocomplete="off">
+                                <input class="layui-input" type="text" name="SnNos" id="SnNos" autocomplete="off">
                             </div>
                         </div>
                         <div class="layui-inline ml50">
                             <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
                                 <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
                             </button>
-                            <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
-                                <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
+                            <button class="layui-btn" onclick="window.history.go(-1)">
+                                上一步
                             </button>
                         </div>
                     </div>
@@ -80,9 +75,11 @@
                 <script type="text/html" id="imgTpl">
                     <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
                 </script>
-                <script type="text/html" id="Loop">
-                    <a lay-href="/Admin/SysTools/Loop?right=@right&SwapSnExpand=@("{{d.SnNos}}")" lay-text="发货机信息" style="color: #428bca;">{{d.SwapSnExpand}}</a>
-                    <a lay-href="/Admin/SysTools/Loop?right=@right&SnNos=@("{{d.SwapSnExpand}}")" lay-text="申请机信息" style="color: #428bca;">{{d.SnNos}}</a>
+                <script type="text/html" id="ComeSnLoop">
+                    <a href="/Admin/SysTools/Loop?right=@right&SnNos=@("{{d.ComeSnParam}}")" style="color: #428bca;">{{d.ComeSn}}</a>
+                </script>
+                <script type="text/html" id="SendSnLoop">
+                    <a href="/Admin/SysTools/Loop?right=@right&SwapSnExpand=@("{{d.SendSn}}")" style="color: #428bca;">{{d.SendSn}}</a>
                 </script>
             </div>
         </div>
@@ -90,6 +87,10 @@
 
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_main/Loop_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script>
+        var SwapSnExpand = '@SwapSnExpand';
+        var SnNos = '@SnNos';
+    </script>
 </body>
 
 </html>

Areas/Admin/Views/MainServer/SysTools/OpenPrize.cshtml

@@ -0,0 +1,143 @@
+@{
+    string RightInfo = ViewBag.RightInfo as string;
+    string right = ViewBag.right as string;
+    
+}
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>补录创客开机奖</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <script src="/admin/js/LAreaData2.js"></script>
+</head>
+<body>
+
+    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
+        <form class="layui-form" id="confirmFrm">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="layui-tab" lay-filter="mytabbar">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this" lay-id="1">基本信息</li>
+                        </ul>
+                        <div class="layui-tab-content mt20">
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">机具SN</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" type="text" id="PosSn"
+                                            name="PosSn" maxlength="50" autocomplete="off" placeholder="请输入机具SN">
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+                    <div class="layui-form-item ml10">
+                        <div class="layui-input-block">
+                            <button type="button" class="layui-btn" onclick="save()">提交</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+        function save() {
+            var loadindex = layer.load(1, {
+                shade: [0.5, '#000']
+            });
+            var userdata = $("#confirmFrm").serialize();
+            $.ajax({
+                type: "POST",
+                url: "/Admin/SysTools/OpenPrizeDo?r=" + Math.random(1),
+                data: userdata,
+                dataType: "json",
+                success: function (data) {
+                    layer.close(loadindex);
+                    if (data.code == '1') {
+                        layer.alert(data.result.replace(/\n/g, '<br />'), { area: ['680px', '460px'] });
+                    } else {
+                        var index = layer.confirm(data.result.replace(/\n/g, '<br />') + '<br />是否立即补发？', { area: ['500px', '460px'] }, function (index) {
+                            $.ajax({
+                                type: "POST",
+                                url: "/Admin/SysTools/AddOpenPrize?r=" + Math.random(1),
+                                data: "Id=" + data.id,
+                                dataType: "text",
+                                success: function (data) {
+                                    if (data == "success") {
+                                        layer.close(index);
+                                        layer.msg("补发成功");
+                                    } else {
+                                        layer.msg(data);
+                                    }
+                                }
+                            });
+                        });
+                    }
+                }
+            });
+        }
+        
+                    
+        //编辑器
+        KindEditor.ready(function (K) {
+            
+        });
+                
+        var tree;
+        var element;
+        var upload;
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util;
+            tree = layui.tree;
+            element = layui.element;
+            upload = layui.upload;
+        
+            //Hash地址的定位
+            var layid = location.hash.replace(/^#test=/, '');
+            element.tabChange('test', layid);
+            element.on('tab(test)', function (elem) {
+                location.hash = 'test=' + $(this).attr('lay-id');
+            });
+    
+            //日期
+            
+
+            //上传文件
+            
+
+            //穿梭框
+            
+
+            //TreeView，比如权限管理
+            
+
+            //省市区
+            
+        })
+
+    </script>
+</body>
+</html>

Areas/Admin/Views/MainServer/SysTools/Prize100.cshtml

@@ -94,110 +94,6 @@
         KindEditor.ready(function (K) {
             
         });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
         
         var tree;
         var element;

Models/SubsidyCheck.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class SubsidyCheck
+    {
+        public uint UserId { get; set; }
+        public int BrandId { get; set; }
+        public decimal SendMoney { get; set; }
+        public decimal ActualMoney { get; set; }
+        public decimal MoreMoney { get; set; }
+        public uint Id { get; set; }
+        public uint Status { get; set; }
+    }
+}

Models/WebCMSEntities.cs

@@ -190,6 +190,7 @@ namespace MySystem.Models
         public virtual DbSet<StoreSnActivateSummary> StoreSnActivateSummary { get; set; }
         public virtual DbSet<StoreStockChange> StoreStockChange { get; set; }
         public virtual DbSet<StoreSwapSn> StoreSwapSn { get; set; }
+        public virtual DbSet<SubsidyCheck> SubsidyCheck { get; set; }
         public virtual DbSet<SysAdmin> SysAdmin { get; set; }
         public virtual DbSet<SysAdminRole> SysAdminRole { get; set; }
         public virtual DbSet<SysLog> SysLog { get; set; }
@@ -12984,6 +12985,23 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<SubsidyCheck>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11) unsigned");
+
+                entity.Property(e => e.ActualMoney).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.MoreMoney).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.SendMoney).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11) unsigned");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11) unsigned");
+            });
+
             modelBuilder.Entity<SysAdmin>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");

Startup.cs

@@ -95,7 +95,6 @@ namespace MySystem
             initCashServer();
 
             RedisDbconn.csredis = new CSRedis.CSRedisClient(Configuration["Setting:RedisConnStr"]);
-            TendisDbconn.csredis = new CSRedis.CSRedisClient(Configuration["Setting:TendisConnStr"]);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -153,11 +152,11 @@ namespace MySystem
         {
             Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();
             Library.OtherMySqlConn.connstr = Configuration["Setting:SqlConnStr"];
-            System.Data.DataTable tablecollection = Library.OtherMySqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'KxsMainServer2'");
+            System.Data.DataTable tablecollection = Library.OtherMySqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'KxsMainServer'");
             foreach (System.Data.DataRow subtable in tablecollection.Rows)
             {
                 Dictionary<string, string> Columns = new Dictionary<string, string>();
-                System.Data.DataTable columncollection = Library.OtherMySqlConn.dtable("select COLUMN_NAME,DATA_TYPE from information_schema.columns where table_schema = 'KxsMainServer2' and TABLE_NAME='" + subtable["TABLE_NAME"].ToString() + "'");
+                System.Data.DataTable columncollection = Library.OtherMySqlConn.dtable("select COLUMN_NAME,DATA_TYPE from information_schema.columns where table_schema = 'KxsMainServer' and TABLE_NAME='" + subtable["TABLE_NAME"].ToString() + "'");
                 foreach (System.Data.DataRow column in columncollection.Rows)
                 {
                     string datatype = column["DATA_TYPE"].ToString();

appsettings.json

@@ -23,7 +23,6 @@
     "SpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
     "CashSqlConnStr": "server=47.109.31.237;port=3306;user=KxsCashServer;password=LNGvM18W6SaIGKBC;database=KxsCashServer;charset=utf8;",
     "RedisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
-    "TendisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",
     "AndroidAppVersion": "1.0.0",
     "OSSKey": "",

wwwroot/layuiadmin/modules_main/HelpProfitReward_Admin.js

@@ -120,21 +120,18 @@ $('#TradeDate').val(value);
             { type: 'checkbox', fixed: 'left' }
     		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
             ,{field:'TradeMonth', width: 200, title:'交易月', sort: true}
-,{field:'CreateDate', width: 200, title:'创建时间', sort: true}
-,{field:'UserId', width: 200, title:'创客', sort: true}
-,{field:'UserIdMakerCode', width: 200, title:'创客创客编号', sort: true}
-,{field:'UserIdRealName', width: 200, title:'创客真实姓名', sort: true}
-,{field:'BrandId', width: 200, title:'品牌', sort: true}
-,{field:'RewardType', width: 200, title:'奖励类型', sort: true}
-,{field:'CreditTradeAmt', width: 200, title:'贷记卡交易总金额', sort: true}
-,{field:'CreditRewardAmount', width: 200, title:'贷记卡交易奖励金额', sort: true}
-,{field:'OpenRewardNo', width: 200, title:'开机奖励单号', sort: true}
-,{field:'RewardDesc', width: 200, title:'奖励描述', sort: true}
-,{field:'Remark', width: 200, title:'备注', sort: true}
-,{field:'CheckStatus', width: 200, title:'验证和同步账户状态', sort: true}
+            ,{field:'SeoTitle', width: 200, title:'交易日', sort: true}
+            ,{field:'CreateDate', width: 200, title:'创建时间', sort: true}
+            ,{field:'UserIdMakerCode', width: 200, title:'创客创客编号', sort: true}
+            ,{field:'UserIdRealName', width: 200, title:'创客真实姓名', sort: true}
+            ,{field:'BrandId', width: 200, title:'品牌', sort: true}
+            ,{field:'RewardType', width: 200, title:'奖励类型', sort: true}
+            ,{field:'CreditTradeAmt', width: 200, title:'贷记卡交易总金额', sort: true}
+            ,{field:'CreditRewardAmount', width: 200, title:'贷记卡交易奖励金额', sort: true}
+            ,{field:'RewardDesc', width: 200, title:'奖励描述', sort: true}
+            ,{field:'Remark', width: 200, title:'备注', sort: true}
+            ,{field:'Status', width: 200, title:'验证和同步账户状态', sort: true}
 
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
-            , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
             

wwwroot/layuiadmin/modules_main/Loop_Admin.js

@@ -134,15 +134,16 @@ layui.config({
             { type: 'checkbox', fixed: 'left' }
             , { field: 'ApplyNo', width: 200, title: '申请订单号', sort: true }
             , { field: 'OrderNo', width: 200, title: '订单号', sort: true }
+            , { field: 'ComeSn', width: 300, title: '来源机具SN', sort: true, templet: '#ComeSnLoop' }
+            , { field: 'SendSn', width: 300, title: '发货SN', sort: true, templet: '#SendSnLoop' }
             , { field: 'MakerCode', width: 200, title: '创客编号', sort: true }
             , { field: 'RealName', width: 200, title: '创客姓名', sort: true }
-            , { field: 'ComeSn', width: 200, title: '来源机具SN', sort: true, templet: '#Loop' }
-            , { field: 'SendSn', width: 200, title: '发货SN', sort: true, templet: '#Loop' }
             , { field: 'CreateDate', width: 200, title: '申请时间', sort: true }
             , { field: 'Status', width: 200, title: '申请状态', sort: true }
-            , { title: '操作', width: 1500, align: 'left', toolbar: '#table-list-tools' }
         ]]
         , where: {
+            SwapSnExpand: SwapSnExpand,
+            SnNos: SnNos
         }
         , page: true
         , limit: 30

wwwroot/layuiadmin/modules_main/PosMachinesTwo_Admin.js

@@ -141,6 +141,7 @@ layui.config({
             ,{ field: 'ActivationTime', width: 200, title: '激活时间', sort: true }
             ,{ field: 'BindingTime', width: 200, title: '绑定时间', sort: true }
             ,{ field: 'TransferTime', width: 200, title: '划拨时间', sort: true }
+            ,{ field: 'CreateDate', width: 200, title: '入库时间', sort: true }
             ,{ field: 'RecycStartDate', width: 200, title: '循环开始时间', sort: true }
             ,{ field: 'RecycEndDate', width: 200, title: '循环截止时间', sort: true }
             ,{ field: 'UserInfo', width: 200, title: '大盟主券标记', sort: true }

wwwroot/layuiadmin/modules_main/UserRankWhite_Admin.js

@@ -100,6 +100,7 @@ $('#CreateDate').val(value);
             ,{field:'Rank', width: 200, title:'等级名称', sort: true}
             ,{field:'Status', width: 200, title:'有效状态', sort: true}
             ,{field:'CreateDate', width: 200, title:'创建时间', sort: true}
+            ,{field:'UpdateDate', width: 200, title:'过期时间', sort: true}
             , { title: '操作', align: 'center', width: 100, fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {

wwwroot/layuiadmin/modules_main/Users_Admin.js

@@ -156,7 +156,7 @@ layui.config({
                     $.ajax({
                         type: "POST",
                         url: "/Admin/Users/Cancel?r=" + Math.random(1),
-                        data: "Id=" + data.Id,
+                        data: "UserId=" + data.Id,
                         dataType: "text",
                         success: function (data) {
                             if (data == "success") {