Просмотр исходного кода

导入交易计数,设置欠费和注销状态

lcl 2 лет назад
Родитель
Сommit
1f0d9f49f5

+ 17 - 4
Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -522,6 +522,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// <param name="ExcelData"></param>
         public string ImportTradePost(string ExcelPath)
         {
+            int DoCount = 0;
             string FullExcelPath = function.getPath(ExcelPath);
             FullExcelPath = FullExcelPath.Replace("//", "/");
             DataTable list = new PublicFunction().ExcelToDataTable(FullExcelPath);
@@ -589,8 +590,8 @@ namespace MySystem.Areas.Admin.Controllers
                 string OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
                 decimal TotalAmountNum = decimal.Parse(function.CheckNum(numberString: TotalAmount));
                 DateTime CreateDate = DateTime.Parse(OrderCreateTime);
-
-                if(CreateDate < DateTime.Now.AddMonths(-3)) op = false;
+                DateTime CheckDate = DateTime.Now.AddMonths(-3);
+                if(DateTime.Parse(CreateDate.ToString("yyyy-MM") + "-01 00:00:00") >= DateTime.Parse(CheckDate.ToString("yyyy-MM") + "-01 00:00:00")) op = false;
                 if(OrderStatus == "待激活") op = false;
                 if(UserStatus == "已注销" || UserStatus.Contains("欠费"))
                 {
@@ -605,6 +606,16 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                         db.SaveChanges();
                     }
+                    PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SimNo);
+                    if(pos != null)
+                    {
+                        pos.Status = -1;
+                        if(UserStatus.Contains("欠费"))
+                        {
+                            pos.Status = -2;
+                        }
+                        db.SaveChanges();
+                    }
                 }
                 if(UserStatus == "正常")
                 {
@@ -615,7 +626,7 @@ namespace MySystem.Areas.Admin.Controllers
                         db.SaveChanges();
                     }
                 }
-
+                
                 if(TotalAmountNum > 0 && op)
                 {
                     spdb.TradeRecord.Add(new SpModels.TradeRecord()
@@ -641,10 +652,12 @@ namespace MySystem.Areas.Admin.Controllers
                     });
 
                     spdb.SaveChanges();
+
+                    DoCount += 1;
                 }
             }
             AddSysLog("0", "TradeRecord", "Import");
-            return "success";
+            return "success|" + DoCount;
         }
         #endregion
 

+ 1 - 1
Areas/Admin/Views/MainServer/TradeRecord/ImportTrade.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/">点击下载入库模版</a>
+                                <a href="https://kexiaoshuang.oss-cn-chengdu.aliyuncs.com/ExcelTmplate/%E5%B9%BF%E7%94%B5%E5%8D%A1%E4%BA%A4%E6%98%93%E8%A1%A8%E6%A0%BC%E6%A8%A1%E6%9D%BF.xlsx">点击下载入库模版</a>
                             </div>
                         </div>
                         <div class="layui-form-item">

+ 4 - 4
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 + "'");

+ 3 - 2
wwwroot/layuiadmin/modules_main/TradeRecord_Admin.js

@@ -452,8 +452,9 @@ layui.config({
                             dataType: "text",
                             success: function (data) {
                                 layer.close(loadindex);
-                                if (data == 'success') {
-                                    layer.msg('导入成功');
+                                if (data.indexOf('success') == 0) {
+                                    var count = data.split('|')[1];
+                                    layer.msg('成功导入' + count + '条');
                                 } else {
                                     layer.msg(data);
                                 }