暂存

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -147,6 +147,10 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         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);
@@ -237,8 +241,8 @@ namespace MySystem.Areas.Admin.Controllers
             // 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);
+            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();
@@ -266,7 +270,7 @@ namespace MySystem.Areas.Admin.Controllers
                 ChangeTypeAmount121 = dt.Rows[0][22].ToString();
                 ChangeTypeAmount122 = dt.Rows[0][23].ToString();
                 ChangeTypeAmount123 = dt.Rows[0][24].ToString();
-                ChangeTypeAmount128And120 = dt.Rows[0][25].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();
@@ -299,7 +303,7 @@ namespace MySystem.Areas.Admin.Controllers
             other.Add("ChangeTypeAmount121", ChangeTypeAmount121); //运营中心奖励
             other.Add("ChangeTypeAmount122", ChangeTypeAmount122); //推荐大盟主奖励
             other.Add("ChangeTypeAmount123", ChangeTypeAmount123); //推荐小盟主奖励
-            other.Add("ChangeTypeAmount128And120", ChangeTypeAmount128And120); //购机奖励(118盟主奖励(购机奖励) 120运营中心(购机奖励))
+            other.Add("ChangeTypeAmount118And120", ChangeTypeAmount118And120); //购机奖励(118盟主奖励(购机奖励) 120运营中心(购机奖励))
             other.Add("ChangeTypeAmount124", ChangeTypeAmount124); //扣机具货款
             other.Add("ChangeTypeAmount125", ChangeTypeAmount125); //软件服务费
             other.Add("ChangeTypeAmount126", ChangeTypeAmount126); //机具货款退还

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

@@ -111,7 +111,7 @@
                                 <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>
@@ -164,7 +164,7 @@
                     <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>
+                    大盟主奖励(元)：<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>

wwwroot/layuiadmin/modules_main/UserAccountRecord_Admin.js

@@ -162,7 +162,7 @@ layui.config({
             $("#ChangeTypeAmount121").text(res.other.ChangeTypeAmount121); //运营中心奖励
             $("#ChangeTypeAmount122").text(res.other.ChangeTypeAmount122); //推荐大盟主奖励
             $("#ChangeTypeAmount123").text(res.other.ChangeTypeAmount123); //推荐小盟主奖励
-            $("#ChangeTypeAmount128And120").text(res.other.ChangeTypeAmount128And120); //购机奖励(118盟主奖励(购机奖励) 120运营中心(购机奖励))
+            $("#ChangeTypeAmount118And120").text(res.other.ChangeTypeAmount118And120); //购机奖励(118盟主奖励(购机奖励) 120运营中心(购机奖励))
             $("#ChangeTypeAmount124").text(res.other.ChangeTypeAmount124); //扣机具货款
             $("#ChangeTypeAmount125").text(res.other.ChangeTypeAmount125); //软件服务费
             $("#ChangeTypeAmount126").text(res.other.ChangeTypeAmount126); //机具货款退还