修改体现可以不输入银行卡

移动系统liao

2024-04-25 337bb0d6d890df6ab27fc5e6a8205d8cb4875310

修改体现可以不输入银行卡

 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>
        ///     获取用户提现列表记录

 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

 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);
                }
            }

 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;
        }


 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>

 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