Merge branch 'DuGuYang' into feature-dgy-后台测试

# Conflicts:
#	Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs
#	appsettings.Development.json

AppStart/SycnUserMachineCountHelper.cs

@@ -32,21 +32,47 @@ namespace MySystem
                     int UserId = int.Parse(json["UserId"].ToString());
                     int BrandId = int.Parse(json["BrandId"].ToString());
                     WebCMSEntities dbnew = new WebCMSEntities();
-                    string IdBrand = UserId + "_" + BrandId;
-                    UserMachineData machineData = dbnew.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
-                    if (machineData == null)
+                    string IdBrand = "";
+                    if (BrandId == 0)
                     {
-                        machineData = dbnew.UserMachineData.Add(new UserMachineData()
+                        var Brands = dbnew.KqProducts.Where(m => m.Status == 1).ToList();
+                        foreach (var Brand in Brands)
                         {
-                            IdBrand = IdBrand
-                        }).Entity;
+                            IdBrand = UserId + "_" + Brand.Id;
+                            UserMachineData machineData = dbnew.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
+                            if (machineData == null)
+                            {
+                                machineData = dbnew.UserMachineData.Add(new UserMachineData()
+                                {
+                                    IdBrand = IdBrand
+                                }).Entity;
+                                dbnew.SaveChanges();
+                            }
+                            machineData.BindCount = dbnew.PosMachinesTwo.Count(m => m.Status > -1 && m.BuyUserId == UserId && m.BrandId == BrandId && m.BindingState == 1);
+                            machineData.UnBindCount = dbnew.PosMachinesTwo.Count(m => m.Status > -1 && m.BuyUserId == UserId && m.BrandId == BrandId && m.BindingState == 0);
+                            machineData.TotalMachineCount = machineData.BindCount + machineData.UnBindCount;
+                            dbnew.SaveChanges();
+                            dbnew.Dispose();
+                        }
+                    }
+                    else
+                    {
+                        IdBrand = UserId + "_" + BrandId;
+                        UserMachineData machineData = dbnew.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
+                        if (machineData == null)
+                        {
+                            machineData = dbnew.UserMachineData.Add(new UserMachineData()
+                            {
+                                IdBrand = IdBrand
+                            }).Entity;
+                            dbnew.SaveChanges();
+                        }
+                        machineData.BindCount = dbnew.PosMachinesTwo.Count(m => m.Status > -1 && m.BuyUserId == UserId && m.BrandId == BrandId && m.BindingState == 1);
+                        machineData.UnBindCount = dbnew.PosMachinesTwo.Count(m => m.Status > -1 && m.BuyUserId == UserId && m.BrandId == BrandId && m.BindingState == 0);
+                        machineData.TotalMachineCount = machineData.BindCount + machineData.UnBindCount;
                         dbnew.SaveChanges();
+                        dbnew.Dispose();
                     }
-                    machineData.BindCount = dbnew.PosMachinesTwo.Count(m => m.Status > -1 && m.BuyUserId == UserId && m.BrandId == BrandId && m.BindingState == 1);
-                    machineData.UnBindCount = dbnew.PosMachinesTwo.Count(m => m.Status > -1 && m.BuyUserId == UserId && m.BrandId == BrandId && m.BindingState == 0);
-                    machineData.TotalMachineCount = machineData.BindCount + machineData.UnBindCount;
-                    dbnew.SaveChanges();
-                    dbnew.Dispose();
                 }
                 else
                 {

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -882,6 +882,77 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
+        #region 获取激活信息预览
+
+        public IActionResult IndexDataSIM(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        #endregion
+
+
+        #region 获取激活信息预览
+
+        public JsonResult IndexDataSIMDo(string DateStr)
+        {
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            Dictionary<string, object> obj = new Dictionary<string, object>();
+            if (!string.IsNullOrEmpty(DateStr))
+            {
+                var result = RadioCardHelper.Instance.QueryCardOrderInfo(DateStr, DateStr, "1", "99999");
+                result = result.Replace("null", "\"\"");
+                JsonData jsonObj = JsonMapper.ToObject(result);
+                if (jsonObj["resultCode"].ToString() == "1")
+                {
+                    var data = jsonObj["data"]["records"];
+                    for (int i = 0; i < data.Count; i++)
+                    {
+                        Dictionary<string, object> dataInfo = new Dictionary<string, object>();
+                        dataInfo.Add("orderNo", data[i]["orderNo"].ToString()); //订单编码
+                        dataInfo.Add("orderCreateTime", data[i]["orderCreateTime"].ToString()); //订单创建时间
+                        dataInfo.Add("phoneNo", data[i]["phoneNo"].ToString()); //选择号码
+                        dataInfo.Add("firstCharge", data[i]["firstCharge"].ToString()); //是否有首充
+                        dataInfo.Add("initialChargeAmount", data[i]["initialChargeAmount"].ToString()); //首充金额（元）
+                        dataInfo.Add("province", data[i]["province"].ToString()); //号码归属省份
+                        dataInfo.Add("city", data[i]["city"].ToString()); //号码归属地市
+                        dataInfo.Add("productName", data[i]["productName"].ToString()); //商品名称
+                        dataInfo.Add("promotionName", data[i]["promotionName"].ToString()); //促销活动名称
+                        dataInfo.Add("productTypeName", data[i]["productTypeName"].ToString()); //商品类型名称
+                        dataInfo.Add("paidInAmount", data[i]["paidInAmount"].ToString()); //实付金额(元)
+                        dataInfo.Add("orderStatus", data[i]["orderStatus"].ToString()); //订单状态
+                        dataInfo.Add("activationStatusName", data[i]["activationStatusName"].ToString()); //激活状态名称
+                        dataInfo.Add("activationTime", data[i]["activationTime"].ToString()); //激活时间
+                        dataInfo.Add("jobId", data[i]["jobId"].ToString()); //BOSS员工工号
+                        dataInfo.Add("AccountName", ""); //账号姓名
+                        dataInfo.Add("iccId", data[i]["iccId"].ToString()); //SIM卡号
+                        dataList.Add(dataInfo);
+                    }
+                }
+
+                obj.Add("code", 0);
+                obj.Add("msg", "");
+                obj.Add("count", dataList.Count);
+                obj.Add("data", dataList);
+
+                AddSysLog("0", "TradeRecord", "PreviewGetSimTrade");
+                return Json(obj);
+            }
+            else
+            {
+                obj.Add("code", 0);
+                obj.Add("msg", "");
+                obj.Add("count", dataList.Count);
+                obj.Add("data", dataList);
+                return Json(obj);
+
+            }
+        }
+        #endregion
+
 
         #region 获取激活信息
         public IActionResult GetSimTrade(string right)
@@ -898,7 +969,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "请勿重复操作";
             }
-            if(DateTime.Parse(DateStr) >= DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")))
+            if (DateTime.Parse(DateStr) >= DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")))
             {
                 return "请输入早于今天的日期";
             }

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -1381,6 +1381,10 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             RedisDbconn.Instance.AddList("HyfCashPayApplyQueue", Newtonsoft.Json.JsonConvert.SerializeObject(edit) + "#cut#" + Channel);
                         }
+                        else if(Channel == 5)
+                        {
+                            RedisDbconn.Instance.AddList("PospCashPayApplyQueue", Newtonsoft.Json.JsonConvert.SerializeObject(edit));
+                        }
                     }
                 }
             }

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -629,6 +629,7 @@ namespace MySystem.Areas.Admin.Controllers
         #region 修改运营中心未使用额度
 
         [HttpPost]
+        // public string EditAmt(SysAdmin data, string OperationAmount, string Note, int Kind)
         public string EditAmt(SysAdmin data, string OperationAmount, string Note, int Kind, int ReturnFlag)
         {
             var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
@@ -650,7 +651,7 @@ namespace MySystem.Areas.Admin.Controllers
             //增加
             else if (Kind == 2)
             {
-                sysAdmin.ReturnAmount = decimal.Parse(OperationAmount);
+                // sysAdmin.ReturnAmount = decimal.Parse(OperationAmount);
                 account.TotalAmt += decimal.Parse(OperationAmount);
                 OperateType = 1;//系统增加
                 description = "系统增加未使用额度";

Areas/Admin/Views/MainServer/TradeRecord/GetSimTrade.cshtml

@@ -33,6 +33,11 @@
                                 <input class="layui-input" type="text" id="DateStr" name="DateStr"
                                     lay-verify="" autocomplete="off" placeholder="请输入日期">
                             </div>
+                            @* <div class="layui-input-inline">
+                                <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchsim">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>预览
+                                </button>
+                            </div> *@
                         </div>
                     </div>
                 </div>

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

@@ -148,7 +148,10 @@
                             <button class="layui-btn" data-type="ImportTrade">
                                 <i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>导交易
                             </button>
-                            <button class="layui-btn" data-type="GetActInfo">
+                            @* <button class="layui-btn" data-type="GetActInfo">
+                                <i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>获取激活信息
+                            </button> *@
+                             <button class="layui-btn" lay-href="/Admin/TradeRecord/IndexDataSIM?right=@right">
                                 <i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>获取激活信息
                             </button>
                             }

Areas/Admin/Views/MainServer/TradeRecord/IndexDataSIM.cshtml

@@ -0,0 +1,69 @@
+<!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">
+    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <style>
+        .layui-input-inline{
+            width: 175px !important;
+        }
+        .layui-form-label{
+            width: 115px !important;
+        }
+        .layui-inline{
+            margin-right: 0px !important;
+        }        
+        .w100{
+            width: 100px !important;
+        }
+        .ml50{
+            margin-left: 50px !important;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">日期</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" id="DateStr" name="DateStr"
+                                lay-verify="required|" autocomplete="off" placeholder="请输入日期">
+                        </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" data-type="GetActInfo">
+                            <i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>执行
+                        </button> *@
+                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-GetSimTradePost">
+                            <i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>执行
+                        </button>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-card-body">
+                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
+                <script type="text/html" id="table-list-tools">
+                </script>
+            </div>
+        </div>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/layuiadmin/modules_main/TradeRecordSIM_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script>
+    </script>
+</body>
+</html>

Areas/Admin/Views/MainServer/UserCashRecord/Cash.cshtml

@@ -44,6 +44,7 @@
                                         <option value="2">金控</option>
                                         <option value="3">盒子-润观米</option>
                                         <option value="4">盒子-聚贤缘</option>
+                                        <option value="5">聚赢</option>
                                     </select>
                                 </div>
                             </div>

Areas/Admin/Views/OperateServer/SysAdminOperate/EditBalance.cshtml

@@ -39,7 +39,7 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label">*操作类别</label>
                         <div class="layui-input-inline">
-                            <select id="Kind" name="Kind" lay-filter="Kind">
+                            <select id="Kind" name="Kind" lay-verify="required|">
                                 <option value="">请选择</option>
                                 <option value="1">扣减</option>
                                 <option value="2">增加</option>

appsettings.Development.json

@@ -18,13 +18,13 @@
     "Host": "http://test.bs.kexiaoshuang.com/",
     "OssHost": "http://oss.kexiaoshuang.com",
     "Database": "KxsMainServer",
-    "SqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;",
+    "SqlConnStr": "server=47.108.62.166;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
     "ReadSqlConnStr": "server=rr-2vc53lrwpwm1ewscogo.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=liuyang;password=liu#yang@2023;database=KxsProfitServer;charset=utf8;",
-    "StatSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
-    "OpSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsOpServer;charset=utf8;",
-    "BsSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsBsServer;charset=utf8;",
-    "SpSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsSpServer;charset=utf8;",
-    "CashSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsCashServer;charset=utf8;",
+    "StatSqlConnStr": "server=47.108.62.166;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
+    "OpSqlConnStr": "server=47.108.62.166;port=3306;user=KxsOpServer;password=r7jwZ8ydLoeswDR4;database=KxsOpServer;charset=utf8;",
+    "BsSqlConnStr": "server=47.108.62.166;port=3306;user=KxsBsServer;password=wyA1bEhi6aAkN8SB;database=KxsBsServer;charset=utf8;",
+    "SpSqlConnStr": "server=47.108.62.166;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
+    "CashSqlConnStr": "server=47.108.62.166;port=3306;user=KxsCashServer;password=LNGvM18W6SaIGKBC;database=KxsCashServer;charset=utf8;",
     "RedisConnStr": "47.108.62.166:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",
     "AndroidAppVersion": "1.0.0",

wwwroot/layuiadmin/modules_main/TradeRecordSIM_Admin.js

@@ -0,0 +1,185 @@
+var excel;
+layui.config({
+    base: '/layuiadmin/' //静态资源所在路径
+}).extend({
+    myexcel: 'layui/lay/modules/excel',
+    index: 'lib/index' //主入口模块
+}).use(['index', 'table', 'excel', 'laydate'], function () {
+    var $ = layui.$
+        , form = layui.form
+        , table = layui.table;
+
+    //- 筛选条件-日期
+    var laydate = layui.laydate;
+    var layCreateDate = laydate.render({
+        elem: '#CreateDate',
+        type: 'date',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateDate').val(value);
+            }
+        }
+    });
+    var layTradeDate = laydate.render({
+        elem: '#DateStr',
+        trigger: 'click',
+        type: 'date',
+    });
+
+
+    //excel导入
+    excel = layui.excel;
+    $('#ExcelFile').change(function (e) {
+        var files = e.target.files;
+        excel.importExcel(files, {}, function (data) {
+            ExcelData = data[0].sheet1;
+        });
+    });
+
+    //监听单元格编辑
+    table.on('edit(LAY-list-manage)', function (obj) {
+        var value = obj.value //得到修改后的值
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
+            $.ajax({
+                type: "POST",
+                url: "/Admin/TradeRecord/Sort?r=" + Math.random(1),
+                data: "Id=" + data.Id + "&Sort=" + value,
+                dataType: "text",
+                success: function (data) {
+                }
+            });
+        }
+    });
+
+    //激活预览列表数据
+    table.render({
+        elem: '#LAY-list-manage'
+        , url: '/Admin/TradeRecord/IndexDataSIMDo' //模拟接口
+        , cols: [[
+            { type: 'checkbox', fixed: 'left' }
+            , { field: 'iccId', width: 200, title: '广电卡号', sort: true } //广电卡号
+            , { field: 'orderNo', width: 200, title: '订单编码', sort: true } //订单编码
+            , { field: 'orderCreateTime', width: 200, title: '订单创建时间', sort: true } //订单创建时间
+            , { field: 'phoneNo', width: 200, title: '选择号码', sort: true } //选择号码
+            , { field: 'firstCharge', width: 200, title: '是否有首充', sort: true } //是否有首充
+            , { field: 'initialChargeAmount', width: 200, title: '首充金额（元）', sort: true } //首充金额（元）
+            , { field: 'province', width: 200, title: '号码归属省份', sort: true } //号码归属省份
+            , { field: 'city', width: 200, title: '号码归属地市', sort: true } //号码归属地市
+            , { field: 'productName', width: 200, title: '商品名称', sort: true } //商品名称
+            , { field: 'promotionName', width: 200, title: '促销活动名称', sort: true } //促销活动名称
+            , { field: 'productTypeName', width: 200, title: '商品类型名称', sort: true } //商品类型名称
+            , { field: 'paidInAmount', width: 200, title: '实付金额', sort: true } //实付金额(元)
+            , { field: 'orderStatus', width: 200, title: '订单状态', sort: true } //订单状态
+            , { field: 'activationStatusName', width: 200, title: '激活状态名称', sort: true } //激活状态名称
+            , { field: 'activationTime', width: 200, title: '激活时间', sort: true } //激活时间
+            , { field: 'jobId', width: 200, title: 'BOSS员工工号', sort: true } //BOSS员工工号
+        ]]
+        , page: true
+        , limit: 30
+        , height: 'full-' + String($('.layui-card-header').height() + 130)
+        , text: '对不起，加载出现异常！'
+        , done: function (res, curr, count) {
+            $(".layui-none").text("无数据");
+        }
+    });
+
+
+    //监听搜索
+    form.on('submit(LAY-list-front-search)', function (data) {
+        var field = data.field;
+
+        //执行重载
+        table.reload('LAY-list-manage', {
+            where: field,
+            page: {
+                curr: 1
+            }
+        });
+    });
+
+    form.on('submit(LAY-list-front-GetSimTradePost)', function (data) {
+        var field = data.field;
+        console.log(field);
+        $.ajax({
+            type: "POST",
+            url: "/Admin/TradeRecord/GetSimTradePost?r=" + Math.random(1),
+            data: "DateStr=" + field.DateStr,
+            dataType: "text",
+            success: function (data) {
+                layer.close(index); //关闭弹层
+                if (data == "success") {
+                    layer.msg("提交成功");
+                } else {
+                    layer.msg(data);
+                }
+            }
+        });
+    });
+
+    form.on('submit(LAY-list-front-searchall)', function (data) {
+        table.reload('LAY-list-manage', {
+            where: null,
+            page: {
+                curr: 1
+            }
+        });
+    });
+
+    //事件
+    var active = {
+        GetActInfo: function () {
+            var index = layer.confirm('确定要获取吗？', function (index) {
+                //监听提交
+                iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                    var field = data.field; //获取提交的字段
+                    var userdata = "";
+                    for (var prop in field) {
+                        userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                    }
+                    //提交 Ajax 成功后，静态更新表格中的数据
+                    //$.ajax({});
+
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/TradeRecord/GetSimTradePost?r=" + Math.random(1),
+                        data: userdata,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index); //关闭弹层
+                            if (data == "success") {
+                                layer.msg("提交成功");
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            });
+        }
+    };
+
+    $('.layui-btn').on('click', function () {
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+    });
+});

wwwroot/layuiadmin/modules_main/TradeRecord_Admin.js

@@ -306,6 +306,19 @@ layui.config({
             }
         });
     });
+
+    // form.on('submit(LAY-list-front-searchsim)', function (data) {
+    //     var field = data.field;
+
+    //     //执行重载
+    //     table.reload('LAY-list-managesim', {
+    //         where: field,
+    //         page: {
+    //             curr: 1
+    //         }
+    //     });
+    // });
+
     form.on('submit(LAY-list-front-searchall)', function (data) {
         table.reload('LAY-list-manage', {
             where: null,
@@ -498,7 +511,7 @@ layui.config({
                     submit.trigger('click');
                 }
             });
-        }        
+        }
         , ImportTrade: function () {
             // var perContent = layer.open({
             //     type: 2,