Merge branch 'feature-dgy-创客账户详细信息统计调整' into DuGuYang

AppStart/RelationClassForConst.cs

@@ -67,10 +67,10 @@ namespace MySystem
                     result = "系统奖励";
                     break;
                 case 65:
-                    result = "系统奖励";
+                    result = "押金暂扣";
                     break;
                 case 66:
-                    result = "系统奖励";
+                    result = "押金退还";
                     break;
                 case 7:
                     result = "系统扣除";
@@ -150,6 +150,9 @@ namespace MySystem
                 case 126:
                     result = "机具货款退还";
                     break;
+                case 127:
+                    result = "运营中心分仓奖励";
+                    break;
                 case 201:
                     result = "分期预扣款";
                     break;

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -57,7 +57,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客账户变动记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(UserAccountRecord data, int ChangeType, int ProductType, string TransRecordNo, string MakerCode, string RealName, int TopUserId, string CreateDateData, int UserId = 0, int page = 1, int limit = 30)
+        public JsonResult IndexData(UserAccountRecord data, string ChangeType, int ProductType, string TransRecordNo, string MakerCode, string RealName, int TopUserId, string CreateDateData, int UserId = 0, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -127,23 +127,38 @@ namespace MySystem.Areas.Admin.Controllers
                 }
 
             }
-            if (ChangeType > 0)
+            if (!string.IsNullOrEmpty(ChangeType))
             {
-                if (ChangeType == 1)
-                {
-                    condition += " and (ChangeType=" + ChangeType + " or (ChangeType in(112,1) and ProductType=101))";
-                }
-                else if (ChangeType == 30)
-                {
-                    condition += " and ChangeType=31 and Remark='开机抢红包活动'";
-                }
-                else if (ChangeType == 31)
+                if (int.Parse(ChangeType) > 0)
                 {
-                    condition += " and (ChangeType=" + ChangeType + " and (Remark!='开机抢红包活动' or Remark IS NULL))";
+                    // if (ChangeType == 0)
+                    // {
+                    //     condition += " and ChangeType in(0,12)";
+                    // }
+                    if (int.Parse(ChangeType) == 1)
+                    {
+                        condition += " and (ChangeType=" + int.Parse(ChangeType) + " or (ChangeType in(112,1) and ProductType=101))";
+                    }
+                    else if (int.Parse(ChangeType) == 30)
+                    {
+                        condition += " and ChangeType=31 and Remark='开机抢红包活动'";
+                    }
+                    else if (int.Parse(ChangeType) == 31)
+                    {
+                        condition += " and (ChangeType=" + int.Parse(ChangeType) + " and (Remark!='开机抢红包活动' or Remark IS NULL))";
+                    }
+                    else if (int.Parse(ChangeType) == 112)
+                    {
+                        condition += " and ChangeType=112 and ProductType=0";
+                    }
+                    else
+                    {
+                        condition += " and ChangeType=" + int.Parse(ChangeType);
+                    }
                 }
-                else
+                if (int.Parse(ChangeType) == 0)
                 {
-                    condition += " and ChangeType=" + ChangeType;
+                    condition += " and ChangeType in(0,12)";
                 }
             }
             if (ProductType > 0)
@@ -182,29 +197,86 @@ namespace MySystem.Areas.Admin.Controllers
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
 
-            string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount3 = "0.00", ChangeTypeAmount4 = "0.00", ChangeTypeAmount5 = "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", ChangeTypeAmount31s = "0.00", ChangeTypeAmount124 = "0.00", ChangeTypeAmount125 = "0.00";
-            DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)),sum(if(ChangeType=1 and ProductType!=101, ChangeAmount, 0)) + sum(if(ChangeType in(112,1) and ProductType=101, 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  and ProductType!=101, ChangeAmount, 0)),sum(if(ChangeType=60, ChangeAmount, 0)),sum(if(ChangeType=31 and Remark='开机抢红包活动', ChangeAmount, 0)),sum(if(ChangeType=3, ChangeAmount, 0)),sum(if(ChangeType=4, ChangeAmount, 0)),sum(if(ChangeType=5, ChangeAmount, 0)),sum(if(ChangeType=124, ChangeAmount, 0)),sum(if(ChangeType=125, ChangeAmount, 0)),sum(if(ChangeType=31 and (Remark!='开机抢红包活动' or Remark IS NULL), ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
+            // string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount3 = "0.00", ChangeTypeAmount4 = "0.00", ChangeTypeAmount5 = "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", ChangeTypeAmount31s = "0.00", ChangeTypeAmount124 = "0.00", ChangeTypeAmount125 = "0.00";
+            // DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)),sum(if(ChangeType=1 and ProductType!=101, ChangeAmount, 0)) + sum(if(ChangeType in(112,1) and ProductType=101, 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  and ProductType!=101, ChangeAmount, 0)),sum(if(ChangeType=60, ChangeAmount, 0)),sum(if(ChangeType=31 and Remark='开机抢红包活动', ChangeAmount, 0)),sum(if(ChangeType=3, ChangeAmount, 0)),sum(if(ChangeType=4, ChangeAmount, 0)),sum(if(ChangeType=5, ChangeAmount, 0)),sum(if(ChangeType=124, ChangeAmount, 0)),sum(if(ChangeType=125, ChangeAmount, 0)),sum(if(ChangeType=31 and (Remark!='开机抢红包活动' or Remark IS NULL), ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     ChangeTypeAmount0 = dt.Rows[0][0].ToString();
+            //     ChangeTypeAmount1 = dt.Rows[0][1].ToString();
+            //     ChangeTypeAmount2 = dt.Rows[0][2].ToString();
+            //     ChangeTypeAmount3 = dt.Rows[0][13].ToString();
+            //     ChangeTypeAmount4 = dt.Rows[0][14].ToString();
+            //     ChangeTypeAmount5 = dt.Rows[0][15].ToString();
+            //     ChangeTypeAmount6 = dt.Rows[0][3].ToString();
+            //     ChangeTypeAmount61 = dt.Rows[0][4].ToString();
+            //     ChangeTypeAmount62 = dt.Rows[0][5].ToString();
+            //     ChangeTypeAmount63 = dt.Rows[0][6].ToString();
+            //     ChangeTypeAmount64 = dt.Rows[0][7].ToString();
+            //     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();
+            //     ChangeTypeAmount124 = dt.Rows[0][16].ToString();
+            //     ChangeTypeAmount125 = dt.Rows[0][17].ToString();
+            //     ChangeTypeAmount31s = dt.Rows[0][18].ToString();
+            // }
+            // other.Add("ChangeTypeAmount0", ChangeTypeAmount0); //激活奖励
+            // other.Add("ChangeTypeAmount1", ChangeTypeAmount1); //交易分润
+            // other.Add("ChangeTypeAmount2", ChangeTypeAmount2); //提现申请
+            // other.Add("ChangeTypeAmount3", ChangeTypeAmount3); //提现代付
+            // other.Add("ChangeTypeAmount4", ChangeTypeAmount4); //提现手续费
+            // other.Add("ChangeTypeAmount5", ChangeTypeAmount5); //提现税点扣除
+            // other.Add("ChangeTypeAmount6", ChangeTypeAmount6); //提现失败，解冻
+            // other.Add("ChangeTypeAmount61", ChangeTypeAmount61); //人工冻结
+            // other.Add("ChangeTypeAmount62", ChangeTypeAmount62); //人工解冻
+            // other.Add("ChangeTypeAmount63", ChangeTypeAmount63); //人工扣减
+            // other.Add("ChangeTypeAmount64", ChangeTypeAmount64); //人工增加
+            // other.Add("ChangeTypeAmount50", ChangeTypeAmount50); //开机奖励
+            // other.Add("ChangeTypeAmount111", ChangeTypeAmount111); //分润补贴
+            // other.Add("ChangeTypeAmount112", ChangeTypeAmount112); //推荐奖励
+            // other.Add("ChangeTypeAmount60", ChangeTypeAmount60); //流量卡分佣
+            // other.Add("ChangeTypeAmount31", ChangeTypeAmount31); //红包奖励
+            // other.Add("ChangeTypeAmount31s", ChangeTypeAmount31s); //活动奖励
+            // other.Add("ChangeTypeAmount124", ChangeTypeAmount124); //机具过期
+            // other.Add("ChangeTypeAmount125", ChangeTypeAmount125); //软件服务费
+
+            string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount3 = "0.00", ChangeTypeAmount4 = "0.00", ChangeTypeAmount5 = "0.00", ChangeTypeAmount6 = "0.00", ChangeTypeAmount12 = "0.00", ChangeTypeAmount20 = "0.00", ChangeTypeAmount31 = "0.00", ChangeTypeAmount50 = "0.00", ChangeTypeAmount60 = "0.00", ChangeTypeAmount61 = "0.00", ChangeTypeAmount62 = "0.00", ChangeTypeAmount63 = "0.00", ChangeTypeAmount64 = "0.00", ChangeTypeAmount111 = "0.00", ChangeTypeAmount112 = "0.00", ChangeTypeAmount114 = "0.00", ChangeTypeAmount115 = "0.00", ChangeTypeAmount116 = "0.00", ChangeTypeAmount119 = "0.00", ChangeTypeAmount121 = "0.00", ChangeTypeAmount122 = "0.00", ChangeTypeAmount123 = "0.00", ChangeTypeAmount118And120 = "0.00", ChangeTypeAmount124 = "0.00", ChangeTypeAmount125 = "0.00", ChangeTypeAmount126 = "0.00", ChangeTypeAmount127 = "0.00", ChangeTypeAmount202 = "0.00", ChangeTypeAmount30 = "0.00";
+            DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)) + sum(if(ChangeType=12, ChangeAmount, 0)),sum(if(ChangeType=1 and ProductType!=101, ChangeAmount, 0)) + sum(if(ChangeType in(112,1) and ProductType=101, ChangeAmount, 0)),sum(if(ChangeType=2, ChangeAmount, 0)),sum(if(ChangeType=3, ChangeAmount, 0)),sum(if(ChangeType=4, ChangeAmount, 0)),sum(if(ChangeType=5, ChangeAmount, 0)),sum(if(ChangeType=6, ChangeAmount, 0)),sum(if(ChangeType=12, ChangeAmount, 0)),sum(if(ChangeType=20, ChangeAmount, 0)),sum(if(ChangeType=31 and (Remark!='开机抢红包活动' or Remark IS NULL), ChangeAmount, 0)),sum(if(ChangeType=50, ChangeAmount, 0)),sum(if(ChangeType=60, 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=111, ChangeAmount, 0)),sum(if(ChangeType=112  and ProductType=0, ChangeAmount, 0)),sum(if(ChangeType=114, ChangeAmount, 0)),sum(if(ChangeType=115, ChangeAmount, 0)),sum(if(ChangeType=116, ChangeAmount, 0)),sum(if(ChangeType=119, ChangeAmount, 0)),sum(if(ChangeType=121, ChangeAmount, 0)),sum(if(ChangeType=122, ChangeAmount, 0)),sum(if(ChangeType=123, ChangeAmount, 0)),sum(if(ChangeType in(118,120), ChangeAmount, 0)),sum(if(ChangeType=124, ChangeAmount, 0)),sum(if(ChangeType=125, ChangeAmount, 0)),sum(if(ChangeType=126, ChangeAmount, 0)),sum(if(ChangeType=127, ChangeAmount, 0)),sum(if(ChangeType=202, ChangeAmount, 0)),sum(if(ChangeType=31 and Remark='开机抢红包活动', ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
             if (dt.Rows.Count > 0)
             {
                 ChangeTypeAmount0 = dt.Rows[0][0].ToString();
                 ChangeTypeAmount1 = dt.Rows[0][1].ToString();
                 ChangeTypeAmount2 = dt.Rows[0][2].ToString();
-                ChangeTypeAmount3 = dt.Rows[0][13].ToString();
-                ChangeTypeAmount4 = dt.Rows[0][14].ToString();
-                ChangeTypeAmount5 = dt.Rows[0][15].ToString();
-                ChangeTypeAmount6 = dt.Rows[0][3].ToString();
-                ChangeTypeAmount61 = dt.Rows[0][4].ToString();
-                ChangeTypeAmount62 = dt.Rows[0][5].ToString();
-                ChangeTypeAmount63 = dt.Rows[0][6].ToString();
-                ChangeTypeAmount64 = dt.Rows[0][7].ToString();
-                ChangeTypeAmount50 = dt.Rows[0][8].ToString();
-                ChangeTypeAmount111 = dt.Rows[0][9].ToString();
-                ChangeTypeAmount112 = dt.Rows[0][10].ToString();
+                ChangeTypeAmount3 = dt.Rows[0][3].ToString();
+                ChangeTypeAmount4 = dt.Rows[0][4].ToString();
+                ChangeTypeAmount5 = dt.Rows[0][5].ToString();
+                ChangeTypeAmount6 = dt.Rows[0][6].ToString();
+                ChangeTypeAmount12 = dt.Rows[0][7].ToString();
+                ChangeTypeAmount20 = dt.Rows[0][8].ToString();
+                ChangeTypeAmount31 = dt.Rows[0][9].ToString();
+                ChangeTypeAmount50 = dt.Rows[0][10].ToString();
                 ChangeTypeAmount60 = dt.Rows[0][11].ToString();
-                ChangeTypeAmount31 = dt.Rows[0][12].ToString();
-                ChangeTypeAmount124 = dt.Rows[0][16].ToString();
-                ChangeTypeAmount125 = dt.Rows[0][17].ToString();
-                ChangeTypeAmount31s = dt.Rows[0][18].ToString();
+                ChangeTypeAmount61 = dt.Rows[0][12].ToString();
+                ChangeTypeAmount62 = dt.Rows[0][13].ToString();
+                ChangeTypeAmount63 = dt.Rows[0][14].ToString();
+                ChangeTypeAmount64 = dt.Rows[0][15].ToString();
+                ChangeTypeAmount111 = dt.Rows[0][16].ToString();
+                ChangeTypeAmount112 = dt.Rows[0][17].ToString();
+                ChangeTypeAmount114 = dt.Rows[0][18].ToString();
+                ChangeTypeAmount115 = dt.Rows[0][19].ToString();
+                ChangeTypeAmount116 = dt.Rows[0][20].ToString();
+                ChangeTypeAmount119 = dt.Rows[0][21].ToString();
+                ChangeTypeAmount121 = dt.Rows[0][22].ToString();
+                ChangeTypeAmount122 = dt.Rows[0][23].ToString();
+                ChangeTypeAmount123 = dt.Rows[0][24].ToString();
+                ChangeTypeAmount118And120 = dt.Rows[0][25].ToString();
+                ChangeTypeAmount124 = dt.Rows[0][26].ToString();
+                ChangeTypeAmount125 = dt.Rows[0][27].ToString();
+                ChangeTypeAmount126 = dt.Rows[0][28].ToString();
+                ChangeTypeAmount127 = dt.Rows[0][29].ToString();
+                ChangeTypeAmount202 = dt.Rows[0][30].ToString();
+                ChangeTypeAmount30 = dt.Rows[0][31].ToString();
             }
             other.Add("ChangeTypeAmount0", ChangeTypeAmount0); //激活奖励
             other.Add("ChangeTypeAmount1", ChangeTypeAmount1); //交易分润
@@ -213,18 +285,31 @@ namespace MySystem.Areas.Admin.Controllers
             other.Add("ChangeTypeAmount4", ChangeTypeAmount4); //提现手续费
             other.Add("ChangeTypeAmount5", ChangeTypeAmount5); //提现税点扣除
             other.Add("ChangeTypeAmount6", ChangeTypeAmount6); //提现失败，解冻
+            other.Add("ChangeTypeAmount12", ChangeTypeAmount12); //交易奖励
+            other.Add("ChangeTypeAmount20", ChangeTypeAmount20); //余额支付
+            other.Add("ChangeTypeAmount31", ChangeTypeAmount31); //活动奖励
+            other.Add("ChangeTypeAmount50", ChangeTypeAmount50); //开机奖励
+            other.Add("ChangeTypeAmount60", ChangeTypeAmount60); //流量卡分佣
             other.Add("ChangeTypeAmount61", ChangeTypeAmount61); //人工冻结
             other.Add("ChangeTypeAmount62", ChangeTypeAmount62); //人工解冻
-            other.Add("ChangeTypeAmount63", ChangeTypeAmount63); //人工扣减
-            other.Add("ChangeTypeAmount64", ChangeTypeAmount64); //人工增加
-            other.Add("ChangeTypeAmount50", ChangeTypeAmount50); //开机奖励
+            other.Add("ChangeTypeAmount63", ChangeTypeAmount63); //系统扣减(人工扣减)
+            other.Add("ChangeTypeAmount64", ChangeTypeAmount64); //系统奖励(人工增加)
             other.Add("ChangeTypeAmount111", ChangeTypeAmount111); //分润补贴
             other.Add("ChangeTypeAmount112", ChangeTypeAmount112); //推荐奖励
-            other.Add("ChangeTypeAmount60", ChangeTypeAmount60); //流量卡分佣
-            other.Add("ChangeTypeAmount31", ChangeTypeAmount31); //红包奖励
-            other.Add("ChangeTypeAmount31s", ChangeTypeAmount31s); //活动奖励
-            other.Add("ChangeTypeAmount124", ChangeTypeAmount124); //机具过期
+            other.Add("ChangeTypeAmount114", ChangeTypeAmount114); //私董会分红
+            other.Add("ChangeTypeAmount115", ChangeTypeAmount115); //分仓奖励
+            other.Add("ChangeTypeAmount116", ChangeTypeAmount116); //大盟主奖励
+            other.Add("ChangeTypeAmount119", ChangeTypeAmount119); //分仓临时额度退还
+            other.Add("ChangeTypeAmount121", ChangeTypeAmount121); //运营中心奖励
+            other.Add("ChangeTypeAmount122", ChangeTypeAmount122); //推荐大盟主奖励
+            other.Add("ChangeTypeAmount123", ChangeTypeAmount123); //推荐小盟主奖励
+            other.Add("ChangeTypeAmount118And120", ChangeTypeAmount118And120); //购机奖励(118盟主奖励(购机奖励) 120运营中心(购机奖励))
+            other.Add("ChangeTypeAmount124", ChangeTypeAmount124); //扣机具货款
             other.Add("ChangeTypeAmount125", ChangeTypeAmount125); //软件服务费
+            other.Add("ChangeTypeAmount126", ChangeTypeAmount126); //机具货款退还
+            other.Add("ChangeTypeAmount127", ChangeTypeAmount127); //运营中心分仓奖励
+            other.Add("ChangeTypeAmount202", ChangeTypeAmount202); //创客预扣款
+            other.Add("ChangeTypeAmount30", ChangeTypeAmount30); //红包奖励
             obj.Add("other", other);
             return Json(obj);
         }

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

@@ -87,8 +87,8 @@
                                 <option value="">全部...</option>
                                 <option value="0">激活奖励</option>
                                 <option value="1">交易分润</option>
-                                <option value="11">月月红</option>
-                                <option value="12">交易奖励</option>
+                                @* <option value="11">月月红</option> *@
+                                @* <option value="12">交易奖励</option> *@
                                 <option value="2">提现申请</option>
                                 <option value="3">提现代付</option>
                                 <option value="4">提现手续费</option>
@@ -100,18 +100,18 @@
                                 <option value="64">人工增加</option>
                                 <option value="65">押金暂扣</option>
                                 <option value="66">押金退还</option>
-                                <option value="7">系统扣除</option>
-                                <option value="10">办卡奖励</option>
+                                @* <option value="7">系统扣除</option> *@
+                                @* <option value="10">办卡奖励</option> *@
                                 <option value="20">余额支付</option>
-                                <option value="21">余额退款</option>
-                                <option value="22">余额退款手续费</option>
+                                @* <option value="21">余额退款</option>
+                                <option value="22">余额退款手续费</option> *@
                                 <option value="30">红包奖励</option>
                                 <option value="31">活动奖励</option>
-                                <option value="40">商户达标返</option>
+                                @* <option value="40">商户达标返</option> *@
                                 <option value="50">开机奖励</option>
                                 <option value="60">流量卡分佣</option>
                                 <option value="111">分润补贴</option>
-                                <option value="112">直推奖励</option>
+                                <option value="112">推荐奖励</option>
                                 <option value="114">私董会分红</option>
                                 <option value="115">分仓奖励</option>
                                 <option value="116">大盟主奖励</option>
@@ -125,6 +125,7 @@
                                 <option value="124">扣机具货款</option>
                                 <option value="125">软件服务费</option>
                                 <option value="126">机具货款退还</option>
+                                <option value="127">运营中心分仓奖励</option>
                                 <option value="201">分期预扣款</option>
                                 <option value="202">创客预扣款</option>
                             </select>
@@ -159,10 +160,17 @@
 
             <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="ChangeTypeAmount2">0.00</span>　|　提现代付(元)：<span style="color: #f00;" id="ChangeTypeAmount3">0.00</span>　|　提现手续费(元)：<span style="color: #f00;" id="ChangeTypeAmount4">0.00</span>　|　提现税点扣除(元)：<span style="color: #f00;" id="ChangeTypeAmount5">0.00</span>　|　提现失败，解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount6">0.00</span>　|　余额支付(元)：<span style="color: #f00;" id="ChangeTypeAmount20">0.00</span>　|　红包奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount30">0.00</span>　|　活动奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount31">0.00</span>
+                    <br/>
+                    开机奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount50">0.00</span>　|　流量卡分佣(元)：<span style="color: #f00;" id="ChangeTypeAmount60">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>　|　分润补贴(元)：<span style="color: #f00;" id="ChangeTypeAmount111">0.00</span>　|　推荐奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount112">0.00</span>　|　私董会分红(元)：<span style="color: #f00;" id="ChangeTypeAmount114">0.00</span>　|　分仓奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount115">0.00</span>
+                    <br/>
+                    大盟主奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount116">0.00</span>　|　分仓临时额度退还(元)：<span style="color: #f00;" id="ChangeTypeAmount119">0.00</span>　|　运营中心奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount121">0.00</span>　|　推荐大盟主奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount122">0.00</span>　|　推荐小盟主奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount123">0.00</span>　|　购机奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount118And120">0.00</span>　|　扣机具货款(元)：<span style="color: #f00;" id="ChangeTypeAmount124">0.00</span>　|　软件服务费(元)：<span style="color: #f00;" id="ChangeTypeAmount125">0.00</span>　|　机具货款退还(元)：<span style="color: #f00;" id="ChangeTypeAmount126">0.00</span>　|　运营中心分仓奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount127">0.00</span>　|　创客预扣款(元)：<span style="color: #f00;" id="ChangeTypeAmount202">0.00</span>
+                </blockquote>
+                @* <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="ChangeTypeAmount60">0.00</span>　|　红包奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount31">0.00</span>　|　活动奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount31s">0.00</span>　|　扣机具货款(元)：<span style="color: #f00;" id="ChangeTypeAmount124">0.00</span>　|　软件服务费(元)：<span style="color: #f00;" id="ChangeTypeAmount125">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>　|　提现代付(元)：<span style="color: #f00;" id="ChangeTypeAmount3">0.00</span>　|　提现手续费(元)：<span style="color: #f00;" id="ChangeTypeAmount4">0.00</span>　|　提现税点扣除(元)：<span style="color: #f00;" id="ChangeTypeAmount5">0.00</span>
-                </blockquote>
+                </blockquote> *@
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                 </script>

wwwroot/layuiadmin/modules_main/UserAccountRecord_Admin.js

@@ -117,25 +117,58 @@ layui.config({
         , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
-            $("#ChangeTypeAmount0").text(res.other.ChangeTypeAmount0);
-            $("#ChangeTypeAmount1").text(res.other.ChangeTypeAmount1);
-            $("#ChangeTypeAmount2").text(res.other.ChangeTypeAmount2);
-            $("#ChangeTypeAmount3").text(res.other.ChangeTypeAmount3);
-            $("#ChangeTypeAmount4").text(res.other.ChangeTypeAmount4);
-            $("#ChangeTypeAmount5").text(res.other.ChangeTypeAmount5);
-            $("#ChangeTypeAmount6").text(res.other.ChangeTypeAmount6);
-            $("#ChangeTypeAmount61").text(res.other.ChangeTypeAmount61);
-            $("#ChangeTypeAmount62").text(res.other.ChangeTypeAmount62);
-            $("#ChangeTypeAmount63").text(res.other.ChangeTypeAmount63);
-            $("#ChangeTypeAmount64").text(res.other.ChangeTypeAmount64);
-            $("#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);
-            $("#ChangeTypeAmount124").text(res.other.ChangeTypeAmount124);
-            $("#ChangeTypeAmount125").text(res.other.ChangeTypeAmount125);
-            $("#ChangeTypeAmount31s").text(res.other.ChangeTypeAmount31s);
+            // $("#ChangeTypeAmount0").text(res.other.ChangeTypeAmount0);
+            // $("#ChangeTypeAmount1").text(res.other.ChangeTypeAmount1);
+            // $("#ChangeTypeAmount2").text(res.other.ChangeTypeAmount2);
+            // $("#ChangeTypeAmount3").text(res.other.ChangeTypeAmount3);
+            // $("#ChangeTypeAmount4").text(res.other.ChangeTypeAmount4);
+            // $("#ChangeTypeAmount5").text(res.other.ChangeTypeAmount5);
+            // $("#ChangeTypeAmount6").text(res.other.ChangeTypeAmount6);
+            // $("#ChangeTypeAmount61").text(res.other.ChangeTypeAmount61);
+            // $("#ChangeTypeAmount62").text(res.other.ChangeTypeAmount62);
+            // $("#ChangeTypeAmount63").text(res.other.ChangeTypeAmount63);
+            // $("#ChangeTypeAmount64").text(res.other.ChangeTypeAmount64);
+            // $("#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);
+            // $("#ChangeTypeAmount124").text(res.other.ChangeTypeAmount124);
+            // $("#ChangeTypeAmount125").text(res.other.ChangeTypeAmount125);
+            // $("#ChangeTypeAmount31s").text(res.other.ChangeTypeAmount31s);
+
+            $("#ChangeTypeAmount0").text(res.other.ChangeTypeAmount0); //激活奖励
+            $("#ChangeTypeAmount1").text(res.other.ChangeTypeAmount1); //交易分润
+            $("#ChangeTypeAmount2").text(res.other.ChangeTypeAmount2); //提现申请
+            $("#ChangeTypeAmount3").text(res.other.ChangeTypeAmount3); //提现代付
+            $("#ChangeTypeAmount4").text(res.other.ChangeTypeAmount4); //提现手续费
+            $("#ChangeTypeAmount5").text(res.other.ChangeTypeAmount5); //提现税点扣除
+            $("#ChangeTypeAmount6").text(res.other.ChangeTypeAmount6); //提现失败，解冻
+            $("#ChangeTypeAmount12").text(res.other.ChangeTypeAmount12); //交易奖励
+            $("#ChangeTypeAmount20").text(res.other.ChangeTypeAmount20); //余额支付
+            $("#ChangeTypeAmount31").text(res.other.ChangeTypeAmount31); //活动奖励
+            $("#ChangeTypeAmount50").text(res.other.ChangeTypeAmount50); //开机奖励
+            $("#ChangeTypeAmount60").text(res.other.ChangeTypeAmount60); //流量卡分佣
+            $("#ChangeTypeAmount61").text(res.other.ChangeTypeAmount61); //人工冻结
+            $("#ChangeTypeAmount62").text(res.other.ChangeTypeAmount62); //人工解冻
+            $("#ChangeTypeAmount63").text(res.other.ChangeTypeAmount63); //系统扣减(人工扣减)
+            $("#ChangeTypeAmount64").text(res.other.ChangeTypeAmount64); //系统奖励(人工增加)
+            $("#ChangeTypeAmount111").text(res.other.ChangeTypeAmount111); //分润补贴
+            $("#ChangeTypeAmount112").text(res.other.ChangeTypeAmount112); //推荐奖励
+            $("#ChangeTypeAmount114").text(res.other.ChangeTypeAmount114); //私董会分红
+            $("#ChangeTypeAmount115").text(res.other.ChangeTypeAmount115); //分仓奖励
+            $("#ChangeTypeAmount116").text(res.other.ChangeTypeAmount116); //大盟主奖励
+            $("#ChangeTypeAmount119").text(res.other.ChangeTypeAmount119); //分仓临时额度退还
+            $("#ChangeTypeAmount121").text(res.other.ChangeTypeAmount121); //运营中心奖励
+            $("#ChangeTypeAmount122").text(res.other.ChangeTypeAmount122); //推荐大盟主奖励
+            $("#ChangeTypeAmount123").text(res.other.ChangeTypeAmount123); //推荐小盟主奖励
+            $("#ChangeTypeAmount118And120").text(res.other.ChangeTypeAmount118And120); //购机奖励(118盟主奖励(购机奖励) 120运营中心(购机奖励))
+            $("#ChangeTypeAmount124").text(res.other.ChangeTypeAmount124); //扣机具货款
+            $("#ChangeTypeAmount125").text(res.other.ChangeTypeAmount125); //软件服务费
+            $("#ChangeTypeAmount126").text(res.other.ChangeTypeAmount126); //机具货款退还
+            $("#ChangeTypeAmount127").text(res.other.ChangeTypeAmount127); //运营中心分仓奖励
+            $("#ChangeTypeAmount202").text(res.other.ChangeTypeAmount202); //创客预扣款
+            $("#ChangeTypeAmount30").text(res.other.ChangeTypeAmount30); //红包奖励
             $(".layui-none").text("无数据");
         }
     });