feat 优化消费过程

2025-02-13 17:37:47 +08:00
parent 964e033583
commit 4555ddb721
13 changed files with 579 additions and 166 deletions
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -1,19 +1,14 @@
 using Dlhis.Basic.Api;
-using Dlhis.Canteen.Order.Dto;
 using Dlhis.Canteen.Order.Repository;
+using Dlhis.Canteen.Order.Request;
+using Dlhis.Canteen.Order.Response;
 using Dlhis.Canteen.Setting.Services;
+using Dlhis.Constants;
 using Dlhis.Entity.Basic.Entity;
 using Dlhis.Entity.Canteen.Entities;
 using Dlhis.Entity.Canteen.Enums;
-using Dlhis.Entity.Device.Entities;
-using Kurisu.AspNetCore.Utils;
-using Kurisu.AspNetCore.Utils.Extensions;
-using Mapster;
-using SqlSugar;
-using Dlhis.Canteen.Order.Response;
-using Dlhis.Canteen.Order.Request;
 using Dlhis.Entity.Device;
-using Dlhis.Entity.Device.Enums;
+using Dlhis.Entity.Device.Entities;
 using Kurisu.AspNetCore.Authentication.Abstractions;
 using Kurisu.AspNetCore.Cache;
 using Kurisu.AspNetCore.CustomClass;
@@ -21,7 +16,10 @@ using Kurisu.AspNetCore.DataAccess.Dto;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
 using Kurisu.AspNetCore.UnifyResultAndValidation;
-using Dlhis.Constants;
+using Kurisu.AspNetCore.Utils;
+using Kurisu.AspNetCore.Utils.Extensions;
+using Mapster;
+using SqlSugar;

 namespace Dlhis.Canteen.Order.Services.Implements;

@@ -30,31 +28,34 @@ public class OrderService : IOrderService
    private readonly ICanteenSettingService _canteenSettingService;
    private readonly IDbContext _dbContext;
    private readonly ICurrentUser _currentUser;
-    private readonly IHttpContextAccessor _httpContextAccessor;
    private readonly IBalanceRepository _balanceRepository;
    private readonly IOrderRepository _orderRepository;
    private readonly RedisCache _redisCache;
    private readonly IGainfoPermissionApi _gainfoPermissionApi;
+    private readonly IOrderCommonHandler _orderCommonHandler;
+    private readonly INamedResolver _namedResolver;
    private readonly ILogger<OrderService> _logger;

    public OrderService(ICanteenSettingService canteenSettingService,
        IDbContext dbContext,
        ICurrentUser currentUser,
-        IHttpContextAccessor httpContextAccessor,
        IBalanceRepository balanceRepository,
        IOrderRepository orderRepository,
        RedisCache redisCache,
        IGainfoPermissionApi gainfoPermissionApi,
+        IOrderCommonHandler orderCommonHandler,
+        INamedResolver namedResolver,
        ILogger<OrderService> logger)
    {
        _canteenSettingService = canteenSettingService;
        _dbContext = dbContext;
        _currentUser = currentUser;
-        _httpContextAccessor = httpContextAccessor;
        _balanceRepository = balanceRepository;
        _orderRepository = orderRepository;
        _redisCache = redisCache;
        _gainfoPermissionApi = gainfoPermissionApi;
+        _orderCommonHandler = orderCommonHandler;
+        _namedResolver = namedResolver;
        _logger = logger;
    }

@@ -75,7 +76,7 @@ public class OrderService : IOrderService
    /// <returns></returns>
    public async Task<DefaultApiResult<OrderResultResponse>> AddAsync(OrderAddRequest request)
    {
-        await SetDeviceIpInfoAsync(request.DeviceUniqueNo);
+        await _orderCommonHandler.SetDeviceIpInfoAsync(request.DeviceUniqueNo);

        await using var handler = await _redisCache.LockAsync($"consume:device:{request.UserUniqueNo}");
        handler.Acquired.ThrowIfFalse("请勿频繁消费");
@@ -152,39 +153,47 @@ public class OrderService : IOrderService
        var s = long.TryParse(request.UserUniqueNo, out var userId);
        GainfoEntity gainfo;

+        //条码消费
        if (request.Source == BalanceRecordSourceEnumType.QrCode)
        {
-            if (request.UserUniqueNo.StartsWith(QrCodeConstants.User))
+            var flag = request.UserUniqueNo.Substring(0, 2);
+            switch (flag)
            {
-                gainfo = await GetUserByQrCodeAsync(request.UserUniqueNo);
-                await CheckPermissionAsync(gainfo.Code, request.DeviceUniqueNo);
-            }
-            else if (request.UserUniqueNo.StartsWith(QrCodeConstants.EMealVoucher))
-            {
-                request.Source = BalanceRecordSourceEnumType.EMealVoucher;
-                var eMealVoucherQrCode = await _dbContext.Queryable<EMealVoucherDetailQrCodeEntity>().Where(x => x.QrCode == request.UserUniqueNo).SingleAsync();
-                eMealVoucherQrCode.ThrowIfNull("无法识别");
-                var code = eMealVoucherQrCode.OriginData.Split(':')[2];
-                gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Code == code).SingleAsync();
-            }
-            else if (request.UserUniqueNo.StartsWith(QrCodeConstants.Birthday))
-            {
-                var ticket = await _dbContext.Queryable<TicketEntity>().Where(x => x.Type == TicketEnumType.Birthday).Where(x => x.QrCode == request.UserUniqueNo).SingleAsync();
-                ticket.ThrowIfNull("无法识别");
-                gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Code == ticket.UserCode).SingleAsync();
-            }
-            else
-            {
-                throw new UserFriendlyException($"无法识别{request.UserUniqueNo}");
+                case QrCodeConstants.User:
+                {
+                    gainfo = await GetUserByQrCodeAsync(request.UserUniqueNo);
+                    await CheckPermissionAsync(gainfo.Code, request.DeviceUniqueNo);
+                }
+                    break;
+                case QrCodeConstants.EMealVoucher:
+                {
+                    request.Source = BalanceRecordSourceEnumType.EMealVoucher;
+                    var eMealVoucherQrCode = await _dbContext.Queryable<EMealVoucherDetailQrCodeEntity>().Where(x => x.QrCode == request.UserUniqueNo).SingleAsync();
+                    eMealVoucherQrCode.ThrowIfNull("无法识别");
+                    var code = eMealVoucherQrCode.OriginData.Split(':')[2];
+                    gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Code == code).SingleAsync();
+                }
+                    break;
+                case QrCodeConstants.Birthday:
+                {
+                    request.Source = BalanceRecordSourceEnumType.Birthday;
+                    var ticket = await _dbContext.Queryable<TicketEntity>().Where(x => x.Type == TicketEnumType.Birthday).Where(x => x.QrCode == request.UserUniqueNo).SingleAsync();
+                    ticket.ThrowIfNull("无法识别");
+                    gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Code == ticket.UserCode).SingleAsync();
+                }
+                    break;
+
+                default: throw new UserFriendlyException($"无法识别{request.UserUniqueNo}");
            }
        }
        else
        {
            //根据档案号
+            //区分userId和code: 工号纯数字避免跟userId相同导致查询到的消费人错误
            gainfo = await _dbContext.Queryable<GainfoEntity>()
-                .WhereIF(request.Source == BalanceRecordSourceEnumType.Card, x => x.CardNo == request.UserUniqueNo)
-                .WhereIF(request.Source != BalanceRecordSourceEnumType.Card && !request.IsUserId, x => x.Code == request.UserUniqueNo)
-                .WhereIF(request.Source != BalanceRecordSourceEnumType.Card && request.IsUserId && s, x => x.Id == userId)
+                .WhereIF(request.Source == BalanceRecordSourceEnumType.Card, x => x.CardNo == request.UserUniqueNo) //卡号
+                .WhereIF(request.Source != BalanceRecordSourceEnumType.Card && !request.IsUserId, x => x.Code == request.UserUniqueNo) //工号
+                .WhereIF(request.Source != BalanceRecordSourceEnumType.Card && request.IsUserId && s, x => x.Id == userId) //user id
                .SingleAsync();
        }

@@ -230,7 +239,7 @@ public class OrderService : IOrderService

        //一天消费金额
        var dayCostMax = await _canteenSettingService.GetSettingAsync<decimal>(CanteenSettingItemEnumType.DayCostMax, order.TenantId, order.UserNo);
-        if (dayCostMax != default)
+        if (dayCostMax != 0)
        {
            //消费记录一定会有营业点代码!.Value是安全用法
            var cost = todayAllBalanceRecords
@@ -242,7 +251,7 @@ public class OrderService : IOrderService

        //一次消费金额
        var onceCostMax = await _canteenSettingService.GetSettingAsync<decimal>(CanteenSettingItemEnumType.OnceCostMax, order.TenantId, order.UserNo);
-        if (onceCostMax != default)
+        if (onceCostMax != 0)
        {
            (Math.Abs(order.Amount) > onceCostMax).ThrowIfTrue($"单次消费金额不能超出{onceCostMax}元");
        }
@@ -251,7 +260,7 @@ public class OrderService : IOrderService
        if (order.BusinessPlaceCode.HasValue && supermarketCodes.Contains(order.BusinessPlaceCode.Value))
        {
            var dayMarketCostMax = await _canteenSettingService.GetSettingAsync<decimal>(CanteenSettingItemEnumType.DayMarketCostMax, order.TenantId, order.UserNo);
-            if (dayMarketCostMax != default)
+            if (dayMarketCostMax != 0)
            {
                var cost = todayAllBalanceRecords.Where(x => x.BusinessPlaceCode.HasValue)
                    .Where(x => supermarketCodes.Contains(x.BusinessPlaceCode.Value))
@@ -352,7 +361,7 @@ public class OrderService : IOrderService
    /// <returns></returns>
    private async Task ConsumeAsync(ConsumeRequest request, GainfoEntity gainfo)
    {
-        var checkData = await PreCheckAsync(request.DeviceUniqueNo, request.CostDateTime);
+        var checkData = await _orderCommonHandler.PreCheckAsync(request.DeviceUniqueNo, request.CostDateTime);
        var order = await _orderRepository.CreateDeviceConsumeOrderAsync(checkData, request, gainfo);

        if (request.Image.IsPresent())
@@ -365,7 +374,7 @@ public class OrderService : IOrderService
            });
        }

-        await TryConsumeAsync(order.Id, async () =>
+        await _orderCommonHandler.TryConsumeAsync(order.Id, async () =>
        {
            //校验
            await Verify(order);
@@ -378,78 +387,11 @@ public class OrderService : IOrderService
        });
    }

-    private async Task<DefaultApiResult<OrderResultResponse>> EMealVoucherConsumeAsync(OrderAddRequest request, GainfoEntity gainfo)
-    {
-        var msg = string.Empty;
-        var originData = await _dbContext.Queryable<EMealVoucherDetailQrCodeEntity>()
-            .Where(x => x.QrCode == request.UserUniqueNo)
-            .Select(x => x.OriginData)
-            .SingleAsync();

-        if (originData.IsEmpty())
-        {
-            msg = "无法识别";
-            return new DefaultApiResult<OrderResultResponse>
-            {
-                Code = ApiStateCode.Error,
-                Data = null,
-                Msg = msg
-            };
-        }
-
-        var originDataItems = originData.Split(":");
-        var no = originDataItems[0];
-        var idNo = originDataItems[3];
-
-        try
-        {
-            await EMealVoucherConsumeAsync(request.Adapt<ConsumeRequest>(), gainfo, originData, no, idNo);
-        }
-        catch (Exception ex)
-        {
-            msg = ex.Message;
-        }
-
-        //获取餐券余额
-        var data = await _dbContext.Queryable<EMealVoucherEntity>()
-            .LeftJoin<EMealVoucherDetailEntity>((x, d) => x.No == d.No)
-            .Where((x, d) => x.No == no && d.IdNo == idNo)
-            .Select((x, d) => new OrderResultResponse
-            {
-                UserCode = d.IdNo,
-                UserName = d.Name,
-                CurrentBalance = d.Balance
-            })
-            .SingleAsync();
-
-        try
-        {
-            var v = data.UserCode ?? string.Empty;
-            var vc = v.ToCharArray().Reverse().ToList();
-
-            for (int i = 0; i < vc.Count; i++)
-            {
-                if (i + 1 > 4)
-                {
-                    vc[i] = '*';
-                }
-            }
-
-            vc.Reverse();
-            data.UserCode = string.Join("", vc);
-        }
-        catch (Exception)
-        {
-            //ignore  
-        }
-
-        return new DefaultApiResult<OrderResultResponse>
-        {
-            Code = msg.IsPresent() ? ApiStateCode.Error : ApiStateCode.Success,
-            Data = data,
-            Msg = msg
-        };
-    }
+    // private async Task<DefaultApiResult<OrderResultResponse>> BirthdayConsumeAsync(OrderAddRequest request, GainfoEntity gainfo)
+    // {
+    //     
+    // }


    private async Task OfflineConsumeAsync(OrderAddRequest request, GainfoEntity gainfo)
@@ -488,8 +430,9 @@ public class OrderService : IOrderService
    {
        var message = string.Empty;

-        if (request.Source == BalanceRecordSourceEnumType.EMealVoucher)
-            return await EMealVoucherConsumeAsync(request, gainfo);
+        var otherTypes = new[] { BalanceRecordSourceEnumType.EMealVoucher, BalanceRecordSourceEnumType.Birthday };
+        if (otherTypes.Contains(request.Source))
+            return await _namedResolver.GetService<IConsumeHandler>(request.Source.ToString()).ConsumeAsync(request, gainfo);

        if (request.IsOffline)
            await OfflineConsumeAsync(request, gainfo);
@@ -696,34 +639,9 @@ public class OrderService : IOrderService
        if (orders.IsEmpty())
            return true;

-        var order = orders.FirstOrDefault();
+        var order = orders.FirstOrDefault()!;

        //存在在线order数据,但是状态未成功
        return !order.IsOffline && order.OrderStatus != CanteenOrderStatusEnumType.Success;
    }
-
-    private async Task TryConsumeAsync(long orderId, Func<Task> action)
-    {
-        try
-        {
-            await action();
-
-            await _dbContext.Updateable<CanteenOrderEntity>()
-                .SetColumns(x => x.OrderStatus == CanteenOrderStatusEnumType.Success)
-                .SetColumns(x => x.ModifiedTime == DateTime.Now)
-                .Where(x => x.Id == orderId)
-                .ExecuteCommandAsync();
-        }
-        catch (Exception ex)
-        {
-            await _dbContext.Updateable<CanteenOrderEntity>()
-                .SetColumns(x => x.OrderStatus == CanteenOrderStatusEnumType.Failure)
-                .SetColumns(x => x.ModifiedTime == DateTime.Now)
-                .SetColumns(x => x.Result == ex.Message)
-                .Where(x => x.Id == orderId)
-                .ExecuteCommandAsync();
-
-            throw;
-        }
-    }
 }