Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/Event/BookingFeeSubscriber.cs

@@ -66,6 +66,7 @@ namespace Myshipping.Application.Event
             var repoUser = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysUser>>();
             var repoBooking = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<BookingOrder>>();
             var repoFeeRecord = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<BookingFeeRecord>>();
+            var repoTenantParamValue = scope.ServiceProvider.GetRequiredService<SqlSugarRepository<DjyTenantParamValue>>();
             var cache = scope.ServiceProvider.GetRequiredService<ISysCacheService>();
 
             var typeStr = $"{bsType}_{sendType}";
@@ -73,13 +74,13 @@ namespace Myshipping.Application.Event
             var idToDo = idList.Except(dbFeeRecord).ToList();
             var sysCfg = await cache.GetAllSysConfig();
             var feeUrl = sysCfg.FirstOrDefault(x => x.Code == "djyFeeApiUrl");
-            var feeUserId = sysCfg.FirstOrDefault(x => x.Code == "djyFeeApiUserId");
+            //var feeUserId = sysCfg.FirstOrDefault(x => x.Code == "djyFeeApiUserId");
-            var feeKey = sysCfg.FirstOrDefault(x => x.Code == "djyFeeApiKey");
+            //var feeKey = sysCfg.FirstOrDefault(x => x.Code == "djyFeeApiKey");
-            if (feeKey == null || string.IsNullOrEmpty(feeUrl.Value)
+            if (feeUrl == null || string.IsNullOrEmpty(feeUrl.Value))
-                || feeUserId == null || string.IsNullOrEmpty(feeUserId.Value)
+                //|| feeUserId == null || string.IsNullOrEmpty(feeUserId.Value)
-                || feeKey == null || string.IsNullOrEmpty(feeKey.Value))
+                //|| feeKey == null || string.IsNullOrEmpty(feeKey.Value))
             {
-                var errMsg = "大简云扣费URL和KEY未配置";
+                var errMsg = "大简云扣费URL未配置";
                 _logger.LogError(errMsg);
                 DingTalkGroupHelper.SendDingTalkGroupMessage("bookingFeeNotify", "扣费失败提醒", errMsg);
                 return;
@@ -90,6 +91,21 @@ namespace Myshipping.Application.Event
                 var order = await repoBooking.AsQueryable().Filter(null, true).FirstAsync(x => x.Id == id);
                 var iptId = string.IsNullOrEmpty(order.OPID) ? order.CreatedUserId.Value : Convert.ToInt64(order.OPID);
                 var user = await repoUser.AsQueryable().Filter(null, true).FirstAsync(x => x.Id == iptId);
+                var keyList = await repoTenantParamValue.AsQueryable()
+                      .Filter(null, true)
+                      .Where(x => x.TenantId == order.TenantId && (x.ParaCode == "BOOKING_FEE_USERID" || x.ParaCode == "BOOKING_FEE_USERKEY"))
+                      .ToListAsync();
+                if (keyList.Count < 2)
+                {
+                    var errMsg = $"未找到{order.MBLNO}({id})所在租户的授权userid和key，无法调用扣费";
+                    _logger.LogError(errMsg);
+                    DingTalkGroupHelper.SendDingTalkGroupMessage("bookingFeeNotify", "扣费失败提醒", errMsg);
+                    continue;
+                }
+                var feeUserId = keyList.First(x => x.ParaCode == "BOOKING_FEE_USERID").ItemCode;
+                var feeUserKey = keyList.First(x => x.ParaCode == "BOOKING_FEE_USERKEY").ItemCode;
+
+
                 if (user == null || string.IsNullOrEmpty(user.DjyUserId))
                 {
                     var errMsg = $"未找到{order.MBLNO}({id})的用户信息，无法调用扣费";
@@ -100,11 +116,11 @@ namespace Myshipping.Application.Event
 
                 var seconds = DateTime.Now.ToTimeStamp();
                 var runId = Guid.NewGuid().ToString();
-                var srcBeforMD5 = $"{runId}{feeUserId.Value}expend{bsType}{sendType}{id}{order.MBLNO}{seconds}{feeKey.Value}";
+                var srcBeforMD5 = $"{runId}{feeUserId}expend{bsType}{sendType}{id}{order.MBLNO}{seconds}{feeUserKey}";
                 var postObj = new
                 {
                     runId,
-                    userId = feeUserId.Value,
+                    userId = feeUserId,
                     module = "expend",//固定
                     bsType = $"{bsType}",
                     sendType = $"{sendType}",

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -10286,6 +10286,16 @@ namespace Myshipping.Application
             }
         }
 
+        /// <summary>
+        /// 临时补扣费用
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("/BookingOrder/FeeById"), AllowAnonymous]
+        public async Task FeeById(List<long> idList, int bsType = 28, int sendtype = 0)
+        {
+            await _publisher.PublishAsync(new ChannelEventSource($"Booking:DoFeeRecord", new { bsType = bsType, sendtype = sendtype, idList = idList }));
+        }
+
         #endregion
 
         #region 打印船公司ONE的订舱附件
@@ -12154,22 +12164,28 @@ namespace Myshipping.Application
                             UNLocationCode = model.placeOfDeliveryUnLocCode,
                             cityName = model.placeOfDeliveryCityName,
                         },
-                        selectedRoute = new MSKAPIBookingRoute { 
+                        selectedRoute = new MSKAPIBookingRoute
-                            bookingSchedules = new MSKAPIBookingSchedules { 
+                        {
+                            bookingSchedules = new MSKAPIBookingSchedules
+                            {
                                 originDepartureDateTimeLocal = model.originDepartureDateTimeLocal.Value.ToString("yyyy-MM-dd"),
                                 destinationArrivalDateTimeLocal = model.destinationArrivalDateTimeLocal.Value.ToString("yyyy-MM-dd"),
-                                transportMode = new MSKAPIBookingTransportMode { 
+                                transportMode = new MSKAPIBookingTransportMode
-                                    vessel = new MSKAPIBookingTransportModeVessel { 
+                                {
+                                    vessel = new MSKAPIBookingTransportModeVessel
+                                    {
                                         name = model.vesselName,
                                         maerskVesselCode = model.carrierVesselCode,
                                     },
                                     exportVoyageNumber = model.exportVoyageNumber,
                                 },
-                                startLocation = new MSKAPIBookingRouteDetailsBase { 
+                                startLocation = new MSKAPIBookingRouteDetailsBase
+                                {
                                     cityName = model.placeOfReceiptCityName,
                                     UNLocationCode = model.placeOfReceiptUnLocCode
                                 },
-                                endLocation= new MSKAPIBookingRouteDetailsBase {
+                                endLocation = new MSKAPIBookingRouteDetailsBase
+                                {
                                     cityName = model.placeOfDeliveryCityName,
                                     UNLocationCode = model.placeOfDeliveryUnLocCode
                                 },
@@ -12209,7 +12225,8 @@ namespace Myshipping.Application
                 {
                     model.ctns.ForEach(ctn =>
                     {
-                        MSKAPIBookingEquipmentAndHaulage haulage = new MSKAPIBookingEquipmentAndHaulage { 
+                        MSKAPIBookingEquipmentAndHaulage haulage = new MSKAPIBookingEquipmentAndHaulage
+                        {
                             equipmentDetails = new MSKAPIBookingEquipmentAndHaulageItem(),
                             stuffingDetails = new List<MSKAPIBookingStuffingdetails>()
                         };
@@ -12217,7 +12234,8 @@ namespace Myshipping.Application
                         haulage.equipmentDetails.ISOEquipmentCode = ctn.ctnCode;
                         haulage.equipmentDetails.equipmentQuantity = ctn.ctnNum;
 
-                        haulage.stuffingDetails.Add(new MSKAPIBookingStuffingdetails { 
+                        haulage.stuffingDetails.Add(new MSKAPIBookingStuffingdetails
+                        {
                             stuffingValue = (int)ctn.ctnSufferWeight.Value,
                             stuffingMeasurementType = "WEIGHT",
                             stuffingMeasurementUnit = "KGS"
@@ -12493,5 +12511,6 @@ namespace Myshipping.Application
             return list;
         }
         #endregion
+
     }
 }

Myshipping.Application/Service/Fee/FeeRecordService.cs

@@ -65,7 +65,7 @@ namespace Myshipping.Application
             // 如果费用中含有机密费用，再判断是否有查询的权限
             if (feeRecords.Any(r => !r.IsOpen))
             {
-                bool canReviewSecretFee = await _sysUserRoleService.IsUserInRole(UserManager.UserId, CommonConst.SECRET_FEE_REVIEW);
+                bool canReviewSecretFee = await _sysUserRoleService.IsUserInRole(UserManager.UserId, CommonConst.ROLE_SECRET_FEE_REVIEW);
                 if (!canReviewSecretFee)
                 {
                     feeRecords.RemoveAll(r => !r.IsOpen && r.CreatedUserId != UserManager.UserId);

Myshipping.Core/Const/CommonConst.cs

@@ -227,9 +227,14 @@ public class CommonConst
 
     #region 角色Code
     /// <summary>
-    /// 机密费用检阅角色
+    /// 机密费用检阅角色Code
     /// </summary>
-    public const string SECRET_FEE_REVIEW = "SecretFeeReview";
+    public const string ROLE_SECRET_FEE_REVIEW = "SecretFeeReview";
+
+    /// <summary>
+    /// 普通员工角色Code
+    /// </summary>
+    public const string ROLE_COMMON_EMPLOYEE = "CommonEmployee";
     #endregion
 
     #region 费用
@@ -245,17 +250,22 @@ public class CommonConst
 
     #region 系统运行方式
     /// <summary>
-    /// 标准模式
+    /// 和川（会执行一些和川特有的逻辑）
+    /// </summary>
+    public const string RUN_TYPE_HECHUAN = "HeChuan";
+
+    /// <summary>
+    /// 标准模式（自用）
     /// </summary>
-    public const string RUN_TYPE_NORMAL = "NORMAL";
+    public const string RUN_TYPE_NORMAL = "Normal";
 
     /// <summary>
-    /// 客户订舱-客户端
+    /// 客户订舱系统-客户端
     /// </summary>
     public const string RUN_TYPE_CUST = "CUST";
 
     /// <summary>
-    /// 客户订舱-大简云运营端
+    /// 客户订舱系统-大简云运营端
     /// </summary>
     public const string RUN_TYPE_DJY = "DJY";
     #endregion

Myshipping.Core/Myshipping.Core.xml

@@ -792,9 +792,14 @@
             删除字段
             </summary>
         </member>
-        <member name="F:Myshipping.Core.CommonConst.SECRET_FEE_REVIEW">
+        <member name="F:Myshipping.Core.CommonConst.ROLE_SECRET_FEE_REVIEW">
             <summary>
-            机密费用检阅角色
+            机密费用检阅角色Code
+            </summary>
+        </member>
+        <member name="F:Myshipping.Core.CommonConst.ROLE_COMMON_EMPLOYEE">
+            <summary>
+            普通员工角色Code
             </summary>
         </member>
         <member name="F:Myshipping.Core.CommonConst.CACHE_KEY_FEE_CODE">
@@ -807,19 +812,24 @@
             币别缓存键
             </summary>
         </member>
+        <member name="F:Myshipping.Core.CommonConst.RUN_TYPE_HECHUAN">
+            <summary>
+            和川（会执行一些和川特有的逻辑）
+            </summary>
+        </member>
         <member name="F:Myshipping.Core.CommonConst.RUN_TYPE_NORMAL">
             <summary>
-            标准模式
+            标准模式（自用）
             </summary>
         </member>
         <member name="F:Myshipping.Core.CommonConst.RUN_TYPE_CUST">
             <summary>
-            客户订舱-客户端
+            客户订舱系统-客户端
             </summary>
         </member>
         <member name="F:Myshipping.Core.CommonConst.RUN_TYPE_DJY">
             <summary>
-            客户订舱-大简云运营端
+            客户订舱系统-大简云运营端
             </summary>
         </member>
         <member name="F:Myshipping.Core.Const.MenuConst.MenuBookingOrder">
@@ -15772,6 +15782,13 @@
             <param name="input"></param>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Service.SysRoleService.GetRoleIdByRoleCode(System.String)">
+            <summary>
+            根据角色Code查询角色主键
+            </summary>
+            <param name="roleCode">角色Code</param>
+            <returns>角色主键</returns>
+        </member>
         <member name="T:Myshipping.Core.Service.TenantInput">
             <summary>
             租户参数

Myshipping.Core/Service/Role/ISysRoleService.cs

@@ -11,6 +11,7 @@ public interface ISysRoleService
     Task DeleteRole(DeleteRoleInput input);
     Task<string> GetNameByRoleId(long roleId);
     Task<dynamic> GetRoleDropDown();
+    Task<long?> GetRoleIdByRoleCode(string roleCode);
     Task<SysRole> GetRoleInfo([FromQuery] QueryRoleInput input);
     Task<dynamic> GetRoleList([FromQuery] RoleInput input);
     Task<List<long>> GetUserDataScopeIdList(List<long> roleIdList, long orgId);

Myshipping.Core/Service/Role/SysRoleService.cs

@@ -333,4 +333,14 @@ public class SysRoleService : ISysRoleService, IDynamicApiController, ITransient
     {
         return await _sysRoleDataScopeService.GetRoleDataScopeIdList(new List<long> { input.Id });
     }
+
+    /// <summary>
+    /// 根据角色Code查询角色主键
+    /// </summary>
+    /// <param name="roleCode">角色Code</param>
+    /// <returns>角色主键</returns>
+    public async Task<long?> GetRoleIdByRoleCode(string roleCode)
+    {
+        return await _sysRoleRep.AsQueryable(x => x.Code == roleCode).Select(x => x.Id).FirstAsync();
+    }
 }

Myshipping.Core/Service/User/Dto/SysDataUserMenuDto.cs

@@ -15,6 +15,13 @@ namespace Myshipping.Core.Service.User.Dto
 
     public class children
     {
+        public children() { }
+        public children(long menuId, DataScopeType dataScopeType, bool isEdit)
+        {
+            MenuId = menuId;
+            DataScopeType = dataScopeType;
+            IsEdit = isEdit;
+        }
         public long MenuId { get; set; }
 
         public DataScopeType DataScopeType { get; set; }
@@ -24,7 +31,8 @@ namespace Myshipping.Core.Service.User.Dto
         public bool IsEdit { get; set; }
     }
 
-    public class RightList {
+    public class RightList
+    {
 
         public long UserId { get; set; }
 

Myshipping.Core/Service/User/SysUserService.cs

@@ -22,6 +22,7 @@ using System.Web;
 using System.Text;
 using Furion.EventBus;
 using Microsoft.AspNetCore.Authorization;
+using Myshipping.Core.Const;
 
 namespace Myshipping.Core.Service;
 
@@ -39,6 +40,8 @@ public class SysUserService : ISysUserService, IDynamicApiController, ITransient
     private readonly ISysUserRoleService _sysUserRoleService;
     private readonly ISysEmpPosService _sysEmpPosService;
     private readonly IEventPublisher _publisher;
+    private readonly ISysDataUserMenu _sysDataUserMenu;
+    private readonly ISysRoleService _sysRoleService;
 
     public SysUserService(SqlSugarRepository<SysUser> sysUserRep,
                           ISysCacheService sysCacheService,
@@ -47,7 +50,9 @@ public class SysUserService : ISysUserService, IDynamicApiController, ITransient
                           ISysUserRoleService sysUserRoleService,
                           ISysConfigService sysConfigService,
                           ISysEmpPosService sysEmpPosService,
-                          IEventPublisher publisher)
+                          IEventPublisher publisher,
+                          ISysDataUserMenu sysDataUserMenu,
+                          ISysRoleService sysRoleService)
     {
         _sysUserRep = sysUserRep;
         _sysCacheService = sysCacheService;
@@ -57,6 +62,8 @@ public class SysUserService : ISysUserService, IDynamicApiController, ITransient
         _sysConfigService = sysConfigService;
         _sysEmpPosService = sysEmpPosService;
         _publisher = publisher;
+        _sysDataUserMenu = sysDataUserMenu;
+        _sysRoleService = sysRoleService;
     }
 
     /// <summary>
@@ -122,6 +129,32 @@ public class SysUserService : ISysUserService, IDynamicApiController, ITransient
             input.SysEmpParam.Id = newUser.Id.ToString();
             // 增加员工信息
             await _sysEmpService.AddOrUpdate(input.SysEmpParam);
+
+            // 如果当前运行模式为和川，则进行一些初始化操作
+            if (App.Configuration["RunType"] == CommonConst.RUN_TYPE_HECHUAN)
+            {
+                // 绑定角色：普通员工
+                long? roleId = await _sysRoleService.GetRoleIdByRoleCode(CommonConst.ROLE_COMMON_EMPLOYEE);
+                if (roleId != null)
+                {
+                    await _sysUserRoleService.GrantRole(new UpdateUserInput()
+                    {
+                        Id = newUser.Id,
+                        GrantRoleIdList = new List<long>() { (long)roleId }
+                    });
+                }
+
+                // 授权"订舱台账"菜单的数据范围
+                var userMenuDto = new User.Dto.SysDataUserMenuDto()
+                {
+                    UserId = newUser.Id,
+                    childrens = new List<User.Dto.children>() {
+                        new(MenuConst.MenuBookingOrder, DataScopeType.DEPT_WITH_CHILD, true)
+                    }
+                };
+                await _sysDataUserMenu.GrantData(userMenuDto);
+            }
+
             _sysUserRep.CurrentCommitTran();
             await _sysCacheService.DelByPatternAsync(CommonConst.CACHE_KEY_USERSDATASCOPE);
         }

Myshipping.Web.Core/applicationconfig.json

@@ -56,7 +56,7 @@
   },
   "Cache": {
     "CacheType": "RedisCache", // RedisCache
-    "RedisConnectionString": "192.168.0.247:6379,password=,defaultDatabase=11"
+    "RedisConnectionString": "127.0.0.1:6379,password=,defaultDatabase=11"
   },
   "SnowId": {
     "WorkerId": "1" // 取值范围0~63,默认1

Myshipping.Web.Entry/appsettings.json

@@ -38,5 +38,12 @@
   },
   "AllowedHosts": "*",
   "Urls": "http://localhost:5120",
-  "RunType": "NORMAL" //运行方式：CUST客户端、DJY大简云运营端、NORMAL普通订舱模式
+
+  /*  **********RunType运行方式说明**********
+      HeChuan 和川（会执行一些和川特有的逻辑）
+      Normal 标准模式（自用）
+      CUST 客户订舱系统-客户端
+      DJY 客户订舱系统-大简云运营端
+  */
+  "RunType": "HeChuan"
 }