From f43970a061d3c90520b4e8f48caa17a204d9a085 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期四, 15 八月 2024 10:19:38 +0800
Subject: [PATCH] 完供应商自主维护商品api和后台基础管理页面
---
CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs b/CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs
index d33cc76..028318e 100644
--- a/CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs
+++ b/CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs
@@ -1,10 +1,10 @@
/***********************************************************************
- * Project: CoreCms
- * ProjectName: 鏍稿績鍐呭绠＄悊绯荤粺
- * Web: https://www.corecms.net
- * Author: 澶х伆鐏�
- * Email: jianweie@163.com
- * CreateTime: 2021/1/31 21:45:10
+ * Project: baifenBinfa
+ * ProjectName: 鐧惧垎鍏垫硶绠＄悊绯荤粺
+ * Web: http://chuanyin.com
+ * Author:
+ * Email:
+ * CreateTime: 202403/02
* Description: 鏆傛棤
***********************************************************************/
@@ -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);
}
}
--
Gitblit v1.9.1