From d15481638e21ccc610f5e36577497cb6279839b9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 30 四月 2024 09:51:58 +0800
Subject: [PATCH] 修改计划订单

---
 CoreCms.Net.Web.WebApi/Controllers/UserController.cs |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
index 1a8d88b..6d41ea4 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
@@ -1,7 +1,7 @@
 锘�/***********************************************************************
- *            Project: CoreCms
+ *            Project: baifenBinfa
  *        ProjectName: 鐧惧垎鍏垫硶绠$悊绯荤粺                               
- *                Web: hhtp://chuanyin.com                     
+ *                Web: http://chuanyin.com                     
  *             Author:                                        
  *              Email:                               
  *         CreateTime: 202403/02   
@@ -1003,7 +1003,9 @@
                 user.status,
                 user.parentId,
                 user.passWord,
+                user.IsBaifenPromotion,
                 gradeName = userGrade != null ? userGrade.title : "",
+                gradeKey= userGrade != null ? userGrade.valueKey:"",
                 userCouponCount,
                 orderCount,
                 footPrintCount,
@@ -1559,7 +1561,7 @@
 
         #region 鎻愮幇鐢宠
         /// <summary>
-        /// 鎻愮幇鐢宠
+        /// 鎻愮幇鐢宠   type  閾惰绾夸笅杞处 = 0,   浼佷笟浠樻鍒伴浂閽� = 1, 浼佸晢瀹惰浆璐﹀埌闆堕挶 = 3     浼佷笟浠樻鍒伴摱琛屽崱 = 2,
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -1567,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