From 65383b35f3b0420ab1d334ef354d4706d54f93f8 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期三, 30 七月 2025 10:47:59 +0800
Subject: [PATCH] no message

---
 Admin.NET/FZCTB.NET.API.Application/User/CustomerService.cs |   58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/Admin.NET/FZCTB.NET.API.Application/User/CustomerService.cs b/Admin.NET/FZCTB.NET.API.Application/User/CustomerService.cs
index 9c5cf91..f157c21 100644
--- a/Admin.NET/FZCTB.NET.API.Application/User/CustomerService.cs
+++ b/Admin.NET/FZCTB.NET.API.Application/User/CustomerService.cs
@@ -6,6 +6,7 @@
 
 using Admin.NET.Core;
 using Admin.NET.Core.Service;
+using Dm.util;
 using Furion;
 using Furion.DynamicApiController;
 using Furion.FriendlyException;
@@ -39,19 +40,22 @@
 
     private readonly SysCacheService _sysCacheService;
     private readonly SqlSugarRepository<FBS_ExRole> _fBS_ExRoleRep;
-
+    private readonly SqlSugarRepository<FBS_CoutomerExRole> _fBS_CustomerExRoleRep;
     private readonly SqlSugarRepository<FBS_EnterpriseType> _fBS_EnterpriseTypeRep;
     private readonly SqlSugarRepository<FBS_Customer> _fBS_CustomerRep;
     /// <summary>
     /// 鐢ㄦ埛鎵╁睍
     /// </summary>
     private readonly SqlSugarRepository<FBS_CusExtend> _fBS_CusExtendRep;
+
     private IMapper _mapper;
     /// <summary>
     /// 
     /// </summary>
     public CustomerService(SysCacheService cacheService, CustomerManagerS managerS,SqlSugarRepository<FBS_Customer>  repository
-        , SqlSugarRepository<FBS_EnterpriseType> fbsenrep,IMapper mapper,SqlSugarRepository<FBS_ExRole> exroles , SqlSugarRepository<FBS_CusExtend> cusrep)
+        , SqlSugarRepository<FBS_EnterpriseType> fbsenrep,IMapper mapper,SqlSugarRepository<FBS_ExRole> exroles ,
+        SqlSugarRepository<FBS_CusExtend> cusrep,
+        SqlSugarRepository<FBS_CoutomerExRole> cexrrep)
     {
         _sysCacheService= cacheService;
          _customerManager = managerS;
@@ -60,6 +64,7 @@
         _fBS_ExRoleRep = exroles;
         _fBS_CusExtendRep = cusrep;
         _mapper = mapper;
+        _fBS_CustomerExRoleRep = cexrrep;
     }
 
     /// <summary>
@@ -111,15 +116,26 @@
         dd.CreateTime = DateTime.Now;
         dd.CreateUserId = 0;
         dd.CreateUserName = dd.NickName;
-        dd.CoutomerExRols = new List<FBS_CoutomerExRole>()
+        if(dd.CoutomerExRols==null)
+        {
+            new List<FBS_CoutomerExRole>()
         {
             new FBS_CoutomerExRole
             {
                  ExRoleId= ExRole?.Id??0
-                  
-                  
+
+
             }
         };
+        }
+        else
+        {
+            dd.CoutomerExRols.add(new FBS_CoutomerExRole
+            {
+                ExRoleId = ExRole?.Id ?? 0
+            });
+        }
+    
             
             
          
@@ -168,18 +184,42 @@
         {
             throw Oops.Oh("鐢ㄦ埛涓嶅瓨鍦�");
         }
+  
        var rols= await  _fBS_ExRoleRep.GetFirstAsync(x => x.Code == cusExtend.TransactionCode && x.Status == StatusEnum.Enable);
         if(rols==null)
         {
             throw Oops.Oh("浜ゆ槗涓讳綋涓嶅瓨鍦�");
         }
-
-        if(user.CoutomerExRols?.Any(x=>x.ExRole.Code==cusExtend.TransactionCode&& x.HasFlsh==true)==true)
+        var ExRoles = await _fBS_CustomerExRoleRep.GetListAsync(x => x.CustomerId == id);
+        if (ExRoles != null)
         {
-            throw Oops.Oh("鐢ㄦ埛宸茬粡娉ㄥ唽浜嗚涓讳綋");
+            if (ExRoles?.Any(x => x.ExRoleId == rols.Id && x.HasFlsh == true) == true)
+            {
+                throw Oops.Oh("鐢ㄦ埛宸茬粡娉ㄥ唽浜嗚涓讳綋");
+            }
+           
         }
-     
 
+        //澧炲姞鐢ㄦ埛瑙掕壊
+        await _fBS_CustomerExRoleRep.InsertAsync(new FBS_CoutomerExRole
+        {
+            ExRoleId = rols.Id,
+            CustomerId = id
+        });
+
+
+        var usdata = await _fBS_CusExtendRep.GetFirstAsync(x => x.CustomerId == id&&x.TransactionCode==cusExtend.TransactionCode);
+       
+        if (usdata!=null)
+        {
+            if (usdata.steps == CusExtendStep.Pass)
+            {
+                throw Oops.Oh("鐢ㄦ埛宸茬粡娉ㄥ唽浜嗚涓讳綋");
+
+            }
+            throw Oops.Oh("鐢ㄦ埛宸茬粡鐢宠浜嗚瑙掕壊锛岃璧颁慨鏀规祦绋�");
+        }
+       
         var data= cusExtend.Adapt<FBS_CusExtend>();
 
         data.steps = CusExtendStep.UNExamine;

--
Gitblit v1.9.1