From 337bb0d6d890df6ab27fc5e6a8205d8cb4875310 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期四, 25 四月 2024 14:38:59 +0800
Subject: [PATCH] 修改体现可以不输入银行卡
---
CoreCms.Net.Model/FromBody/FMId.cs | 5 +++++
CoreCms.Net.IServices/User/ICoreCmsUserTocashServices.cs | 2 +-
CoreCms.Net.Web.WebApi/NLog.config | 2 +-
CoreCms.Net.Web.WebApi/Controllers/UserController.cs | 5 +++--
CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs | 29 +++++++++++++++++------------
CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml | 2 +-
6 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/CoreCms.Net.IServices/User/ICoreCmsUserTocashServices.cs b/CoreCms.Net.IServices/User/ICoreCmsUserTocashServices.cs
index 2c8fa37..ca186e5 100644
--- a/CoreCms.Net.IServices/User/ICoreCmsUserTocashServices.cs
+++ b/CoreCms.Net.IServices/User/ICoreCmsUserTocashServices.cs
@@ -28,7 +28,7 @@
/// 鎻愮幇鐢宠
/// </summary>
/// <returns></returns>
- Task<WebApiCallBack> Tocash(int userId, decimal money, int bankCardsId);
+ Task<WebApiCallBack> Tocash(int userId, decimal money, int bankCardsId = 0, GlobalEnumVars.UserTocashType type= GlobalEnumVars.UserTocashType.閾惰绾夸笅杞处);
/// <summary>
/// 鑾峰彇鐢ㄦ埛鎻愮幇鍒楄〃璁板綍
diff --git a/CoreCms.Net.Model/FromBody/FMId.cs b/CoreCms.Net.Model/FromBody/FMId.cs
index 97373a3..f5cfab0 100644
--- a/CoreCms.Net.Model/FromBody/FMId.cs
+++ b/CoreCms.Net.Model/FromBody/FMId.cs
@@ -25,6 +25,11 @@
public int id { get; set; }
public object data { get; set; } = null;
+
+ /// <summary>
+ /// 绫诲瀷
+ /// </summary>
+ public object type { get; set; }=null;
}
public class FMIntIdByListIntData
diff --git a/CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs b/CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs
index 5a7f11d..028318e 100644
--- a/CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs
+++ b/CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs
@@ -84,7 +84,7 @@
/// 鎻愮幇鐢宠
/// </summary>
/// <returns></returns>
- public async Task<WebApiCallBack> Tocash(int userId, decimal money, int bankCardsId)
+ public async Task<WebApiCallBack> Tocash(int userId, decimal money, int bankCardsId=0, GlobalEnumVars.UserTocashType type= GlobalEnumVars.UserTocashType.閾惰绾夸笅杞处)
{
var jm = new WebApiCallBack();
@@ -142,26 +142,30 @@
jm.msg = GlobalErrorCodeVars.Code11015;
return jm;
}
+ CoreCmsUserBankCard bankcardsInfo = null;
+ if (type == GlobalEnumVars.UserTocashType.閾惰绾夸笅杞处||type== GlobalEnumVars.UserTocashType.浼佷笟浠樻鍒伴摱琛屽崱)
//鑾峰彇閾惰鍗′俊鎭�
- var bankcardsInfo = await userBankCardServices.QueryByClauseAsync(p => p.userId == userId && p.id == bankCardsId);
- if (bankcardsInfo == null)
{
- jm.msg = GlobalErrorCodeVars.Code11016;
- return jm;
+ bankcardsInfo = await userBankCardServices.QueryByClauseAsync(p => p.userId == userId && p.id == bankCardsId);
+ if (bankcardsInfo == null)
+ {
+ jm.msg = GlobalErrorCodeVars.Code11016;
+ return jm;
+ }
}
var cashModel = new CoreCmsUserTocash();
cashModel.userId = userId;
cashModel.money = money;
- cashModel.bankName = bankcardsInfo.bankName;
- cashModel.bankCode = bankcardsInfo.bankCode;
- cashModel.bankAreaId = bankcardsInfo.bankAreaId;
- cashModel.accountBank = bankcardsInfo.accountBank;
- cashModel.accountName = bankcardsInfo.accountName;
- cashModel.cardNumber = bankcardsInfo.cardNumber;
+ cashModel.bankName = bankcardsInfo?.bankName??"寰俊闆堕挶";
+ cashModel.bankCode = bankcardsInfo?.bankCode?? "寰俊闆堕挶";
+ cashModel.bankAreaId = bankcardsInfo?.bankAreaId??510000;
+ cashModel.accountBank = bankcardsInfo?.accountBank?? "寰俊闆堕挶";
+ cashModel.accountName = bankcardsInfo?.accountName?? "寰俊闆堕挶";
+ cashModel.cardNumber = bankcardsInfo?.cardNumber?? "寰俊闆堕挶";
cashModel.status = (int)GlobalEnumVars.UserTocashStatus.寰呭鏍�;
cashModel.withdrawals = cateMoney;
cashModel.createTime = DateTime.Now;
- cashModel.type = (int)GlobalEnumVars.UserTocashType.閾惰绾夸笅杞处;
+ cashModel.type = (int)type;
var res = await _dal.InsertAsync(cashModel);
if (res > 0)
@@ -208,6 +212,7 @@
foreach (var item in list)
{
item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.UserTocashStatus>(item.status);
+ if(item.cardNumber!="寰俊闆堕挶")
item.cardNumber = UserHelper.BankCardNoFormat(item.cardNumber);
}
}
diff --git a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
index 7370986..6d41ea4 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
@@ -1561,7 +1561,7 @@
#region 鎻愮幇鐢宠
/// <summary>
- /// 鎻愮幇鐢宠
+ /// 鎻愮幇鐢宠 type 閾惰绾夸笅杞处 = 0, 浼佷笟浠樻鍒伴浂閽� = 1, 浼佸晢瀹惰浆璐﹀埌闆堕挶 = 3 浼佷笟浠樻鍒伴摱琛屽崱 = 2,
/// </summary>
/// <returns></returns>
[HttpPost]
@@ -1569,7 +1569,8 @@
public async Task<WebApiCallBack> Cash([FromBody] FMIntId entity)
{
var money = entity.data.ObjectToDecimal(0);
- var jm = await _userTocashServices.Tocash(_user.ID, money, entity.id);
+ var Paytype = entity.data.ObjectToDecimal(0);
+ var jm = await _userTocashServices.Tocash(_user.ID, money, entity.id,type: (GlobalEnumVars.UserTocashType)Paytype);
return jm;
}
diff --git a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
index d672d92..9cad429 100644
--- a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
+++ b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
@@ -1372,7 +1372,7 @@
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.UserController.Cash(CoreCms.Net.Model.FromBody.FMIntId)">
<summary>
- 鎻愮幇鐢宠
+ 鎻愮幇鐢宠 type 閾惰绾夸笅杞处 = 0, 浼佷笟浠樻鍒伴浂閽� = 1, 浼佸晢瀹惰浆璐﹀埌闆堕挶 = 3 浼佷笟浠樻鍒伴摱琛屽崱 = 2,
</summary>
<returns></returns>
</member>
diff --git a/CoreCms.Net.Web.WebApi/NLog.config b/CoreCms.Net.Web.WebApi/NLog.config
index 75efa8b..3097c5e 100644
--- a/CoreCms.Net.Web.WebApi/NLog.config
+++ b/CoreCms.Net.Web.WebApi/NLog.config
@@ -14,7 +14,7 @@
dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient"
connectionString="Server=127.0.0.1;Database=BaseMIS;User ID=sa;Password=123456"
-->
- <target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=MS-FSEUTNLCXFDB\SQLEXPRESS;Database=CoreShopProfessional;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;">
+ <target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=MS-FSEUTNLCXFDB\SQLEXPRESS;Database=CoreShopProfessional;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;integrated security=True;">
<commandText>
INSERT INTO SysNLogRecords
(LogDate,LogLevel,LogType,LogTitle,Logger,Message,MachineName,MachineIp,NetRequestMethod
--
Gitblit v1.9.1