Merge branch 'feature-dgy-创客账户详细信息统计调整' into feature-dgy-后台测试

# Conflicts:
#	Areas/Admin/Views/MainServer/UserAccountRecord/Index.cshtml

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -168,6 +168,7 @@ namespace MySystem.Areas.Admin.Controllers
 
         #region 根据条件查询人工已退商户列表
 
+
         /// <summary>
         /// 人工已退商户列表
         /// </summary>
@@ -266,7 +267,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string SeoKeyword = "0";
                 if (!string.IsNullOrEmpty(pos.SeoKeyword))
                 {
-                    if (pos.SeoKeyword.Length > 3)
+                    if (pos.BrandId != 2 && pos.BrandId != 7 && pos.BrandId != 10 && pos.BrandId != 11)
                     {
                         SeoKeyword = (decimal.Parse(pos.SeoKeyword) / 100).ToString();
                     }
@@ -302,7 +303,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == KqSnNo) ?? new PosMachinesTwo();
                     if (!string.IsNullOrEmpty(pos.SeoKeyword))
                     {
-                        if (pos.SeoKeyword.Length > 3)
+                        if (pos.BrandId != 2 && pos.BrandId != 7 && pos.BrandId != 10 && pos.BrandId != 11)
                         {
                             ReturnAmounts += decimal.Parse(pos.SeoKeyword) / 100;
                         }

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -182,29 +182,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", ChangeTypeAmount128And120 = "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=118 or ChangeType=120, ChangeAmount, 0)),sum(if(ChangeType=122, ChangeAmount, 0)),sum(if(ChangeType=123, 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();
+                ChangeTypeAmount128And120 = 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 +270,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("ChangeTypeAmount128And120", ChangeTypeAmount128And120); //购机奖励(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/Controllers/MainServer/UserCashRecordController.cs

@@ -1017,13 +1017,22 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
+
         #region 提交代付平台
 
+        public IActionResult Cash(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+            return View();
+        }
+
         /// <summary>
         /// 提交代付平台
         /// </summary>
         /// <returns></returns>
-        public string Cash(string Id)
+        [HttpPost]
+        public string Cash(string Id, int Channel = 1)
         {
             string[] idlist = Id.Split(new char[] { ',' });
             AddSysLog(Id, "UserCashRecord", "cash");
@@ -1039,10 +1048,17 @@ namespace MySystem.Areas.Admin.Controllers
                     Users user = db.Users.FirstOrDefault(m => m.Id == edit.UserId) ?? new Users();
                     if (!MakerCodeString.Contains("," + user.MakerCode + ","))
                     {
-                        edit.QueryCount = 1;
+                        edit.QueryCount = Channel;
                         edit.UpdateDate = DateTime.Now;
                         db.SaveChanges();
-                        RedisDbconn.Instance.AddList("CashPayApplyQueue", Newtonsoft.Json.JsonConvert.SerializeObject(edit));
+                        if(Channel == 1)
+                        {
+                            RedisDbconn.Instance.AddList("CashPayApplyQueue", Newtonsoft.Json.JsonConvert.SerializeObject(edit));
+                        }
+                        else if(Channel == 2)
+                        {
+                            RedisDbconn.Instance.AddList("JkCashPayApplyQueue", Newtonsoft.Json.JsonConvert.SerializeObject(edit));
+                        }
                     }
                 }
             }

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

@@ -87,7 +87,7 @@
                                 <option value="">全部...</option>
                                 <option value="0">激活奖励</option>
                                 <option value="1">交易分润</option>
-                                <option value="11">月月红</option>
+                                @* <option value="11">月月红</option> *@
                                 <option value="12">交易奖励</option>
                                 <option value="2">提现申请</option>
                                 <option value="3">提现代付</option>
@@ -100,14 +100,14 @@
                                 <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>
@@ -125,6 +125,7 @@
                                 <option value="124">扣机具货款</option>
                                 <option value="125">软件服务费</option>
                                 <option value="126">机具货款退还</option>
+                                <option value="127">运营中心分仓奖励</option>
                                 <option value="130">预发临时额度退还</option>
                                 <option value="201">分期预扣款</option>
                                 <option value="202">创客预扣款</option>
@@ -160,10 +161,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="ChangeTypeAmount12">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="ChangeTypeAmount128And120">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>

Areas/Admin/Views/MainServer/UserCashRecord/Cash.cshtml

@@ -0,0 +1,119 @@
+@{
+    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">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <script src="/admin/js/LAreaData2.js"></script>
+    <style>
+        .layui-form-label {
+            width: 135px !important;
+        }
+
+        .layui-form-item .layui-input-block {
+            margin-left: 165px !important;
+        }
+    </style>
+</head>
+
+<body>
+
+    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
+
+        <div class="layui-card">
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <div class="layui-tab-content mt20">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">代付通道</label>
+                                <div class="layui-input-inline">
+                                    <select id="Channel" name="Channel" lay-search="">
+                                        <option value="1">云汇算</option>
+                                        <option value="2">金控</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+                <div class="layui-form-item layui-hide">
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                        value="确认">
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/other/oss/upload-min.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+
+
+        //编辑器
+        KindEditor.ready(function (K) {
+
+        });
+
+
+        var tree;
+        var element;
+        var upload;
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util;
+            tree = layui.tree;
+            element = layui.element;
+            upload = layui.upload;
+
+            //Hash地址的定位
+            var layid = location.hash.replace(/^#test=/, '');
+            element.tabChange('test', layid);
+            element.on('tab(test)', function (elem) {
+                location.hash = 'test=' + $(this).attr('lay-id');
+            });
+
+            //日期
+
+
+            //上传文件
+
+            //穿梭框
+
+
+
+            //TreeView，比如权限管理
+
+
+            //省市区
+
+        });
+
+    </script>
+</body>
+
+</html>

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); //推荐小盟主奖励
+            $("#ChangeTypeAmount128And120").text(res.other.ChangeTypeAmount128And120); //购机奖励(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("无数据");
         }
     });

wwwroot/layuiadmin/modules_main/UserCashRecord_Admin.js

@@ -690,22 +690,61 @@ layui.config({
                     ids += data[index].Id + ",";
                 });
                 ids = ids.substring(0, ids.length - 1);
-                var index = layer.confirm('确定要提交到代付平台申请出款吗？', function (index) {
-                    $.ajax({
-                        type: "POST",
-                        url: "/Admin/UserCashRecord/Cash?r=" + Math.random(1),
-                        data: "Id=" + ids,
-                        dataType: "text",
-                        success: function (data) {
-                            layer.close(index);
-                            if (data == "success") {
-                                layer.msg('提交成功，请等待代付平台处理');
-                                table.reload('LAY-list-manage');
-                            } else {
-                                layer.msg(data);
-                            }
+
+                var index = layer.confirm('确定要提交到代付平台申请出款吗？', function (confirmindex) {
+                    layer.close(confirmindex);
+                    var perContent = layer.open({
+                        type: 2,
+                        title: '提交到代付',
+                        content: 'Cash',
+                        maxmin: true,
+                        area: ['500px', '450px'],
+                        btn: ['确定', '取消'],
+                        yes: function (index, layero) {
+                            var iframeWindow = window['layui-layer-iframe' + index],
+                                submitID = 'LAY-list-front-submit',
+                                submit = layero.find('iframe').contents().find('#' + submitID);
+        
+                            setTimeout(function () {
+                                layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                                    var errObj = $(this).find('.layui-form-danger');
+                                    if (errObj.length > 0) {
+                                        iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                        submit.click();
+                                    }
+                                });
+                            }, 300);
+        
+                            //监听提交
+                            iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                                var field = data.field; //获取提交的字段
+                                var userdata = "";
+                                for (var prop in field) {
+                                    userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                                }
+                                //提交 Ajax 成功后，静态更新表格中的数据
+                                //$.ajax({});
+        
+                                $.ajax({
+                                    type: "POST",
+                                    url: "/Admin/UserCashRecord/Cash?r=" + Math.random(1),
+                                    data: userdata + "Id=" + ids,
+                                    dataType: "text",
+                                    success: function (data) {
+                                        layer.close(index); //关闭弹层
+                                        if (data == "success") {
+                                            layer.msg('提交成功，请等待代付平台处理');
+                                            table.reload('LAY-list-manage'); //数据刷新
+                                        } else {
+                                            layer.msg(data);
+                                        }
+                                    }
+                                });
+                            });
+        
+                            submit.trigger('click');
                         }
-                    });
+                    });                    
                 });
             }
         },