lcl 1 год назад
Родитель
Сommit
d77dd45b0f

+ 64 - 0
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -3318,6 +3318,70 @@ namespace MySystem.Areas.Admin.Controllers
             return "success";
         }
         #endregion
+        
+        #region WIFI解绑
+
+        public IActionResult WifiUnbind(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        [HttpPost]
+        public string WifiUnbindDo(string PosSn, int IsSend = 0)
+        {
+            AddSysLog("PosSn:" + PosSn, "SysTools", "WifiUnbindDo");
+            string[] PosSnList = PosSn.Split('\n');
+            foreach(string SnNo in PosSnList)
+            {
+                PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo);
+                if (pos == null)
+                {
+                    return "机具" + SnNo + "不存在";
+                }
+                if(Utils.Instance.IsWifi(pos.BrandId))
+                {
+                    return SnNo + "不是WIFI设备";
+                }
+                if (pos.BuyUserId == 0)
+                {
+                    return "机具" + SnNo + "是仓库机,不支持解绑";
+                }
+                if (pos.BindingState == 0)
+                {
+                    return "机具" + SnNo + "未绑定,不需要解绑";
+                }
+            }
+            foreach(string SnNo in PosSnList)
+            {
+                PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo) ?? new PosMachinesTwo();
+                PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
+                if(merchant != null)
+                {
+                    //备份解绑的商户信息
+                    CustomerSqlConn.op("insert into PosMerchantInfoBak select * from PosMerchantInfo where Id=" + pos.BindMerchantId, MysqlConn.SqlConnStr);
+                    MachineForMerNo forMerNo = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == merchant.KqMerNo);
+                    if (forMerNo != null)
+                    {
+                        db.MachineForMerNo.Remove(forMerNo);
+                    }
+                    pos.BindMerchantId = 0;
+                    pos.BindingState = 0;
+                    pos.BindingTime = null;
+                    db.PosMerchantInfo.Remove(merchant);
+                    WifiTradeRecord trade = db.WifiTradeRecord.FirstOrDefault(m => m.SnNo == SnNo);
+                    if(trade != null)
+                    {
+                        trade.DoMonths = trade.Duration;
+                    }
+                    db.SaveChanges();
+                }
+            }
+            return "success";
+        }
+        #endregion
 
 
         #region 通过券码修改盟主标记

+ 244 - 0
Areas/Admin/Views/MainServer/SysTools/WifiUnbind.cshtml

@@ -0,0 +1,244 @@
+@{
+    string RightInfo = ViewBag.RightInfo as string;
+    string right = ViewBag.right as string;
+
+}
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>WIFI解绑</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-block">
+                                        <textarea class="layui-textarea" lay-verify="required" name="PosSn" id="PosSn"
+                                            placeholder="请输入机具SN,多个SN用回车隔开"></textarea>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label"></label>
+                                    <div class="layui-input-inline" style="font-size: 20px;">
+                                        这里是解绑WIFI,请注意
+                                    </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 index = layer.load(1, {
+                shade: [0.5, '#000']
+            });
+            var userdata = $("#confirmFrm").serialize();
+            $.ajax({
+                type: "POST",
+                url: "/Admin/SysTools/UnbindDo?r=" + Math.random(1),
+                data: userdata,
+                dataType: "text",
+                success: function (data) {
+                    layer.close(index); //关闭弹层
+                    if (data == "success") {
+                        layer.msg("解绑成功");
+                    } else {
+                        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>

+ 1 - 0
Models/RecommendDirectUser.cs

@@ -17,5 +17,6 @@ namespace MySystem.Models
         public string TradeMonth { get; set; }
         public int DirectUserId { get; set; }
         public int UserId { get; set; }
+        public int Kind { get; set; }
     }
 }

+ 28 - 1
Models/WebCMSEntities.cs

@@ -321,7 +321,7 @@ namespace MySystem.Models
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             if (!optionsBuilder.IsConfigured)
-            {
+            {                
                 optionsBuilder.UseMySql(Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString(), x => x.ServerVersion("5.7.17-mysql"));
             }
         }
@@ -5109,6 +5109,9 @@ namespace MySystem.Models
             {
                 entity.HasComment("领导人达标奖交易额统计");
 
+                entity.HasIndex(e => e.ParentUserId)
+                    .HasName("LeaderCompTradeStatIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.CheckSelfTradeAmount)
@@ -14073,6 +14076,10 @@ namespace MySystem.Models
 
                 entity.Property(e => e.DirectUserId).HasColumnType("int(11)");
 
+                entity.Property(e => e.Kind)
+                    .HasColumnType("int(11)")
+                    .HasComment("分类");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -22202,6 +22209,20 @@ namespace MySystem.Models
                     .HasColumnType("datetime")
                     .HasComment("创建时间");
 
+                entity.Property(e => e.DoMonths)
+                    .HasColumnType("int(11)")
+                    .HasComment("执行月份");
+
+                entity.Property(e => e.Duration)
+                    .HasColumnType("int(11)")
+                    .HasComment("时长");
+
+                entity.Property(e => e.LastMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasComment("最后执行月份")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.Remark)
                     .HasColumnType("varchar(64)")
                     .HasComment("备注")
@@ -22222,6 +22243,12 @@ namespace MySystem.Models
                     .HasColumnType("decimal(18,2)")
                     .HasComment("交易金额");
 
+                entity.Property(e => e.Unit)
+                    .HasColumnType("varchar(5)")
+                    .HasComment("单位")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.UpdateDate)
                     .HasColumnType("datetime")
                     .HasComment("修改时间");

+ 4 - 0
Models/WifiTradeRecord.cs

@@ -13,5 +13,9 @@ namespace MySystem.Models
         public int BrandId { get; set; }
         public decimal TradeAmount { get; set; }
         public string SnNo { get; set; }
+        public int Duration { get; set; }
+        public string Unit { get; set; }
+        public int DoMonths { get; set; }
+        public string LastMonth { get; set; }
     }
 }