From 1cb49b04ae6709e6054c328f5ed12bff9ca014c8 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期二, 12 十一月 2024 09:21:57 +0800
Subject: [PATCH] no message

---
 CoreCms.Net.Web.WebApi/Controllers/UserController.cs |   50 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
index da46e1b..3eceea0 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
@@ -23,6 +23,7 @@
 using CoreCms.Net.Caching.AutoMate.RedisCache;
 using CoreCms.Net.Configuration;
 using CoreCms.Net.IServices;
+using CoreCms.Net.IServices.baifenbingfa;
 using CoreCms.Net.Loging;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.Entities.Expression;
@@ -92,6 +93,7 @@
         private readonly IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;
         private readonly WeChatOptions _weChatOptions;
         private readonly IRedisOperationRepository _redisOperationRepository;
+        private readonly IDistributorDeliveryServices _distributorDeliveryServices;
 
         /// <summary>
         /// 鏋勯�犲嚱鏁�
@@ -122,7 +124,14 @@
             , ICoreCmsSettingServices settingServices
             , ICoreCmsServicesServices servicesServices
             , IOptions<WeChatOptions> weChatOptions
-            , ICoreCmsUserServicesOrderServices userServicesOrderServices, ICoreCmsUserServicesTicketServices userServicesTicketServices, ICoreCmsStoreServices storeServices, ICoreCmsCouponServices couponServices, ICoreCmsOrderServices orderServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, IRedisOperationRepository redisOperationRepository)
+            , ICoreCmsUserServicesOrderServices userServicesOrderServices
+            , ICoreCmsUserServicesTicketServices userServicesTicketServices
+            , ICoreCmsStoreServices storeServices
+            , ICoreCmsCouponServices couponServices
+            , ICoreCmsOrderServices orderServices
+            , IWeChatApiHttpClientFactory weChatApiHttpClientFactory
+            , IRedisOperationRepository redisOperationRepository
+            , IDistributorDeliveryServices distributorDeliveryServices)
         {
             _user = user;
             _userWeChatInfoServices = userWeChatInfoServices;
@@ -156,6 +165,7 @@
             _weChatApiHttpClientFactory = weChatApiHttpClientFactory;
             _redisOperationRepository = redisOperationRepository;
             _weChatOptions = weChatOptions.Value;
+            _distributorDeliveryServices = distributorDeliveryServices;
 
         }
 
@@ -402,7 +412,28 @@
             return jm;
         }
         #endregion
-
+        /// <summary>
+        /// 鑾峰彇璇锋眰ID
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public  WebApiCallBack GeiIp([FromServices] IHttpContextAccessor request)
+        {
+            string clientIp = request.HttpContext.Connection.RemoteIpAddress.ToString();
+            // 濡傛灉瀹㈡埛绔�氳繃浠ｇ悊璁块棶锛屽彲鑳介渶瑕佹鏌-Forwarded-For澶�
+            if (clientIp == "::1" || clientIp == "127.0.0.1")
+            {
+                clientIp = request.HttpContext.Request. Headers["X-Forwarded-For"].FirstOrDefault()
+                    ?? request.HttpContext.Connection.RemoteIpAddress.ToString();
+            }
+            return new WebApiCallBack
+            {
+                code = 0,
+                data = clientIp,
+            };
+             
+        }
         #region 寰俊鏍搁獙鏁版嵁骞惰幏鍙栫敤鎴疯缁嗚祫鏂�=====================================================
         /// <summary>
         /// 鏍搁獙鏁版嵁骞惰幏鍙栫敤鎴疯缁嗚祫鏂�
@@ -985,7 +1016,10 @@
             {
                 user.sex = (int)GlobalEnumVars.UserSexTypes.鏈煡;
             }
+            //鏈鐞嗚鍗曟暟閲�
+            var DeliveryCount = await _distributorDeliveryServices.GetNoAcceptedDeliveryCount();
 
+            var ShowDelivery = await _distributorDeliveryServices.GetShowDelivery();
             jm.data = new
             {
                 user.id,
@@ -1003,11 +1037,16 @@
                 user.status,
                 user.parentId,
                 user.passWord,
+                user.IsBaifenPromotion,
                 gradeName = userGrade != null ? userGrade.title : "",
+                gradeKey= userGrade != null ? userGrade.valueKey:"",
                 userCouponCount,
                 orderCount,
                 footPrintCount,
-                collectionCount
+                collectionCount,
+                user.isplanorder,
+                DeliveryCount,
+                ShowDelivery
             };
             return jm;
         }
@@ -1559,7 +1598,7 @@
 
         #region 鎻愮幇鐢宠
         /// <summary>
-        /// 鎻愮幇鐢宠
+        /// 鎻愮幇鐢宠   type  閾惰绾夸笅杞处 = 0,   浼佷笟浠樻鍒伴浂閽� = 1, 浼佸晢瀹惰浆璐﹀埌闆堕挶 = 3     浼佷笟浠樻鍒伴摱琛屽崱 = 2,
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -1567,7 +1606,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