Главная Обзор Помощь
Регистрация Вход
lichunlei
/
kxs-admin
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

添加奖励返现逻辑日志查询功能

lcl 2 лет назад
Родитель
0453f4e9cd
Сommit
6434845926
7 измененных файлов с 411 добавлено и 0 удалено
Разделённый вид Показать статистику Diff
  1. 84 0
      Areas/Admin/Controllers/MainServer/PrizeFlowRecordController.cs
  2. 88 0
      Areas/Admin/Views/MainServer/PrizeFlowRecord/Index.cshtml
  3. 1 0
      Models/LeaderReserveRecord.cs
  4. 5 0
      Models/PosFeeWarningRecord.cs
  5. 22 0
      Models/PrizeFlowRecord.cs
  6. 100 0
      Models/WebCMSEntities.cs
  7. 111 0
      wwwroot/layuiadmin/modules_main/PrizeFlowRecord_Admin.js

+ 84 - 0
Areas/Admin/Controllers/MainServer/PrizeFlowRecordController.cs
Просмотреть файл 

@@ -0,0 +1,84 @@
 
+/*

+ * 奖励返现逻辑日志

+ */

+

+using System;

+using System.Web;

+using System.Collections.Generic;

+using System.Diagnostics;

+using System.Linq;

+using System.Threading.Tasks;

+using Microsoft.AspNetCore.Mvc;

+using Microsoft.AspNetCore.Http;

+using Microsoft.Extensions.Logging;

+using Microsoft.Extensions.Options;

+using MySystem.Models;

+using Library;

+using LitJson;

+using MySystemLib;

+

+namespace MySystem.Areas.Admin.Controllers

+{

+    [Area("Admin")]

+    [Route("Admin/[controller]/[action]")]

+    public class PrizeFlowRecordController : BaseController

+    {

+        public PrizeFlowRecordController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)

+        {

+            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();

+        }

+

+        #region 奖励返现逻辑日志列表

+

+        /// <summary>

+        /// 根据条件查询奖励返现逻辑日志列表

+        /// </summary>

+        /// <returns></returns>

+        public IActionResult Index(PrizeFlowRecord data, string right)

+        {

+            ViewBag.RightInfo = RightInfo;

+            ViewBag.right = right;

+

+            return View();

+        }

+

+        #endregion

+

+        #region 根据条件查询奖励返现逻辑日志列表

+

+        /// <summary>

+        /// 奖励返现逻辑日志列表

+        /// </summary>

+        /// <returns></returns>

+        public JsonResult IndexData(PrizeFlowRecord data, int page = 1, int limit = 30)

+        {

+

+            Dictionary<string, string> Fields = new Dictionary<string, string>();

+

+            string condition = "";

+            if (!string.IsNullOrEmpty(data.CodeNumber))

+            {

+                condition += " and CodeNumber like '%" + data.CodeNumber + "%'";

+            }

+            if (data.Kind > 0)

+            {

+                condition += " and Kind=" + data.Kind;

+            }

+

+            List<KqProducts> BrandList = db.KqProducts.ToList();

+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PrizeFlowRecord", Fields, "Id desc", "0", page, limit, condition);

+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;

+            foreach (Dictionary<string, object> dic in diclist)

+            {

+                int Kind = int.Parse(dic["Kind"].ToString());

+                if(Kind == 1) dic["KindName"] = "机具";

+                if(Kind == 2) dic["KindName"] = "订单";

+            }

+            return Json(obj);

+        }

+

+        #endregion

+

+

+    }

+}

+ 88 - 0
Areas/Admin/Views/MainServer/PrizeFlowRecord/Index.cshtml
Просмотреть файл 

@@ -0,0 +1,88 @@
 
+@using MySystem.Models;

+@{

+    string RightInfo = ViewBag.RightInfo as string;

+    string right = ViewBag.right as string;

+}

+<!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: 85px !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">

+                            <select id="DoStatus" name="DoStatus" lay-search="">

+                                <option value="">全部...</option>

+                                <option value="1">机具</option>

+                                <option value="2">订单</option>

+                            </select>

+                        </div>

+                    </div>

+                    <div class="layui-inline">

+                        <label class="layui-form-label">机具号/订单号</label>

+                        <div class="layui-input-inline">

+                            <input class="layui-input" type="text" name="CodeNumber" autocomplete="off">

+                        </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" lay-submit lay-filter="LAY-list-front-searchall">

+                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部

+                        </button>

+                    </div>

+                </div>

+            </div>

+

+            <div class="layui-card-body">

+                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>

+            </div>

+        </div>

+    </div>

+

+    <script src="/layuiadmin/layui/layui.js"></script>

+    <script src="/layuiadmin/modules_main/PrizeFlowRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>

+    <script>

+

+    </script>

+</body>

+

+</html>

+ 1 - 0
Models/LeaderReserveRecord.cs
Просмотреть файл 

@@ -26,5 +26,6 @@ namespace MySystem.Models
 
         public int UserId { get; set; }
 
         public int AccountRecordId { get; set; }
 
         public decimal UsedReserve { get; set; }
 
+        public int SmallLeaderUserId { get; set; }
 
     }
 
 }

+ 5 - 0
Models/PosFeeWarningRecord.cs
Просмотреть файл 

@@ -11,6 +11,9 @@ namespace MySystem.Models
 
         public int Version { get; set; }
 
         public DateTime? CreateDate { get; set; }
 
         public DateTime? UpdateDate { get; set; }
 
+        public string SeoTitle { get; set; }
 
+        public string SeoKeyword { get; set; }
 
+        public string SeoDescription { get; set; }
 
         public decimal DownFee { get; set; }
 
         public ulong DownFeeFlag { get; set; }
 
         public ulong UpFeeFlag { get; set; }
 
@@ -19,5 +22,7 @@ namespace MySystem.Models
 
         public string PosSn { get; set; }
 
         public int BrandId { get; set; }
 
         public int PosId { get; set; }
 
+        public int QueryCount { get; set; }
 
+        public DateTime? DoDate { get; set; }
 
     }
 
 }

+ 22 - 0
Models/PrizeFlowRecord.cs
Просмотреть файл 

@@ -0,0 +1,22 @@
 
+using System;
 
+using System.Collections.Generic;
 
+
 
+namespace MySystem.Models
 
+{
 
+    public partial class PrizeFlowRecord
 
+    {
 
+        public int Id { get; set; }
 
+        public int Sort { get; set; }
 
+        public int Status { get; set; }
 
+        public int Version { get; set; }
 
+        public DateTime? CreateDate { get; set; }
 
+        public DateTime? UpdateDate { get; set; }
 
+        public string Detail { get; set; }
 
+        public string CodeNumber { get; set; }
 
+        public int Kind { get; set; }
 
+        public int QueryCount { get; set; }
 
+        public string SeoTitle { get; set; }
 
+        public string SeoKeyword { get; set; }
 
+        public string SeoDescription { get; set; }
 
+    }
 
+}

+ 100 - 0
Models/WebCMSEntities.cs
Просмотреть файл 

@@ -157,6 +157,7 @@ namespace MySystem.Models
 
         public virtual DbSet<PosMerchantTradeSummay> PosMerchantTradeSummay { get; set; }
 
         public virtual DbSet<PreAmountRecord> PreAmountRecord { get; set; }
 
         public virtual DbSet<PreSendStockDetail> PreSendStockDetail { get; set; }
 
+        public virtual DbSet<PrizeFlowRecord> PrizeFlowRecord { get; set; }
 
         public virtual DbSet<ProductComment> ProductComment { get; set; }
 
         public virtual DbSet<ProductCommentAgree> ProductCommentAgree { get; set; }
 
         public virtual DbSet<ProductFareAreas> ProductFareAreas { get; set; }
 
@@ -276,6 +277,7 @@ namespace MySystem.Models
 
         public virtual DbSet<UserExchangeLeaderRecord> UserExchangeLeaderRecord { get; set; }
 
         public virtual DbSet<UserFamilyMember> UserFamilyMember { get; set; }
 
         public virtual DbSet<UserForMakerCode> UserForMakerCode { get; set; }
 
+        public virtual DbSet<UserForMakerCodeBak> UserForMakerCodeBak { get; set; }
 
         public virtual DbSet<UserForMobile> UserForMobile { get; set; }
 
         public virtual DbSet<UserForRealName> UserForRealName { get; set; }
 
         public virtual DbSet<UserFriend> UserFriend { get; set; }
 
@@ -5367,6 +5369,10 @@ namespace MySystem.Models
 
                     .HasCharSet("utf8")
 
                     .HasCollation("utf8_general_ci");
 
 
+                entity.Property(e => e.SmallLeaderUserId)
 
+                    .HasColumnType("int(11)")
 
+                    .HasComment("小盟主创客Id");
 
+
 
                 entity.Property(e => e.Sort).HasColumnType("int(11)");
 
 
                 entity.Property(e => e.SourceUserId).HasColumnType("int(11)");
 
@@ -10133,6 +10139,10 @@ namespace MySystem.Models
 
                     .HasColumnType("datetime")
 
                     .HasComment("创建时间");
 
 
+                entity.Property(e => e.DoDate)
 
+                    .HasColumnType("datetime")
 
+                    .HasComment("执行时间");
 
+
 
                 entity.Property(e => e.DownFee)
 
                     .HasColumnType("decimal(18,2)")
 
                     .HasComment("费率调降值");
 
@@ -10152,6 +10162,23 @@ namespace MySystem.Models
 
                     .HasCharSet("utf8")
 
                     .HasCollation("utf8_general_ci");
 
 
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
+
 
+                entity.Property(e => e.SeoDescription)
 
+                    .HasColumnType("varchar(500)")
 
+                    .HasCharSet("utf8")
 
+                    .HasCollation("utf8_general_ci");
 
+
 
+                entity.Property(e => e.SeoKeyword)
 
+                    .HasColumnType("varchar(200)")
 
+                    .HasCharSet("utf8")
 
+                    .HasCollation("utf8_general_ci");
 
+
 
+                entity.Property(e => e.SeoTitle)
 
+                    .HasColumnType("varchar(100)")
 
+                    .HasCharSet("utf8")
 
+                    .HasCollation("utf8_general_ci");
 
+
 
                 entity.Property(e => e.Sort)
 
                     .HasColumnType("int(11)")
 
                     .HasComment("排序序号");
 
@@ -11051,6 +11078,66 @@ namespace MySystem.Models
 
                     .HasComment("预扣标记");
 
             });
 
 
+            modelBuilder.Entity<PrizeFlowRecord>(entity =>
 
+            {
 
+                entity.HasComment("奖励返现流程记录表");
 
+
 
+                entity.Property(e => e.Id).HasColumnType("int(11)");
 
+
 
+                entity.Property(e => e.CodeNumber)
 
+                    .HasColumnType("varchar(50)")
 
+                    .HasComment("订单号或SN")
 
+                    .HasCharSet("utf8")
 
+                    .HasCollation("utf8_general_ci");
 
+
 
+                entity.Property(e => e.CreateDate)
 
+                    .HasColumnType("datetime")
 
+                    .HasComment("创建时间");
 
+
 
+                entity.Property(e => e.Detail)
 
+                    .HasColumnType("varchar(200)")
 
+                    .HasComment("描述")
 
+                    .HasCharSet("utf8")
 
+                    .HasCollation("utf8_general_ci");
 
+
 
+                entity.Property(e => e.Kind)
 
+                    .HasColumnType("int(11)")
 
+                    .HasComment("分类");
 
+
 
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
+
 
+                entity.Property(e => e.SeoDescription)
 
+                    .HasColumnType("varchar(500)")
 
+                    .HasCharSet("utf8")
 
+                    .HasCollation("utf8_general_ci");
 
+
 
+                entity.Property(e => e.SeoKeyword)
 
+                    .HasColumnType("varchar(200)")
 
+                    .HasCharSet("utf8")
 
+                    .HasCollation("utf8_general_ci");
 
+
 
+                entity.Property(e => e.SeoTitle)
 
+                    .HasColumnType("varchar(100)")
 
+                    .HasCharSet("utf8")
 
+                    .HasCollation("utf8_general_ci");
 
+
 
+                entity.Property(e => e.Sort)
 
+                    .HasColumnType("int(11)")
 
+                    .HasComment("排序序号");
 
+
 
+                entity.Property(e => e.Status)
 
+                    .HasColumnType("int(11)")
 
+                    .HasComment("状态");
 
+
 
+                entity.Property(e => e.UpdateDate)
 
+                    .HasColumnType("datetime")
 
+                    .HasComment("修改时间");
 
+
 
+                entity.Property(e => e.Version)
 
+                    .HasColumnType("int(11)")
 
+                    .HasComment("版本号");
 
+            });
 
+
 
             modelBuilder.Entity<ProductComment>(entity =>
 
             {
 
                 entity.HasComment("商品评价");
 
@@ -19600,6 +19687,19 @@ namespace MySystem.Models
 
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
 
             });
 
 
+            modelBuilder.Entity<UserForMakerCodeBak>(entity =>
 
+            {
 
+                entity.HasKey(e => e.MakerCode)
 
+                    .HasName("PRIMARY");
 
+
 
+                entity.Property(e => e.MakerCode)
 
+                    .HasColumnType("varchar(30)")
 
+                    .HasCharSet("utf8")
 
+                    .HasCollation("utf8_general_ci");
 
+
 
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
 
+            });
 
+
 
             modelBuilder.Entity<UserForMobile>(entity =>
 
             {
 
                 entity.HasKey(e => e.Mobile)

+ 111 - 0
wwwroot/layuiadmin/modules_main/PrizeFlowRecord_Admin.js
Просмотреть файл 

@@ -0,0 +1,111 @@
 
+var ExcelData, ExcelKind;

+function ConfirmImport() {

+    $.ajax({

+        type: "POST",

+        url: "/Admin/PrizeFlowRecord/Import?r=" + Math.random(1),

+        data: "ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),

+        dataType: "text",

+        success: function (data) {

+            if (data == "success") {

+                layer.msg("导入成功", { time: 2000 }, function () {

+                    window.location.reload();

+                });

+            } else {

+                layer.msg(data);

+            }

+        }

+    });

+}

+

+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;

+

+    //- 筛选条件-日期

+    

+

+    //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; //得到字段

+    });

+

+    //列表数据

+    table.render({

+        elem: '#LAY-list-manage'

+        , url: '/Admin/PrizeFlowRecord/IndexData' //模拟接口

+        , cols: [[

+            { type: 'checkbox', fixed: 'left' }

+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }

+            , { field: 'KindName', width: 200, title: '来源类型', sort: true }

+            , { field: 'CodeNumber', width: 200, title: '机具号/订单号', sort: true }

+            , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }

+            , { field: 'Detail', width: 600, title: '描述', sort: true }

+        ]]

+        , where: {

+

+        }

+        , page: true

+        , limit: 30

+        , height: 'full-220'

+        , text: '对不起，加载出现异常！'

+        , done: function (res, curr, count) {

+            $(".layui-none").text("无数据");

+        }

+    });

+

+    //监听工具条

+    table.on('tool(LAY-list-manage)', function (obj) {

+        var data = obj.data;

+        

+    });

+

+

+    //监听搜索

+    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-searchall)', function (data) {

+        table.reload('LAY-list-manage', {

+            where: null,

+            page: {

+                curr: 1

+            }

+        });

+    });

+

+    //事件

+    var active = {

+        

+    };

+

+    $('.layui-btn').on('click', function () {

+        var type = $(this).data('type');

+        active[type] ? active[type].call(this) : '';

+    });

+});