暂存

Areas/Admin/Controllers/OperateServer/AmountRecordOperateController.cs

@@ -26,6 +26,7 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public AmountRecordOperateController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
+            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["OpSqlConnStr"].ToString();
         }
 
         #region 运营中心额度变动明细记录列表
@@ -55,11 +56,11 @@ namespace MySystem.Areas.Admin.Controllers
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            string condition = condition = " and Status>-1";
+            string condition = " and Status>-1";
             //创客编号
             if (!string.IsNullOrEmpty(MakerCode))
             {
-                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + MakerCode + "')";
+                condition += " and UserId in (select UserId from SysAdmin where MakerCode='" + MakerCode + "')";
             }
             //运营中心编号
             if (!string.IsNullOrEmpty(OpCode))
@@ -115,20 +116,15 @@ namespace MySystem.Areas.Admin.Controllers
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-                int UId = int.Parse(dic["UserId"].ToString());
-                SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == UId) ?? new SysAdmin();
+                int UserId = int.Parse(dic["UserId"].ToString());
+                SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.UserId == UserId) ?? new SysAdmin();
                 dic["OpCode"] = sysAdmin.OpCode;
                 dic["MakerCode"] = sysAdmin.MakerCode;
                 dic["MakerName"] = sysAdmin.MakerName;
-                int ProductType = int.Parse(dic["ProductType"].ToString());
-                dic["ProductTypeName"] = RelationClass.GetKqProductBrandInfo(ProductType);
-                int ChangeType = int.Parse(dic["ChangeType"].ToString());
-                dic["ChangeTypeName"] = RelationClassForConst.GetChangeTypeInfo(ChangeType);
-
-                //获得盟主5元奖励的机具Sn
-                int SnId = int.Parse(dic["QueryCount"].ToString());
-                var pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == SnId) ?? new Models.PosMachinesTwo();
-                dic["PosSn"] = pos.PosSn;
+                int OperateType = int.Parse(dic["OperateType"].ToString());
+                dic["OperateTypeName"] = "";
+                if (OperateType == 1) dic["OperateTypeName"] = "收入";
+                if (OperateType == 2) dic["OperateTypeName"] = "支出";
             }
             return Json(obj);
         }

Areas/Admin/Views/OperateServer/AmountRecordOperate/Index.cshtml

@@ -81,7 +81,7 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/UserAccountRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/layuiadmin/modules_operate/AmountRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
     </script>
 </body>

wwwroot/layuiadmin/modules_operate/AmountRecord_Admin.js

@@ -2,7 +2,7 @@ var ExcelData;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
-        url: "/Admin/AmountRecord/Import?r=" + Math.random(1),
+        url: "/Admin/AmountRecordOperate/Import?r=" + Math.random(1),
         data: "ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),
         dataType: "text",
         success: function (data) {
@@ -76,7 +76,7 @@ layui.config({
         if (field == "Sort") {
             $.ajax({
                 type: "POST",
-                url: "/Admin/AmountRecord/Sort?r=" + Math.random(1),
+                url: "/Admin/AmountRecordOperate/Sort?r=" + Math.random(1),
                 data: "Id=" + data.Id + "&Sort=" + value,
                 dataType: "text",
                 success: function (data) {
@@ -88,24 +88,19 @@ layui.config({
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
-        , url: '/Admin/AmountRecord/IndexData' //模拟接口
+        , url: '/Admin/AmountRecordOperate/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
             , { field: 'OpCode', width: 105, title: '运营中心编号', sort: true }
             , { field: 'MakerCode', width: 105, title: '创客编号', sort: true }
-            , { field: 'RealName', width: 105, title: '创客姓名', sort: true }
-            , { field: 'ChangeAmount', width: 110, title: '交易金额', sort: true }
+            , { field: 'MakerName', width: 105, title: '创客姓名', sort: true }
             , { field: 'SeoDescription', width: 100, title: '备注', sort: true }
-            , { field: 'BeforeTotalAmount', width: 130, title: '交易前总金额', sort: true }
-            , { field: 'AfterTotalAmount', width: 130, title: '交易后总金额', sort: true }
-            , { field: 'BeforeFreezeAmount', width: 150, title: '交易前冻结金额', sort: true }
-            , { field: 'AfterFreezeAmount', width: 150, title: '交易后冻结金额', sort: true }
-            , { field: 'BeforeBalanceAmount', width: 120, title: '交易前余额', sort: true }
-            , { field: 'AfterBalanceAmount', width: 120, title: '交易后余额', sort: true }
+            , { field: 'UseAmount', width: 110, title: '交易金额', sort: true }
+            , { field: 'BeforeAmount', width: 130, title: '交易前总金额', sort: true }
+            , { field: 'AfterAmount', width: 130, title: '交易后总金额', sort: true }
             , { field: 'CreateDate', width: 110, title: '交易时间', sort: true }
         ]]
         , where: {
-            UserId: UserId
         }
         , page: true
         , limit: 30
@@ -123,7 +118,7 @@ layui.config({
             var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
                 $.ajax({
                     type: "POST",
-                    url: "/Admin/AmountRecord/Delete?r=" + Math.random(1),
+                    url: "/Admin/AmountRecordOperate/Delete?r=" + Math.random(1),
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
@@ -171,7 +166,7 @@ layui.config({
 
                         $.ajax({
                             type: "POST",
-                            url: "/Admin/AmountRecord/Edit?r=" + Math.random(1),
+                            url: "/Admin/AmountRecordOperate/Edit?r=" + Math.random(1),
                             data: userdata,
                             dataType: "text",
                             success: function (data) {
@@ -202,13 +197,17 @@ layui.config({
 
         //执行重载
         table.reload('LAY-list-manage', {
-            where: field
+            where: field,
+            page: {
+                curr: 1
+            }
         });
     });
     form.on('submit(LAY-list-front-searchall)', function (data) {
         table.reload('LAY-list-manage', {
-            where: {
-                UserId: UserId
+            where: null,
+            page: {
+                curr: 1
             }
         });
     });
@@ -229,7 +228,7 @@ layui.config({
                 var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
                     $.ajax({
                         type: "POST",
-                        url: "/Admin/AmountRecord/Delete?r=" + Math.random(1),
+                        url: "/Admin/AmountRecordOperate/Delete?r=" + Math.random(1),
                         data: "Id=" + ids,
                         dataType: "text",
                         success: function (data) {
@@ -278,7 +277,7 @@ layui.config({
 
                         $.ajax({
                             type: "POST",
-                            url: "/Admin/AmountRecord/Add?r=" + Math.random(1),
+                            url: "/Admin/AmountRecordOperate/Add?r=" + Math.random(1),
                             data: userdata,
                             dataType: "text",
                             success: function (data) {
@@ -318,7 +317,7 @@ layui.config({
             });
             $.ajax({
                 type: "GET",
-                url: "/Admin/AmountRecord/ExportExcel?r=" + Math.random(1),
+                url: "/Admin/AmountRecordOperate/ExportExcel?r=" + Math.random(1),
                 data: userdata,
                 dataType: "json",
                 success: function (data) {
@@ -341,7 +340,7 @@ layui.config({
                 var index = layer.confirm('确定要开启吗？', function (index) {
                     $.ajax({
                         type: "POST",
-                        url: "/Admin/AmountRecord/Open?r=" + Math.random(1),
+                        url: "/Admin/AmountRecordOperate/Open?r=" + Math.random(1),
                         data: "Id=" + ids,
                         dataType: "text",
                         success: function (data) {
@@ -370,7 +369,7 @@ layui.config({
                 var index = layer.confirm('确定要关闭吗？', function (index) {
                     $.ajax({
                         type: "POST",
-                        url: "/Admin/AmountRecord/Close?r=" + Math.random(1),
+                        url: "/Admin/AmountRecordOperate/Close?r=" + Math.random(1),
                         data: "Id=" + ids,
                         dataType: "text",
                         success: function (data) {