添加changetype类型

添加税后提现相关金额统计和列表

AppStart/RelationClassForConst.cs

@@ -123,6 +123,12 @@ namespace MySystem
                 case 119:
                     result = "分仓临时额度退还";
                     break;
+                case 124:
+                    result = "机具过期";
+                    break;
+                case 125:
+                    result = "创客月费";
+                    break;
             }
             return result;
         }

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -168,12 +168,18 @@ namespace MySystem.Areas.Admin.Controllers
             string WaitAmount = "0.00";//待处理总金额
             string SuccessAmount = "0.00";//提现成功总金额
             string FailAmount = "0.00";//提现失败总金额
-            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(Status=0,TradeAmount,0)),SUM(if(Status=1,TradeAmount,0)),SUM(if(Status=2,TradeAmount,0)) FROM UserCashRecord where 1=1 " + condition);
+            string WaitTaxAmount = "0.00";//待处理总金额(税后)
+            string SuccessTaxAmount = "0.00";//提现成功总金额(税后)
+            string FailTaxAmount= "0.00";//提现失败总金额(税后)
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(Status=0,TradeAmount,0)),SUM(if(Status=1,TradeAmount,0)),SUM(if(Status=2,TradeAmount,0)),SUM(if(Status=0,ActualTradeAmount,0)),SUM(if(Status=1,ActualTradeAmount,0)),SUM(if(Status=2,ActualTradeAmount,0)) FROM UserCashRecord where 1=1 " + condition);
             if (dt.Rows.Count > 0)
             {
                 WaitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
                 SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][1].ToString())).ToString("f2");
                 FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][2].ToString())).ToString("f2");
+                WaitTaxAmount = decimal.Parse(function.CheckNum(dt.Rows[0][3].ToString())).ToString("f2");
+                SuccessTaxAmount = decimal.Parse(function.CheckNum(dt.Rows[0][4].ToString())).ToString("f2");
+                FailTaxAmount = decimal.Parse(function.CheckNum(dt.Rows[0][5].ToString())).ToString("f2");
             }
             // dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=1" + condition);
             // if (dt.Rows.Count > 0)
@@ -188,6 +194,9 @@ namespace MySystem.Areas.Admin.Controllers
             other.Add("WaitAmount", WaitAmount);
             other.Add("SuccessAmount", SuccessAmount);
             other.Add("FailAmount", FailAmount);
+            other.Add("WaitTaxAmount", WaitTaxAmount);
+            other.Add("SuccessTaxAmount", SuccessTaxAmount);
+            other.Add("FailTaxAmount", FailTaxAmount);
             obj.Add("other", other);
             return Json(obj);
         }

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

@@ -139,9 +139,7 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
-                    待处理总金额(元)：<span style="color: #f00;" id="WaitAmount">0.00</span>　|　提现成功总金额(元)：<span
-                        style="color: #f00;" id="SuccessAmount">0.00</span>　|　提现失败总金额(元)：<span style="color: #f00;"
-                        id="FailAmount">0.00</span>
+                    待处理总金额(元)：<span style="color: #f00;" id="WaitAmount">0.00</span>　|　提现成功总金额(元)：<span style="color: #f00;" id="SuccessAmount">0.00</span>　|　提现失败总金额(元)：<span style="color: #f00;"id="FailAmount">0.00</span>　|　税后待处理提现总金额(元)：<span style="color: #f00;"id="WaitTaxAmount">0.00</span>　|　税后提现成功总金额(元)：<span style="color: #f00;"id="SuccessTaxAmount">0.00</span>　|　税后提现失败总金额(元)：<span style="color: #f00;"id="FailTaxAmount">0.00</span>
                 </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="StatusTpl">

wwwroot/layuiadmin/modules_main/UserCashRecord_Admin.js

@@ -164,6 +164,16 @@ layui.config({
                     width: 200,
                     title: '发佣金额(元)',
                     sort: true
+                }, {
+                    field: 'ManageFee',
+                    width: 200,
+                    title: '交易扣税(元)',
+                    sort: true
+                }, {
+                    field: 'TradeFee',
+                    width: 200,
+                    title: '交易手续费(元)',
+                    sort: true
                 }, {
                     field: 'StatusName',
                     width: 200,
@@ -205,6 +215,9 @@ layui.config({
             $("#SuccessAmount").text(res.other.SuccessAmount);
             $("#FailAmount").text(res.other.FailAmount);
             $("#WaitAmount").text(res.other.WaitAmount);            
+            $("#WaitTaxAmount").text(res.other.WaitTaxAmount);            
+            $("#SuccessTaxAmount").text(res.other.SuccessTaxAmount);            
+            $("#FailTaxAmount").text(res.other.FailTaxAmount);            
             $(".layui-none").text("无数据");
         }
     });