Merge branch 'dev-1.3' of http://120.26.58.240:8888/r/LifePaymentApi into d...

zhengyiming

2025-06-09 9a7e2f2a8c0017f9445e9281bb5f574596dbe61c

Merge branch 'dev-1.3' of http://120.26.58.240:8888/r/LifePaymentApi into dev-1.3

 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -99,7 +99,6 @@

    #region 查询


    /// <summary>
    /// 获取电费面值
    /// </summary>

 LifePayment/LifePayment.Worker/LifePayment.Worker.csproj

@@ -38,4 +38,19 @@
    <ProjectReference Include="..\LifePayment.EntityFrameworkCore\LifePayment.EntityFrameworkCore.csproj" />
  </ItemGroup>

  <ItemGroup>
    <None Update="Cert\alipayCertPublicKey_RSA2.crt">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
    <None Update="Cert\alipayRootCert.crt">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
    <None Update="Cert\appCertPublicKey_2021004171602214.crt">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
    <None Update="Cert\CSR文件.csr">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
  </ItemGroup>

</Project>

 LifePayment/LifePayment.Worker/LifePaymentServicesWorkModule.cs

@@ -52,6 +52,7 @@
        public async override Task OnApplicationInitializationAsync(ApplicationInitializationContext context)
        {
            await context.AddBackgroundWorkerAsync<GetStaticsWorker>();
            await context.AddBackgroundWorkerAsync<CheckUnPayOrderWork>();
        }

        private void ConfigurePays(ServiceConfigurationContext context, IConfiguration configuration)

 LifePayment/LifePayment.Worker/Worker/CheckUnPayOrderWork.cs

New file
@@ -0,0 +1,87 @@
using LifePayment.Application;
using LifePayment.Application.Contracts;
using LifePayment.Application.LifePay;
using LifePayment.Domain.Models;
using LifePayment.Domain.Shared;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Nest;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.BackgroundWorkers;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Threading;
using Volo.Abp.Uow;
using ZeroD.Util;

namespace LifePayment.Worker.Worker
{
    public class CheckUnPayOrderWork : AsyncPeriodicBackgroundWorkerBase
    {
        private readonly int _doWorkHour = 0;
        private readonly int _doWorkMinute = 1;
        private readonly ILifePayOrderService lifePayOrderService;
        private readonly ILifePayService lifePayService;
        private readonly IRepository<LifePayOrder, Guid> lifePayOrderRepository;

        public CheckUnPayOrderWork(
            AbpAsyncTimer timer,
            IServiceScopeFactory serviceScopeFactory,
            ILifePayOrderService lifePayOrderService,
            ILifePayService lifePayService,
            IRepository<LifePayOrder, Guid> lifePayOrderRepository) : base(timer, serviceScopeFactory)
        {
            timer.Period = (int)TimeSpan.FromMinutes(10).TotalMilliseconds;
            this.lifePayOrderService = lifePayOrderService;
            this.lifePayService = lifePayService;
            this.lifePayOrderRepository = lifePayOrderRepository;
        }

        [UnitOfWork]
        protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext)
        {
            try
            {
                Logger.LogInformation($"检查未支付订单状态开始: {DateTime.Now}");
                var end = DateTime.Now;
                var start = end.AddMinutes(-15);
                var orderNos = lifePayOrderRepository.Where(it => it.PayStatus == LifePayStatusEnum.未支付 && it.CreationTime >= start && it.CreationTime <= end).Select(it => it.OrderNo).ToList();
                foreach (var orderNo in orderNos)
                {
                    var wxPayNotice = await lifePayService.WxPayTradeQuery(orderNo);
                    var json = wxPayNotice.ToJson();
                    Logger.LogInformation($"订单（{wxPayNotice.OutTradeNo}）信息: {json}");
                    if (wxPayNotice.OutTradeNo.Contains("JF") && wxPayNotice.TradeState == LifePaymentConstant.WxPayStatus.支付成功)
                    {
                        await lifePayService.LifePaySuccessHandler(wxPayNotice.OutTradeNo, wxPayNotice.TransactionId);

                        // 插入收支流水
                        await lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
                        {
                            OrderNo = wxPayNotice.OutTradeNo,
                            OutOrderNo = wxPayNotice.TransactionId,
                            LifePayType = LifePayTypeEnum.WxPay,
                            ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses,
                            Amount = wxPayNotice.Amount.Total
                        });

                        Logger.LogInformation("已改为支付成功");
                    }
                    else
                    {
                        Logger.LogInformation("未更新");
                    }
                }
            }
            catch (Exception ex)
            {
                Logger.LogError($"检查未支付订单状态发生异常: {DateTime.Now}" + ex.Message);
            }


        }
    }
}

 LifePayment/LifePayment.Worker/appsettings.json

@@ -13,9 +13,8 @@
    "OssUrl": "https://waterdroptest2.oss-cn-hangzhou.aliyuncs.com/"
  },
  "ConnectionStrings": {
    //"LifePayment": "Server=120.26.58.240; Database=Dev_12333; User=bole;Password=Blym123!@#$"
    "AbpIdentity": "Server=120.26.58.240; Database=Dev_LifePaymentIdentity; User=bole;Password=Bole147258",
    "LifePaymentServices": "Server=120.26.58.240; Database=Dev_LifePayment; User=bole;Password=Bole147258"
    "LifePaymentServices": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333;Database=Dev_LifePayment;Uid=bole;Pwd=Blcs20@%27;",
    "AbpIdentity": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333;Database=Dev_LifePaymentIdentity;Uid=bole;Pwd=Blcs20@%27;"
  },
  "App": {
    "CorsOrigins": "http://localhost:31804"