From 80aa425c4ca51f7c0224a6245968cdd08940321b Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期四, 13 六月 2024 10:17:30 +0800
Subject: [PATCH] 修改校园代理 完成

---
 CoreCms.Net.Web.WebApi/Controllers/UserController.cs |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
index c813e43..99c0ae1 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;
 
         }
 
@@ -1006,7 +1016,10 @@
             {
                 user.sex = (int)GlobalEnumVars.UserSexTypes.鏈煡;
             }
+            //鏈鐞嗚鍗曟暟閲�
+            var DeliveryCount = await _distributorDeliveryServices.GetNoAcceptedDeliveryCount();
 
+            var ShowDelivery = await _distributorDeliveryServices.GetShowDelivery();
             jm.data = new
             {
                 user.id,
@@ -1031,7 +1044,9 @@
                 orderCount,
                 footPrintCount,
                 collectionCount,
-                user.isplanorder
+                user.isplanorder,
+                DeliveryCount,
+                ShowDelivery
             };
             return jm;
         }

--
Gitblit v1.9.1