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

判断后台推荐奖励标记

lichunlei 4 лет назад
Родитель
Сommit
b118dce458

+ 1 - 1
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1476,7 +1476,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
             {
                 string IsGet = "未发放";
                 string IsGet = "未发放";
                 int ToUserId = 0;
                 int ToUserId = 0;
-                UserAccountRecord item = db.UserAccountRecord.FirstOrDefault(m => m.QueryCount == order.Id);
+                UserAccountRecord item = db.UserAccountRecord.FirstOrDefault(m => m.QueryCount == order.Id && m.ChangeType == 112);
                 if (item == null)
                 if (item == null)
                 {
                 {
                     DateTime start = order.PayDate.Value.AddMinutes(-2);
                     DateTime start = order.PayDate.Value.AddMinutes(-2);

+ 2 - 0
wwwroot/layuiadmin/modules_main/PosMachinesTwo_Admin.js

@@ -75,7 +75,9 @@ layui.config({
             ,{field:'PosSnType', width: 200, title:'机具类型', sort: true}
             ,{field:'PosSnType', width: 200, title:'机具类型', sort: true}
             ,{field:'DeviceType', width: 200, title:'设备类型', sort: true}
             ,{field:'DeviceType', width: 200, title:'设备类型', sort: true}
             ,{field:'BindingState', width: 200, title:'绑定状态', sort: true}
             ,{field:'BindingState', width: 200, title:'绑定状态', sort: true}
+            ,{field:'BindingTime', width: 200, title:'绑定时间', sort: true}
             , { field: 'ActivationState', width: 200, title: '激活状态', sort: true }
             , { field: 'ActivationState', width: 200, title: '激活状态', sort: true }
+            , { field: 'ActivationTime', width: 200, title: '激活时间', sort: true }
             , { title: '操作', width: 100, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
             , { title: '操作', width: 100, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         ]]
         , where: {
         , where: {