Merge branch 'feature-dgy-查询指定创客下四级信息' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1106,6 +1106,10 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "商户编号不存在";
             }
+            if (merchant.MerUserType > 0)
+            {
+                return "商户" + MerNo + "已经被设置";
+            }
             pos.SeoTitle = user.Id.ToString();
             pos.UserId = user.Id;
             if (pos.BindMerchantId == 0)
@@ -1129,6 +1133,7 @@ namespace MySystem.Areas.Admin.Controllers
             db.SetMerchantTypeRecord.Add(new SetMerchantTypeRecord()
             {
                 CreateDate = DateTime.Now,
+                SeoTitle = SysUserName + "_" + SysRealName,
                 IsRecyc = (ulong)pos.IsPurchase,
                 CreditAmount = pos.CreditTrade,
                 PosSnType = pos.PosSnType,
@@ -1140,7 +1145,9 @@ namespace MySystem.Areas.Admin.Controllers
                 PosSn = pos.PosSn,
                 Note = "后台设置商户型创客",
                 ToUserId = user.Id,
+                OperateType = 2,
                 FromUserId = pos.BuyUserId,
+                BuyUserId = pos.BuyUserId,
             });
             db.SaveChanges();
             string text = string.Format("设置商户代理，创客编号: " + MakerCode + "，机具SN：" + PosSn + "，商户：" + MerNo + "，操作人：" + SysRealName + "，Time：" + DateTime.Now + "");
@@ -1432,7 +1439,7 @@ namespace MySystem.Areas.Admin.Controllers
             if (openreward.Id > 0)
             {
                 Users user = db.Users.FirstOrDefault(m => m.Id == openreward.UserId) ?? new Users();
-                OpenUser20 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "发放时间：" + openreward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                OpenUser20 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，发放时间：" + openreward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             }
             openreward = OpenRewardDetail.FirstOrDefault(m => m.CreditRewardAmount == 10) ?? new OpenRewardDetail();
             if (openreward.Id > 0)
@@ -5455,7 +5462,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
-        
+
         #region 码牌加密
 
         public IActionResult QrCodeEncryption(string right)
@@ -5492,6 +5499,37 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
+        #region 查询指定创客下四级信息
+
+        public IActionResult SeeUserLevel4Info(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        [HttpPost]
+        public string SeeUserLevel4InfoDo(string MakerCode, string MakerCodes)
+        {
+            var user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new Users();
+            string[] SnNo = MakerCodes.Replace("\r", "").Replace("\n", ",").Split(',');
+            string code = "";
+            for (int i = 0; i < SnNo.Length; i++)
+            {
+                code += "'" + SnNo[i] + "',";
+            }
+            code = code.TrimEnd(',');
+            var Sql = "SELECT a.MakerCode '查询创客编号',a.RealName '查询创客姓名',b.MakerCode '输入顶级创客编号',b.RealName '输入顶级创客姓名',c.MakerCode '次顶级创客编号',c.RealName '次顶级创客姓名',d.MakerCode '次次顶级创客编号',d.RealName '次次顶级创客姓名',e.MakerCode '次次次顶级创客编号',e.RealName '次次次顶级创客姓名',f.MakerCode '次次次次顶级创客编号',f.RealName '次次次次顶级创客姓名'  FROM(SELECT MakerCode,RealName,ParentNav,SUBSTRING_INDEX(SUBSTRING_INDEX(ParentNav,',',8),',',-1) TopId,SUBSTRING_INDEX(SUBSTRING_INDEX(ParentNav,',',10),',',-1) TopId1 ,SUBSTRING_INDEX(SUBSTRING_INDEX(ParentNav,',',12),',',-1) TopId2 ,SUBSTRING_INDEX(SUBSTRING_INDEX(ParentNav,',',14),',',-1) TopId3 ,SUBSTRING_INDEX(SUBSTRING_INDEX(ParentNav,',',16),',',-1) TopId4  FROM Users WHERE MakerCode IN(" + code + ") AND ParentNav like '%," + user.Id + ",%')a LEFT JOIN Users b ON a.TopId = b.Id LEFT JOIN Users c ON a.TopId1 = c.Id LEFT JOIN Users d ON a.TopId2 = d.Id LEFT JOIN Users e ON a.TopId3 = e.Id LEFT JOIN Users f ON a.TopId4 = f.Id";
+            var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
+            var FileName = "查询指定创客下四级信息" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
+            RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            return "success";
+        }
+        #endregion
+
+
         #region 直营团队数据
 
         public IActionResult Team1Info(string right)

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

@@ -0,0 +1,268 @@
+@{
+    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">指定开始创客编号</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" type="text" id="MakerCode" name="MakerCode"
+                                            maxlength="50" lay-verify="required|" autocomplete="off"
+                                            placeholder="请输入来源创客编号">
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">查询创客编号</label>
+                                    <div class="layui-input-block">
+                                        <textarea class="layui-textarea" lay-verify="required|" name="MakerCodes" id="MakerCodes"
+                                            placeholder="请输入查询创客编号,多个查询创客编号用回车隔开"></textarea>
+                                    </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?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+        function save() {
+            var MakerCode = $('#MakerCode').val();
+            var MakerCodes = $('#MakerCodes').val();
+            if (MakerCode == '') {
+                layer.msg('请输入指定开始创客编号');
+            }
+            else if (MakerCodes == '') {
+                layer.msg('请输入查询创客编号');
+            }
+            else {
+                var index = layer.confirm('确定要查询并导出数据吗？', function (index) {
+                    var indexs = layer.load(1, {
+                        shade: [0.5, '#000']
+                    });
+                    var userdata = $("#confirmFrm").serialize();
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/SysTools/SeeUserLevel4InfoDo?r=" + Math.random(1),
+                        data: userdata,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index); //关闭弹层
+                            if (data == "success") {
+                                layer.close(indexs); //关闭弹层
+                                layer.msg('成功', {
+                                    time: 1000
+                                }, function () {
+                                    window.location.reload();
+                                });
+                            } else if (data.indexOf("Warning") == 0) {
+                                var datalist = data.split('|');
+                                layer.close(indexs); //关闭弹层
+                                layer.alert(datalist[1], { time: 20000 }, function () {
+                                    window.location.reload();
+                                });
+                            } else {
+                                layer.close(indexs); //关闭弹层
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        }
+
+
+        //编辑器
+        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;
+        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>

Controllers/HomeController.cs

@@ -216,7 +216,73 @@ namespace MySystem.Controllers
             }
             return result;
         }
-    
-    
+
+
+
+        public string cash()
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            List<int> ids = new List<int>();
+            ids.Add(179761);
+            ids.Add(180213);
+            ids.Add(180651);
+            ids.Add(180810);
+            ids.Add(181026);
+            ids.Add(181187);
+            ids.Add(181300);
+            ids.Add(181376);
+            ids.Add(181428);
+            ids.Add(181468);
+            ids.Add(181601);
+            ids.Add(181814);
+            foreach(int Id in ids)
+            {
+                UserCashRecord edit = db.UserCashRecord.FirstOrDefault(m => m.Id == Id && m.Status == 0);
+                if (edit != null)
+                {
+                    edit.Status = 2;
+                    edit.Remark = "出款银行故障，请重试";
+                    edit.UpdateMan = "系统";
+                    UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
+                    if (account != null)
+                    {
+                        decimal TradeAmount = edit.TradeAmount;
+                        decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                        decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                        decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                        account.BalanceAmount += TradeAmount;
+                        // if (account.FreezeAmount >= TradeAmount)
+                        // {
+                            account.FreezeAmount -= TradeAmount;
+                            decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                            decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                            decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                            db.UserAccountRecord.Add(new UserAccountRecord()
+                            {
+                                CreateDate = DateTime.Now,
+                                UpdateDate = DateTime.Now,
+                                UserId = edit.UserId, //创客
+                                ChangeType = 6, //变动类型
+                                ProductType = 99, //产品类型
+                                ChangeAmount = TradeAmount, //变更金额
+                                BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                                AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                                BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                                AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                                BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                                AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                            });
+                            db.SaveChanges();
+                        // }
+                        // else
+                        // {
+                        //     function.WriteLog(Id.ToString(), "冻结金额不足");
+                        // }
+                    }
+                }
+            }
+            db.Dispose();
+            return "ok";
+        }
     }
 }

Models/TableSplit.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class TableSplit
+    {
+        public string TableName { get; set; }
+        public int EndId { get; set; }
+        public int StartId { get; set; }
+    }
+}

Models/WebCMSEntities.cs

@@ -218,6 +218,7 @@ namespace MySystem.Models
         public virtual DbSet<SysLog> SysLog { get; set; }
         public virtual DbSet<SysRechargeRecord> SysRechargeRecord { get; set; }
         public virtual DbSet<SystemSet> SystemSet { get; set; }
+        public virtual DbSet<TableSplit> TableSplit { get; set; }
         public virtual DbSet<TeamApply> TeamApply { get; set; }
         public virtual DbSet<TeamApplyForTeamName> TeamApplyForTeamName { get; set; }
         public virtual DbSet<TeamApplyForTeamNo> TeamApplyForTeamNo { get; set; }
@@ -15111,6 +15112,28 @@ namespace MySystem.Models
                     .HasCollation("utf8_general_ci");
             });
 
+            modelBuilder.Entity<TableSplit>(entity =>
+            {
+                entity.HasKey(e => e.TableName)
+                    .HasName("PRIMARY");
+
+                entity.HasComment("表优化配置");
+
+                entity.Property(e => e.TableName)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("表名")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.EndId)
+                    .HasColumnType("int(11)")
+                    .HasComment("结束Id");
+
+                entity.Property(e => e.StartId)
+                    .HasColumnType("int(11)")
+                    .HasComment("开始Id");
+            });
+
             modelBuilder.Entity<TeamApply>(entity =>
             {
                 entity.HasComment("开团申请");

appsettings.Development.json

@@ -0,0 +1,42 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "Setting": {
+    "AppKey": "",
+    "AppId": "",
+    "CheckUrl": "",
+    "ConnectionStrings": "",
+    "WebServiceUrl": "",
+    "DbSchemeUrl": "",
+    "OpHost": "http://operateadmin.kexiaoshuang.com/",
+    "Host": "http://test.bs.kexiaoshuang.com/",
+    "OssHost": "http://oss.kexiaoshuang.com",
+    "Database": "KxsMainServer",
+    "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
+    "StatSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
+    "OpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsOpServer;password=r7jwZ8ydLoeswDR4;database=KxsOpServer;charset=utf8;",
+    "BsSqlConnStr": "server=47.109.31.237;port=3306;user=KxsBsServer;password=wyA1bEhi6aAkN8SB;database=KxsBsServer;charset=utf8;",
+    "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",
+    "IOSAppVersion": "1.0.0",
+    "AndroidAppVersion": "1.0.0",
+    "OSSKey": "",
+    "OSSSecret": "",
+    "OSSEndpoint": "",
+    "OSSBucketName": "",
+    "AppSource": "/skin/app/default/",
+    "JwtSecret": "JvDHuowbOnWiyxMIFc9gG5rw1LSSc0xx68L31oRfxS0",
+    "JwtIss": "KxsMainServer",
+    "JwtAud": "api",
+    "MqUserName": "guest",
+    "MqPassword": "123456",
+    "MqHostName": "localhost:5672"
+  }
+}