取消导激活表格，基础套餐的限制

更改到激活模板表格的链接

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -421,45 +421,42 @@ namespace MySystem.Areas.Admin.Controllers
                 string AccountName = dr["账号姓名"].ToString();
                 string SimNo = dr["Sim卡卡号（ICCID）"].ToString();
 
-                if(ProductType == "基础套餐")
+                bool checkMer = db.PosMerchantInfo.Any(m => m.KqMerNo == PhoneNumber);
+                if (!checkMer)
                 {
-                    bool checkMer = db.PosMerchantInfo.Any(m => m.KqMerNo == PhoneNumber);
-                    if (!checkMer)
+                    spdb.BindRecord.Add(new SpModels.BindRecord()
                     {
-                        spdb.BindRecord.Add(new SpModels.BindRecord()
-                        {
-                            CreateDate = DateTime.Parse(CreateDate),
-                            UpdateTime = DateTime.Parse(CreateDate), //机具绑定、解绑时间
-                            CreateTime = DateTime.Parse(CreateDate), //商户操作时间
-                            MerNewSnNo = PhoneNumber, //商户手机号
-                            MerSnNo = SimNo, //序列号
-                            MerName = AccountName, //商户名称
-                            MerNo = PhoneNumber, //商户编号
-                            Remark = ProductType,
-                            Field1 = Province,
-                            Field2 = ActiveName,
-                            Field3 = ProductName,
-                            Field4 = WorkNo,
-                            Field5 = ActStatus,
-                            SeoTitle = ActualAmount,
-                            ProductType = "14",
-                            Status = 1,
-                        });
-
-                        spdb.Merchants.Add(new SpModels.Merchants()
-                        {
-                            SnNo = SimNo,
-                            CreateTime = DateTime.Parse(CreateDate),
-                            UpdateTime = DateTime.Parse(CreateDate),
-                            AgentName = AccountName,
-                            MerRealName = AccountName,
-                            MerMobile = PhoneNumber,
-                            MerNo = PhoneNumber,
-                            MerName = AccountName,
-                            ProductType = "14",
-                            Status = 1,
-                        });
-                    }
+                        CreateDate = DateTime.Parse(CreateDate),
+                        UpdateTime = DateTime.Parse(CreateDate), //机具绑定、解绑时间
+                        CreateTime = DateTime.Parse(CreateDate), //商户操作时间
+                        MerNewSnNo = PhoneNumber, //商户手机号
+                        MerSnNo = SimNo, //序列号
+                        MerName = AccountName, //商户名称
+                        MerNo = PhoneNumber, //商户编号
+                        Remark = ProductType,
+                        Field1 = Province,
+                        Field2 = ActiveName,
+                        Field3 = ProductName,
+                        Field4 = WorkNo,
+                        Field5 = ActStatus,
+                        SeoTitle = ActualAmount,
+                        ProductType = "14",
+                        Status = 1,
+                    });
+
+                    spdb.Merchants.Add(new SpModels.Merchants()
+                    {
+                        SnNo = SimNo,
+                        CreateTime = DateTime.Parse(CreateDate),
+                        UpdateTime = DateTime.Parse(CreateDate),
+                        AgentName = AccountName,
+                        MerRealName = AccountName,
+                        MerMobile = PhoneNumber,
+                        MerNo = PhoneNumber,
+                        MerName = AccountName,
+                        ProductType = "14",
+                        Status = 1,
+                    });
                 }
 
                 // spdb.TradeRecord.Add(new SpModels.TradeRecord()

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

@@ -37,7 +37,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">模板下载</label>
                             <div class="layui-form-mid layui-word-aux" id="excelTemp">
-                                <a href="https://kexiaoshuang.oss-cn-chengdu.aliyuncs.com/ExcelTmplate/default.xlsx">点击下载入库模版</a>
+                                <a href="https://kexiaoshuang.oss-cn-chengdu.aliyuncs.com/ExcelTmplate/%E5%B9%BF%E7%94%B5%E5%8D%A1%E6%BF%80%E6%B4%BB%E8%A1%A8%E6%A0%BC%E6%A8%A1%E6%9D%BF.xlsx">点击下载入库模版</a>
                             </div>
                         </div>
                         <div class="layui-form-item">

Startup.cs

@@ -167,10 +167,10 @@ namespace MySystem
         private void initMainServer(string Env)
         {
             string dbName = "KxsMainServer";
-            if(Env == "Production")
-            {
-                dbName = "KxsProfitServer";
-            }
+            // if(Env == "Production")
+            // {
+            //     dbName = "KxsProfitServer";
+            // }
             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 = '" + dbName + "'");

wwwroot/layuiadmin/modules_main/TradeRecord_Admin.js

@@ -356,7 +356,7 @@ layui.config({
         , Import: function () {
             var perContent = layer.open({
                 type: 2,
-                title: '导交易',
+                title: '导激活',
                 content: 'Import',
                 maxmin: true,
                 area: ['650px', '350px'],
@@ -395,6 +395,52 @@ layui.config({
                         });
                     });
 
+                    submit.trigger('click');
+                }
+            });
+        }        
+        , ImportTrade: function () {
+            var perContent = layer.open({
+                type: 2,
+                title: '导交易',
+                content: 'ImportTrade',
+                maxmin: true,
+                area: ['650px', '350px'],
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index],
+                        submitID = 'LAY-list-front-submit',
+                        submit = layero.find('iframe').contents().find('#' + submitID);
+
+
+                    //监听提交
+                    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({});
+                        var loadindex = layer.load(1, {
+                            shade: [0.5, '#000']
+                        });
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/TradeRecord/ImportTradePost?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                layer.close(loadindex);
+                                if (data == 'success') {
+                                    layer.msg('导入成功');
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
                     submit.trigger('click');
                 }
             });