Merge branch 'master' into dev-lifepay-v1.3

zhengyuxuan

2025-03-27 37a0d618c0b33cd817f6ed12c0b54743a2af0ff3

Merge branch 'master' into dev-lifepay-v1.3

 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -51,6 +51,7 @@
    private readonly IAlipayInterfaceManager _alipayInterfaceManager;
    private readonly IWxPayApi _wxPayApi;
    private readonly WxPayOption _wxPayOptions;
    private readonly InitSetting _initSettingOptions;

    private readonly IACOOLYManager _aCOOLYManager;

@@ -67,6 +68,7 @@
                          IAlipayInterfaceManager aliPayInterfaceManager,
                          IWxPayApi wxPayApi,
                          IOptions<WxPayOption> wxPayOptions,
                          IOptions<InitSetting> initSettingOptions,
                          IRepository<LifePayChannles, Guid> lifePayChannlesRep,
                          IRepository<LifePayAccount, Guid> lifePayAccount,
                          IDataFilter dataFilter,
@@ -83,6 +85,7 @@
        _alipayInterfaceManager = aliPayInterfaceManager;
        _wxPayApi = wxPayApi;
        _wxPayOptions = wxPayOptions.Value;
        _initSettingOptions = initSettingOptions.Value;
        _distributedEventBus = distributedEventBus;
        _lifePayChannlesRep = lifePayChannlesRep;
        _lifePayAccount = lifePayAccount;
@@ -1826,15 +1829,21 @@

    private (decimal PayAmont, decimal DiscountAmount, decimal RechargeAmount) CalculateAmount(decimal amount, decimal rate)
    {
        /// 正常支付
        var payAmount = decimal.Round(amount * rate / 100, 2, MidpointRounding.AwayFromZero);
        if (_initSettingOptions.OpenTheOnePennyTest)
        {
            /// 1分钱支付
            decimal payAmount = 0.01m;

        /// 1分钱支付
        //decimal payAmount = 0.01m;
            CheckExtensions.IfTrueThrowUserFriendlyException(payAmount < 0.01m, "支付金额错误");

        CheckExtensions.IfTrueThrowUserFriendlyException(payAmount < 0.01m, "支付金额错误");

        return (payAmount, amount - payAmount, amount);
            return (payAmount, amount - payAmount, amount);
        }
        else
        {
            /// 正常支付
            var payAmount = decimal.Round(amount * rate / 100, 2, MidpointRounding.AwayFromZero);
            return (payAmount, amount - payAmount, amount);
        }
    }

    private void SetOrderStatus(LifePayOrder order, string code)

 LifePayment/LifePayment.Domain.Shared/InitSetting.cs

@@ -155,5 +155,10 @@
        /// 当前电子签
        /// </summary>
        public string CurrentSign { get; set; }

        /// <summary>
        /// 开启1分钱测试模式
        /// </summary>
        public bool OpenTheOnePennyTest { get; set; }
    }
}

 LifePayment/LifePayment.Host/appsettings.json

@@ -113,7 +113,8 @@
    "OfflinePayEndDays": 3, //线下支付汇款时间最晚天数(单位：天)
    "BankWalletAccountOpenCodeProviderName": "BankWalletAccountOpen", //银行钱包开户验证码模板名称
    "BankWalletAccountOpenCodeValidTime": 5, //银行钱包开户验证码有效时间(单位分)
    "FaceAuthReturnUrl": "https://www.81812333.com/"
    "FaceAuthReturnUrl": "https://www.81812333.com/",
    "OpenTheOnePennyTest": true //开启1分钱测试模式
  },
  "ACOOLY": {
    "PartnerId": "250220171531F0572977",
@@ -155,6 +156,5 @@
    "EncryptKey": "jjy8A7hB/1Bkhg+8FtXyyg==",
    "AlipayPublicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoDrOheetqHkE1RYaNhogP/iHVXEtGZW4A/JJnwpJs+6eLXfpXf/ecuywplDpgc/BXSUEnDaktUwceLXO8vdIf8h0y8yqWwYdgzC0xELYpTroK3dlNiShgVkUEeMXi+n3Mhjp9OVrqieggDI3YGzDBLY4UAWsXCcXnD+r/xIpT8keVMtb/LrUmL5XLvBVcn5MkJTAoeFt18EQXOLFN1+ldpaf9k+iyM2fbgXCc6InNSgHGSHZwhzm9t+cGqNd1ju/nQN9lHwKCDQPMn6cor2lsP1nsEfpHp2vdfNEdccVSRZB/kdtFzXEUpTFznz8+zK2D0Ra+B0G1nSxus9xsD3HmwIDAQAB"
  },

  "AllowedHosts": "*"
}