From 41d5a89660d5d276c06c31670ce483285a7018cc Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期四, 20 三月 2025 17:14:32 +0800
Subject: [PATCH] fix:bug修复

---
 LifePayment/LifePayment.Application/LifePay/LifePayService.cs |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 6531979..c6e55a9 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -317,6 +317,47 @@
         return result;
     }
 
+    public async Task<LifePayRefundOrderOutput> GetLifePayRefundOrderDetail(string orderNo)
+    {
+        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
+        var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
+        var channle = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);
+        var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
+        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
+        var user = await _lifePayUserRepository.FirstOrDefaultAsync(x => x.Id == order.UserId);
+
+        var channlesRakePrice = (order.PayAmount - (order.PlatformDeductionAmount == null ? 0 : order.PlatformDeductionAmount)) * channle.ChannlesRakeRate / 100;
+        var result = new LifePayRefundOrderOutput()
+        {
+            UserName = user.Name,
+            UserPhoneNumber = user.PhoneNumber,
+            DiscountAmount = order.DiscountAmount,
+            FinishTime = order.FinishTime,
+            Id = order.Id,
+            OutOrderNo = order.OutOrderNo,
+            LifePayChannle = channle.ChannlesName,
+            LifePayOrderStatus = order.LifePayOrderStatus,
+            LifePayOrderType = order.LifePayOrderType,
+            LifePayType = order.LifePayType,
+            OrderNo = order.OrderNo,
+            PayAmount = order.PayAmount,
+            RechargeAmount = order.RechargeAmount,
+            PayStatus = order.PayStatus,
+            PayTime = order.PayTime,
+            RefundCredentialsImgUrl = order.RefundCredentialsImgUrl.GetOssPath(),
+            CreationTime = order.CreationTime,
+            RefundCheckRemark = order.RefundCheckRemark,
+            RefundApplyRemark = order.RefundApplyRemark,
+            RefundTime = order.RefundTime,
+            ACOOLYOrderNo = order.ACOOLYOrderNo,
+            LifePayRefundStatus = order.LifePayRefundStatus,
+            ActualRechargeAmount = order.ActualRechargeAmount,
+            RefundPrice = order.RefundPrice,
+        };
+
+        return result;
+    }
+
     /// <summary>
     /// 鑾峰彇鎴戠殑璁㈠崟鍒嗛〉鏁版嵁
     /// </summary>
@@ -930,10 +971,12 @@
                 OpenId = openid
             }
         };
+        Logger.LogError("璋冪敤璇锋眰锛�" + req.ToJson());
         var timestamp = DateTimeOffset.Now.ToUnixTimeSeconds();
         string nonce = Guid.NewGuid().ToString();
 
         var res = await _wxPayApi.PayTransactionsJsAPI(req);
+        Logger.LogError("璋冪敤缁撴灉锛�" + res.ToJson());
         string package = "prepay_id=" + res.PrepayId;
         ModelPaymentMiniPay info = new ModelPaymentMiniPay();
         if (res != null)
@@ -1052,6 +1095,7 @@
             order.PayStatus = LifePayStatusEnum.寰呴��娆�;
         }
 
+
         await _lifePayOrderRepository.UpdateAsync(order);
     }
 
@@ -1076,23 +1120,29 @@
             throw new UserFriendlyException("褰撳墠璁㈠崟鐘舵�佹棤娉曢��娆�");
         }
 
+        var outRefundNo = order.ChannelId + CreateRefundOrderNo();
+        order.RefundOrderNo = outRefundNo;
         switch (order.LifePayType)
         {
             case LifePayTypeEnum.WxPay:
-                var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, order.RefundApplyRemark, Convert.ToInt32(order.PayAmount * 100), Convert.ToInt32(order.PayAmount * 100));
+                var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, outRefundNo,order.RefundApplyRemark, Convert.ToInt32(order.PayAmount * 100), Convert.ToInt32(order.PayAmount * 100));
                 if (wxRefundResult.Status == "SUCCESS")
                 {
                     order.PayStatus = LifePayStatusEnum.宸查��娆�;
                     order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
+                    order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
                 }
                 else if (wxRefundResult.Status == "PROCESSING")
                 {
                     order.PayStatus = LifePayStatusEnum.閫�娆句腑;
                     order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+                    order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
                 }
                 else
                 {
-                    throw new UserFriendlyException("閫�娆惧け璐�");
+                    order.PayStatus = LifePayStatusEnum.寰呴��娆�;
+                    order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧け璐�;
+                    order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
                 }
 
                 break;
@@ -1167,12 +1217,12 @@
     /// <param name="total"></param>
     /// <param name="currency"></param>
     /// <returns></returns>
-    public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo, string reason, int refund, int total, string currency = "CNY")
+    public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo,string outRefundNo, string reason, int refund, int total, string currency = "CNY")
     {
         WxPayDomesticRefundsRequest req = new WxPayDomesticRefundsRequest
         {
             OutTradeNo = outTradeNo,
-            OutRefundNo = CreateRefundOrderNo(),
+            OutRefundNo = outRefundNo,
             Reason = reason,
             Amount = new Model_WxPayDomesticRefunds_Amount
             {

--
Gitblit v1.9.1