From 9496fec9e6054f6af6b5ddcc81a808f77f041d1d Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期五, 26 四月 2024 10:56:57 +0800
Subject: [PATCH] no message
---
CoreCms.Net.Web.WebApi/Controllers/UserController.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
index f72ffd8..6d41ea4 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
@@ -1003,6 +1003,7 @@
user.status,
user.parentId,
user.passWord,
+ user.IsBaifenPromotion,
gradeName = userGrade != null ? userGrade.title : "",
gradeKey= userGrade != null ? userGrade.valueKey:"",
userCouponCount,
@@ -1560,7 +1561,7 @@
#region 鎻愮幇鐢宠
/// <summary>
- /// 鎻愮幇鐢宠
+ /// 鎻愮幇鐢宠 type 閾惰绾夸笅杞处 = 0, 浼佷笟浠樻鍒伴浂閽� = 1, 浼佸晢瀹惰浆璐﹀埌闆堕挶 = 3 浼佷笟浠樻鍒伴摱琛屽崱 = 2,
/// </summary>
/// <returns></returns>
[HttpPost]
@@ -1568,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;
}
--
Gitblit v1.9.1