mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2025-12-06 22:43:25 +08:00
前端【新增】完善用户提现前端领取金额的处理。
This commit is contained in:
@@ -173,6 +173,7 @@ namespace CoreCms.Net.Services
|
||||
cashModel.withdrawals = cateMoney;
|
||||
cashModel.createTime = DateTime.Now;
|
||||
cashModel.type = (int)GlobalEnumVars.UserTocashType.银行线下转账;
|
||||
cashModel.needUserGet = false;
|
||||
|
||||
var res = await _dal.InsertAsync(cashModel);
|
||||
if (res > 0)
|
||||
@@ -203,6 +204,9 @@ namespace CoreCms.Net.Services
|
||||
public async Task<WebApiCallBack> UserToCashList(int userId = 0, int page = 1, int limit = 10, int status = 0)
|
||||
{
|
||||
var jm = new WebApiCallBack();
|
||||
using var container = _serviceProvider.CreateScope();
|
||||
var weChatPayConfigServices = container.ServiceProvider.GetService<IWeChatPayConfigServices>();
|
||||
|
||||
|
||||
var where = PredicateBuilder.True<CoreCmsUserTocash>();
|
||||
if (status > 0)
|
||||
@@ -216,12 +220,27 @@ namespace CoreCms.Net.Services
|
||||
var list = await _dal.QueryPageAsync(where, p => p.createTime, OrderByType.Desc, page, limit);
|
||||
if (list.Any())
|
||||
{
|
||||
|
||||
//获取商家转账的初始数据
|
||||
var payConfig = await weChatPayConfigServices.QueryByClauseAsync(p =>
|
||||
p.isDefault == true && p.isEnable == true &&
|
||||
p.appType == nameof(GlobalEnumVars.WeiChatPayTradeType.JSAPI));
|
||||
|
||||
foreach (var item in list)
|
||||
{
|
||||
item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.UserTocashStatus>(item.status);
|
||||
item.cardNumber = UserHelper.BankCardNoFormat(item.cardNumber);
|
||||
if (item.type == (int)GlobalEnumVars.UserTocashType.商家转账 && item.needUserGet)
|
||||
{
|
||||
item.merchantTransferData = new
|
||||
{
|
||||
payConfig.appId,
|
||||
payConfig.mchId
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
jm.status = true;
|
||||
jm.data = list;
|
||||
jm.otherData = new
|
||||
@@ -591,7 +610,9 @@ namespace CoreCms.Net.Services
|
||||
response
|
||||
});
|
||||
|
||||
var bl = await _dal.UpdateAsync(p => new CoreCmsUserTocash() { status = status, updateTime = DateTime.Now, message = message, type = type }, p => p.id == id && (p.status == (int)GlobalEnumVars.UserTocashStatus.待审核 || p.status == (int)GlobalEnumVars.UserTocashStatus.提现异常));
|
||||
bool needUserGet = response.State == "WAIT_USER_CONFIRM";
|
||||
|
||||
var bl = await _dal.UpdateAsync(p => new CoreCmsUserTocash() { status = status, updateTime = DateTime.Now, message = message, type = type, needUserGet = needUserGet }, p => p.id == id && (p.status == (int)GlobalEnumVars.UserTocashStatus.待审核 || p.status == (int)GlobalEnumVars.UserTocashStatus.提现异常));
|
||||
|
||||
NLogUtil.WriteAll(LogLevel.Trace, LogType.Refund, "微信提现商家转账回调(成功)", JsonConvert.SerializeObject(new
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user