前端【新增】完善用户提现前端领取金额的处理。

CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserTocashController.cs

@@ -8,12 +8,6 @@
  *        Description: 暂无
  ***********************************************************************/
 
-using System;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
 using CoreCms.Net.Configuration;
 using CoreCms.Net.Filter;
 using CoreCms.Net.IServices;
@@ -22,6 +16,7 @@ using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.Entities.Expression;
 using CoreCms.Net.Model.FromBody;
 using CoreCms.Net.Model.ViewModels.UI;
+using CoreCms.Net.Services;
 using CoreCms.Net.Utility.Extensions;
 using CoreCms.Net.Utility.Helper;
 using CoreCms.Net.Web.Admin.Infrastructure;
@@ -30,6 +25,12 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using NPOI.HSSF.UserModel;
 using SqlSugar;
+using System;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
 
 namespace CoreCms.Net.Web.Admin.Controllers
 {
@@ -60,10 +61,9 @@ namespace CoreCms.Net.Web.Admin.Controllers
         }
 
         #region 获取列表============================================================
-
         // POST: Api/CoreCmsUserTocash/GetPageList
         /// <summary>
-        ///     获取列表
+        /// 获取列表
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -76,52 +76,27 @@ namespace CoreCms.Net.Web.Admin.Controllers
             var where = PredicateBuilder.True<CoreCmsUserTocash>();
             //获取排序字段
             var orderField = Request.Form["orderField"].FirstOrDefault();
-            Expression<Func<CoreCmsUserTocash, object>> orderEx;
-            switch (orderField)
+
+            Expression<Func<CoreCmsUserTocash, object>> orderEx = orderField switch
             {
-                case "id":
-                    orderEx = p => p.id;
-                    break;
-                case "userId":
-                    orderEx = p => p.userId;
-                    break;
-                case "money":
-                    orderEx = p => p.money;
-                    break;
-                case "bankName":
-                    orderEx = p => p.bankName;
-                    break;
-                case "bankCode":
-                    orderEx = p => p.bankCode;
-                    break;
-                case "bankAreaId":
-                    orderEx = p => p.bankAreaId;
-                    break;
-                case "accountBank":
-                    orderEx = p => p.accountBank;
-                    break;
-                case "accountName":
-                    orderEx = p => p.accountName;
-                    break;
-                case "cardNumber":
-                    orderEx = p => p.cardNumber;
-                    break;
-                case "withdrawals":
-                    orderEx = p => p.withdrawals;
-                    break;
-                case "status":
-                    orderEx = p => p.status;
-                    break;
-                case "createTime":
-                    orderEx = p => p.createTime;
-                    break;
-                case "updateTime":
-                    orderEx = p => p.updateTime;
-                    break;
-                default:
-                    orderEx = p => p.id;
-                    break;
-            }
+                "id" => p => p.id,
+                "userId" => p => p.userId,
+                "money" => p => p.money,
+                "bankName" => p => p.bankName,
+                "bankCode" => p => p.bankCode,
+                "bankAreaId" => p => p.bankAreaId,
+                "accountBank" => p => p.accountBank,
+                "accountName" => p => p.accountName,
+                "cardNumber" => p => p.cardNumber,
+                "withdrawals" => p => p.withdrawals,
+                "status" => p => p.status,
+                "createTime" => p => p.createTime,
+                "updateTime" => p => p.updateTime,
+                "type" => p => p.type,
+                "message" => p => p.message,
+                "needUserGet" => p => p.needUserGet,
+                _ => p => p.id
+            };
 
             //设置排序方式
             var orderDirection = Request.Form["orderDirection"].FirstOrDefault();
@@ -133,34 +108,72 @@ namespace CoreCms.Net.Web.Admin.Controllers
             };
             //查询筛选
 
-            //ID号 int
+            //id int
             var id = Request.Form["id"].FirstOrDefault().ObjectToInt(0);
-            if (id > 0) @where = @where.And(p => p.id == id);
+            if (id > 0)
+            {
+                where = where.And(p => p.id == id);
+            }
             //用户ID int
             var userId = Request.Form["userId"].FirstOrDefault().ObjectToInt(0);
-            if (userId > 0) @where = @where.And(p => p.userId == userId);
-
+            if (userId > 0)
+            {
+                where = where.And(p => p.userId == userId);
+            }
+            //提现金额 decimal
+            var money = Request.Form["money"].FirstOrDefault().ObjectToDecimal(0);
+            if (money > 0)
+            {
+                where = where.And(p => p.money == money);
+            }
             //银行名称 nvarchar
             var bankName = Request.Form["bankName"].FirstOrDefault();
-            if (!string.IsNullOrEmpty(bankName)) @where = @where.And(p => p.bankName.Contains(bankName));
+            if (!string.IsNullOrEmpty(bankName))
+            {
+                where = where.And(p => p.bankName.Contains(bankName));
+            }
             //银行缩写 nvarchar
             var bankCode = Request.Form["bankCode"].FirstOrDefault();
-            if (!string.IsNullOrEmpty(bankCode)) @where = @where.And(p => p.bankCode.Contains(bankCode));
+            if (!string.IsNullOrEmpty(bankCode))
+            {
+                where = where.And(p => p.bankCode.Contains(bankCode));
+            }
             //账号地区ID int
             var bankAreaId = Request.Form["bankAreaId"].FirstOrDefault().ObjectToInt(0);
-            if (bankAreaId > 0) @where = @where.And(p => p.bankAreaId == bankAreaId);
+            if (bankAreaId > 0)
+            {
+                where = where.And(p => p.bankAreaId == bankAreaId);
+            }
             //开户行 nvarchar
             var accountBank = Request.Form["accountBank"].FirstOrDefault();
-            if (!string.IsNullOrEmpty(accountBank)) @where = @where.And(p => p.accountBank.Contains(accountBank));
+            if (!string.IsNullOrEmpty(accountBank))
+            {
+                where = where.And(p => p.accountBank.Contains(accountBank));
+            }
             //账户名 nvarchar
             var accountName = Request.Form["accountName"].FirstOrDefault();
-            if (!string.IsNullOrEmpty(accountName)) @where = @where.And(p => p.accountName.Contains(accountName));
+            if (!string.IsNullOrEmpty(accountName))
+            {
+                where = where.And(p => p.accountName.Contains(accountName));
+            }
             //卡号 nvarchar
             var cardNumber = Request.Form["cardNumber"].FirstOrDefault();
-            if (!string.IsNullOrEmpty(cardNumber)) @where = @where.And(p => p.cardNumber.Contains(cardNumber));
+            if (!string.IsNullOrEmpty(cardNumber))
+            {
+                where = where.And(p => p.cardNumber.Contains(cardNumber));
+            }
+            //提现服务费 decimal
+            var withdrawals = Request.Form["withdrawals"].FirstOrDefault().ObjectToDecimal(0);
+            if (withdrawals > 0)
+            {
+                where = where.And(p => p.withdrawals == withdrawals);
+            }
             //提现状态 int
             var status = Request.Form["status"].FirstOrDefault().ObjectToInt(0);
-            if (status > 0) @where = @where.And(p => p.status == status);
+            if (status > 0)
+            {
+                where = where.And(p => p.status == status);
+            }
             //创建时间 datetime
             var createTime = Request.Form["createTime"].FirstOrDefault();
             if (!string.IsNullOrEmpty(createTime))
@@ -179,7 +192,6 @@ namespace CoreCms.Net.Web.Admin.Controllers
                     where = where.And(p => p.createTime > dt);
                 }
             }
-
             //更新时间 datetime
             var updateTime = Request.Form["updateTime"].FirstOrDefault();
             if (!string.IsNullOrEmpty(updateTime))
@@ -198,10 +210,28 @@ namespace CoreCms.Net.Web.Admin.Controllers
                     where = where.And(p => p.updateTime > dt);
                 }
             }
-            //提现状态 int
+            //提现方式 int
             var type = Request.Form["type"].FirstOrDefault().ObjectToInt(0);
-            if (type > 0) @where = @where.And(p => p.type == type);
-
+            if (type > 0)
+            {
+                where = where.And(p => p.type == type);
+            }
+            //反馈结果 nvarchar
+            var message = Request.Form["message"].FirstOrDefault();
+            if (!string.IsNullOrEmpty(message))
+            {
+                where = where.And(p => p.message.Contains(message));
+            }
+            //需要用户领取 bit
+            var needUserGet = Request.Form["needUserGet"].FirstOrDefault();
+            if (!string.IsNullOrEmpty(needUserGet) && needUserGet.ToLowerInvariant() == "true")
+            {
+                where = where.And(p => p.needUserGet == true);
+            }
+            else if (!string.IsNullOrEmpty(needUserGet) && needUserGet.ToLowerInvariant() == "false")
+            {
+                where = where.And(p => p.needUserGet == false);
+            }
             //获取数据
             var list = await _coreCmsUserTocashServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true);
             //返回数据
@@ -211,9 +241,9 @@ namespace CoreCms.Net.Web.Admin.Controllers
             jm.msg = "数据调用成功!";
             return jm;
         }
-
         #endregion
 
+
         #region 首页数据============================================================
 
         // POST: Api/CoreCmsUserTocash/GetIndex
@@ -276,7 +306,6 @@ namespace CoreCms.Net.Web.Admin.Controllers
         }
         #endregion
 
-
         #region 设置状态============================================================
 
         // POST: Api/CoreCmsUser/DoSetisDelete/10
@@ -308,8 +337,6 @@ namespace CoreCms.Net.Web.Admin.Controllers
 
         #endregion
 
-
-
         #region 预览数据============================================================
         // POST: Api/CoreCmsUserTocash/GetDetails/10
         /// <summary>
@@ -345,7 +372,6 @@ namespace CoreCms.Net.Web.Admin.Controllers
         }
         #endregion
 
-
         #region 选择导出============================================================
 
         // POST: Api/CoreCmsUserTocash/SelectExportExcel/10