流量卡分佣和抽奖红包奖励添加至创客账户详细功能板块

调整部分列表样式，不显示顶级创客编码和名称

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -127,8 +127,9 @@ namespace MySystem.Areas.Admin.Controllers
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
             
-            string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount6 = "0.00", ChangeTypeAmount61 = "0.00", ChangeTypeAmount62 = "0.00", ChangeTypeAmount63 = "0.00", ChangeTypeAmount64 = "0.00", ChangeTypeAmount50 = "0.00", ChangeTypeAmount111 = "0.00", ChangeTypeAmount112 = "0.00";
-            DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)),sum(if(ChangeType=1, ChangeAmount, 0)),sum(if(ChangeType=2, ChangeAmount, 0)),sum(if(ChangeType=6, ChangeAmount, 0)),sum(if(ChangeType=61, ChangeAmount, 0)),sum(if(ChangeType=62, ChangeAmount, 0)),sum(if(ChangeType=63, ChangeAmount, 0)),sum(if(ChangeType=64, ChangeAmount, 0)),sum(if(ChangeType=50, ChangeAmount, 0)),sum(if(ChangeType=111, ChangeAmount, 0)),sum(if(ChangeType=112, ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
+            string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount6 = "0.00", ChangeTypeAmount61 = "0.00", ChangeTypeAmount62 = "0.00", ChangeTypeAmount63 = "0.00", ChangeTypeAmount64 = "0.00", ChangeTypeAmount50 = "0.00", ChangeTypeAmount111 = "0.00", ChangeTypeAmount112 = "0.00", ChangeTypeAmount60 = "0.00", ChangeTypeAmount31 = "0.00";
+            DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)),sum(if(ChangeType=1, ChangeAmount, 0)),sum(if(ChangeType=2, ChangeAmount, 0)),sum(if(ChangeType=6, ChangeAmount, 0)),sum(if(ChangeType=61, ChangeAmount, 0)),sum(if(ChangeType=62, ChangeAmount, 0)),sum(if(ChangeType=63, ChangeAmount, 0)),sum(if(ChangeType=64, ChangeAmount, 0)),sum(if(ChangeType=50, ChangeAmount, 0)),sum(if(ChangeType=111, ChangeAmount, 0)),sum(if(ChangeType=112, ChangeAmount, 0)),sum(if(ChangeType=60, ChangeAmount, 0)),sum(if(ChangeType=31, ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
+            DataTable dts = OtherMySqlConn.dtable("select SUM(FluxProfitAmt) from FluxProfitDetail where ");
             if(dt.Rows.Count > 0)
             {
                 ChangeTypeAmount0 = dt.Rows[0][0].ToString();
@@ -142,6 +143,8 @@ namespace MySystem.Areas.Admin.Controllers
                 ChangeTypeAmount50 = dt.Rows[0][8].ToString();
                 ChangeTypeAmount111 = dt.Rows[0][9].ToString();
                 ChangeTypeAmount112 = dt.Rows[0][10].ToString();
+                ChangeTypeAmount60 = dt.Rows[0][11].ToString();
+                ChangeTypeAmount31 = dt.Rows[0][12].ToString();
             }
             other.Add("ChangeTypeAmount0", ChangeTypeAmount0); //激活奖励
             other.Add("ChangeTypeAmount1", ChangeTypeAmount1); //交易分润
@@ -154,6 +157,8 @@ namespace MySystem.Areas.Admin.Controllers
             other.Add("ChangeTypeAmount50", ChangeTypeAmount50); //开机奖励
             other.Add("ChangeTypeAmount111", ChangeTypeAmount111); //分润补贴
             other.Add("ChangeTypeAmount112", ChangeTypeAmount112); //推荐奖励
+            other.Add("ChangeTypeAmount60", ChangeTypeAmount60); //流量卡分佣
+            other.Add("ChangeTypeAmount31", ChangeTypeAmount31); //红包奖励
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Views/MainServer/UserAccountRecord/Index.cshtml

@@ -141,7 +141,7 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
-                    激活奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount0">0.00</span>　|　交易分润(元)：<span style="color: #f00;" id="ChangeTypeAmount1">0.00</span>　|　创客开机奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount50">0.00</span>　|　分润补贴(元)：<span style="color: #f00;" id="ChangeTypeAmount111">0.00</span>　|直推奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount112">0.00</span>
+                    激活奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount0">0.00</span>　|　交易分润(元)：<span style="color: #f00;" id="ChangeTypeAmount1">0.00</span>　|　创客开机奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount50">0.00</span>　|　分润补贴(元)：<span style="color: #f00;" id="ChangeTypeAmount111">0.00</span>　|直推奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount112">0.00</span>　|流量卡分佣(元)：<span style="color: #f00;" id="ChangeTypeAmount60">0.00</span>　|红包奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount31">0.00</span>
                     <br />
                     提现申请(元)：<span style="color: #f00;" id="ChangeTypeAmount2">0.00</span>　|　提现失败，解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount6">0.00</span>　|　人工冻结(元)：<span style="color: #f00;" id="ChangeTypeAmount61">0.00</span>　|人工解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount62">0.00</span>　|人工扣减(元)：<span style="color: #f00;" id="ChangeTypeAmount63">0.00</span>　|人工增加(元)：<span style="color: #f00;" id="ChangeTypeAmount64">0.00</span>
                 </blockquote>

wwwroot/layuiadmin/modules_main/ActiveReward_Admin.js

@@ -130,8 +130,8 @@ layui.config({
             ,{field:'ParentRealName', width: 200, title:'上级创客名称', sort: true}
             ,{field:'ParentParentMakerCode', width: 200, title:'上上级创客编码', sort: true}
             ,{field:'ParentParentRealName', width: 200, title:'上上级创客名称', sort: true}
-            ,{field:'TopMakerCode', width: 200, title:'顶级创客编码', sort: true}
-            ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
+            // ,{field:'TopMakerCode', width: 200, title:'顶级创客编码', sort: true}
+            // ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
             ,{field:'KqMerNo', width: 200, title:'快钱商户编号', sort: true}
             ,{field:'KqSnNo', width: 200, title:'快钱SN号', sort: true}
             ,{field:'SnType', width: 200, title:'机具类型', sort: true}

wwwroot/layuiadmin/modules_main/ActivityPrizeDetail_Admin.js

@@ -98,8 +98,8 @@ layui.config({
             ,{field:'MakerCode', width: 200, title:'创客编号', sort: true}
             ,{field:'RealName', width: 200, title:'创客姓名', sort: true}
             ,{field:'ActivityName', width: 200, title:'活动名称', sort: true}
-            ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
-            ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
+            // ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
+            // ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
             ,{field:'BrandId', width: 200, title:'产品类型', sort: true}
             ,{field:'TradeMonth', width: 200, title:'交易月份', sort: true}
             ,{field:'TradeAmt', width: 200, title:'团队交易总金额(元)', sort: true}

wwwroot/layuiadmin/modules_main/FluxProfitDetail_Admin.js

@@ -93,8 +93,8 @@ $('#CreateDate').val(value);
             { type: 'checkbox', fixed: 'left' }
             ,{field:'MakerCode', width: 105, title:'创客编号', sort: true}
             ,{field:'RealName', width: 105, title:'创客姓名', sort: true}
-            ,{field:'TopMakerCode', width: 130, title:'顶级创客编号', sort: true}
-            ,{field:'TopRealName', width: 130, title:'顶级创客姓名', sort: true}
+            // ,{field:'TopMakerCode', width: 130, title:'顶级创客编号', sort: true}
+            // ,{field:'TopRealName', width: 130, title:'顶级创客姓名', sort: true}
             ,{field:'BrandName', width: 105, title:'产品类型', sort: true}
             ,{field:'TradeDate', width: 105, title:'交易日期', sort: true}
             ,{field:'MerUserType', width: 130, title:'商户创客类型', sort: true}

wwwroot/layuiadmin/modules_main/OpenRewardDetail_Admin.js

@@ -121,8 +121,8 @@ layui.config({
             ,{field:'MakerCode', width: 200, title:'奖励创客编号', sort: true}
             ,{field:'RealName', width: 200, title:'奖励创客名称', sort: true}
             ,{field:'TradeDate', width: 200, title:'达标日期', sort: true}
-            ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
-            ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
+            // ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
+            // ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
             ,{field:'BrandId', width: 200, title:'产品名称', sort: true}
             ,{field:'MerchantNo', width: 200, title:'商户编号', sort: true, templet: '#MerchantNoTpl'}
             ,{field:'MerchantName', width: 200, title:'商户名称', sort: true}

wwwroot/layuiadmin/modules_main/OpenSnSnapshot_Admin.js

@@ -122,8 +122,8 @@ $('#TradeDate').val(value);
             ,{field:'MakerCode', width: 200, title:'奖励创客编号', sort: true}
             ,{field:'RealName', width: 200, title:'奖励创客名称', sort: true}
             ,{field:'TradeDate', width: 200, title:'达标日期', sort: true}
-            ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
-            ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
+            // ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
+            // ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
             ,{field:'BrandId', width: 200, title:'产品名称', sort: true}
             ,{field:'BuySnNum', width: 200, title:'购买机数量', sort: true}
             ,{field:'StdBuySnNum', width: 200, title:'标准购买机数量', sort: true}

wwwroot/layuiadmin/modules_main/PosMerchantInfo_Admin.js

@@ -133,8 +133,8 @@ layui.config({
             ,{field:'MerUserType', width: 200, title:'商户创客类型', sort: true}
             ,{field:'MakerCode', width: 200, title:'直属创客编号', sort: true}
             ,{field:'RealName', width: 200, title:'直属创客姓名', sort: true}
-            ,{field:'TopMakerCode', width: 200, title:'顶级创客编码', sort: true}
-            ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
+            // ,{field:'TopMakerCode', width: 200, title:'顶级创客编码', sort: true}
+            // ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
             ,{field:'StoreNo', width: 200, title:'SN仓库编号', sort: true}
             ,{field:'StoreName', width: 200, title:'SN仓库名称', sort: true}
             ,{field:'SnApplyMakerCode', width: 200, title:'申请创客编号', sort: true}

wwwroot/layuiadmin/modules_main/ProfitRewardRecord_Admin.js

@@ -84,7 +84,7 @@ layui.config({
                 url: "/Admin/ProfitRewardRecord/Sort?r=" + Math.random(1),
                 data: "Id=" + data.Id + "&Sort=" + value,
                 dataType: "text",
-                success: function (data) {}
+                success: function (data) { }
             });
         }
     });
@@ -93,7 +93,7 @@ layui.config({
     table.render({
         elem: '#LAY-list-manage',
         url: '/Admin/ProfitRewardRecord/IndexData' //模拟接口
-            ,
+        ,
         cols: [
             [{
                 type: 'checkbox',
@@ -113,23 +113,25 @@ layui.config({
                 width: 200,
                 title: '创客姓名',
                 sort: true
-            }, {
-                field: 'TopMakerCode',
-                width: 200,
-                title: '顶级创客编码',
-                sort: true
-            }, {
-                field: 'TopRealName',
-                width: 200,
-                title: '顶级创客名称',
-                sort: true
-            }, {
+            }, 
+            // {
+            //     field: 'TopMakerCode',
+            //     width: 200,
+            //     title: '顶级创客编码',
+            //     sort: true
+            // }, {
+            //     field: 'TopRealName',
+            //     width: 200,
+            //     title: '顶级创客名称',
+            //     sort: true
+            // }, 
+            {
                 field: 'CreateDate',
                 width: 200,
                 title: '创建时间',
                 sort: true
             }
-            , {
+                , {
                 field: 'TradeMonth',
                 width: 200,
                 title: '交易所在月份',
@@ -401,7 +403,7 @@ layui.config({
                 maxmin: false,
                 area: ['460px', '180px'],
                 content: $('#excelForm'),
-                cancel: function () {}
+                cancel: function () { }
             });
         },
         ExportExcel: function () {

wwwroot/layuiadmin/modules_main/TradeDaySummary_Admin.js

@@ -97,8 +97,8 @@ layui.config({
             { type: 'checkbox', fixed: 'left' }
             ,{field:'MakerCode', width: 200, title:'创客编号', sort: true}
             ,{field:'RealName', width: 200, title:'创客姓名', sort: true}
-            ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
-            ,{field:'TopRealName', width: 200, title:'顶级创客姓名', sort: true}
+            // ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
+            // ,{field:'TopRealName', width: 200, title:'顶级创客姓名', sort: true}
             ,{field:'TradeDate', width: 200, title:'交易日', sort: true}
             ,{field:'TradeMonth', width: 200, title:'交易月', sort: true}
             ,{field:'NotHelpDirectTradeAmt', width: 320, title:'直营商户交易总额(非扶持期)(元)', sort: true}

wwwroot/layuiadmin/modules_main/TradeRecord_Admin.js

@@ -122,8 +122,8 @@ layui.config({
 
             , { field: 'MakerCode', width: 200, title: '创客编码', sort: true }
             , { field: 'RealName', width: 200, title: '创客姓名', sort: true }
-            , { field: 'TopMakerCode', width: 200, title: '顶级创客编码', sort: true }
-            , { field: 'TopRealName', width: 200, title: '顶级创客名称', sort: true }
+            // , { field: 'TopMakerCode', width: 200, title: '顶级创客编码', sort: true }
+            // , { field: 'TopRealName', width: 200, title: '顶级创客名称', sort: true }
             , { field: 'MerchantNo', width: 200, title: '商户编号', sort: true }
             , { field: 'MerchantName', width: 200, title: '商户名称', sort: true }
             , { field: 'MerMakerCode', width: 200, title: '商户直属创客编号', sort: true }

wwwroot/layuiadmin/modules_main/UserAccountRecord_Admin.js

@@ -127,6 +127,8 @@ $('#CreateDate').val(value);
             $("#ChangeTypeAmount50").text(res.other.ChangeTypeAmount50);
             $("#ChangeTypeAmount111").text(res.other.ChangeTypeAmount111);
             $("#ChangeTypeAmount112").text(res.other.ChangeTypeAmount112);
+            $("#ChangeTypeAmount60").text(res.other.ChangeTypeAmount60);
+            $("#ChangeTypeAmount31").text(res.other.ChangeTypeAmount31);
             $(".layui-none").text("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/UserProfitSet_Admin.js

@@ -93,8 +93,8 @@ $('#CreateDate').val(value);
             { type: 'checkbox', fixed: 'left' }
             ,{field:'MakerCode', width: 200, title:'创客编号', sort: true}
             ,{field:'RealName', width: 200, title:'创客姓名', sort: true}
-            ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
-            ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
+            // ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
+            // ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
             ,{field:'BrandId', width: 200, title:'产品名称', sort: true}
             ,{field:'CardType', width: 200, title:'交易卡类型', sort: true}
             ,{field:'HelpFlag', width: 200, title:'扶持期标识', sort: true}

wwwroot/layuiadmin/modules_main/UserRankWhite_Admin.js

@@ -95,8 +95,8 @@ $('#CreateDate').val(value);
             ,{field:'RealName', width: 200, title:'创客姓名', sort: true}
             ,{field:'ParentMakerCode', width: 200, title:'上级创客编号', sort: true}
             ,{field:'ParentRealName', width: 200, title:'上级创客名称', sort: true}
-            ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
-            ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
+            // ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
+            // ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
             ,{field:'Rank', width: 200, title:'等级名称', sort: true}
             ,{field:'Status', width: 200, title:'有效状态', sort: true}
             ,{field:'CreateDate', width: 200, title:'创建时间', sort: true}

wwwroot/layuiadmin/modules_main/Users_City_Admin.js

@@ -95,8 +95,8 @@ layui.config({
             , { field: 'RealName', width: 200, title: '创客姓名', sort: true }
             , { field: 'ParentMakerCode', width: 200, title: '直属创客编号', sort: true }
             , { field: 'ParentRealName', width: 200, title: '直属创客名称', sort: true }
-            , { field: 'TopMakerCode', width: 200, title: '顶级创客编号', sort: true }
-            , { field: 'TopRealName', width: 200, title: '顶级创客名称', sort: true }
+            // , { field: 'TopMakerCode', width: 200, title: '顶级创客编号', sort: true }
+            // , { field: 'TopRealName', width: 200, title: '顶级创客名称', sort: true }
             , { field: 'Areas', width: 200, title: '省市', sort: true }
             , { field: 'CitySetDate', width: 200, title: '创建时间', sort: true }
         ]]