From 85de4f8a1ef46f61e57b4ec375186122c23a3212 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期四, 27 三月 2025 15:10:45 +0800
Subject: [PATCH] fix:新增支付宝查询

---
 LifePayment/LifePayment.Application/LifePay/LifePayService.cs |   57 +++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index f932280..3645623 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -197,6 +197,8 @@
             .WhereIf(!string.IsNullOrEmpty(input.QueryCondition), x => x.PhoneNumber.Contains(input.QueryCondition) || x.Name.Contains(input.QueryCondition))
             .WhereIf(input.CreationTimeBegin.HasValue, x => x.CreationTime >= input.CreationTimeBegin)
             .WhereIf(input.CreationTimeEnd.HasValue, x => x.CreationTime <= input.CreationTimeEnd)
+            .WhereIf(input.LoginTimeBegin.HasValue, x => x.LastLoginTime >= input.LoginTimeBegin)
+            .WhereIf(input.LoginTimeEnd.HasValue, x => x.LastLoginTime <= input.LoginTimeEnd)
                                             .Select(x =>
                                                    new UserListOutput()
                                                    {
@@ -818,6 +820,15 @@
             return "";
         }
     }
+
+    public async Task<AlipayTradeQueryResponse> QueryGetAlipayTrade(OrderInQuiryInput input)
+    {
+        var result = await _aliPayApi.OrderInQuiry(input);
+        return result;
+    }
+
+
+
     #endregion
 
     #region 鎿嶄綔
@@ -841,7 +852,7 @@
         var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.璇濊垂璁㈠崟 && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
         && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.IspCode)
         && x.OrderParamDetailJsonStr.Contains(input.ProductData.Phone)).ToListAsync();
-        CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
+         CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
 
         //var rate = await GetRate();
         //CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
@@ -1551,7 +1562,7 @@
             var userAccount = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.Id == input.Id)
                                             .FirstOrDefaultAsync();
             CheckExtensions.IfTrueThrowUserFriendlyException(userAccount == null, "鎴峰彿涓嶅瓨鍦�");
-            var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.Id != input.Id)
+            var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.Id != input.Id && x.IsDeleted == false)
                                             .FirstOrDefaultAsync();
             CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "鎴峰彿宸插瓨鍦�");
 
@@ -1565,22 +1576,36 @@
         }
         else
         {
-            var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content)
+            var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.IsDeleted == false)
                                             .FirstOrDefaultAsync();
-            CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "鎴峰彿宸插瓨鍦�");
-            var userAccount = new LifePayAccount
+            /// CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "鎴峰彿宸插瓨鍦�");
+            if (repeatAccountContent != null)
             {
-                Id = Guid.NewGuid(),
-                UserId = input.UserId,
-                Content = input.Content,
-                Province = input.Province,
-                LifePayType = input.LifePayType,
-                City = input.City,
-                Remark = input.Remark,
-                Operators = input.Operators,
-                ExtraProperties = input.ExtraProperties,
-            };
-            await _lifePayAccount.InsertAsync(userAccount);
+                repeatAccountContent.LifePayType = input.LifePayType;
+                repeatAccountContent.Content = input.Content;
+                repeatAccountContent.Province = input.Province;
+                repeatAccountContent.City = input.City;
+                repeatAccountContent.Remark = input.Remark;
+                repeatAccountContent.Operators = input.Operators;
+                repeatAccountContent.ExtraProperties = input.ExtraProperties;
+            }
+            else
+            {
+                var userAccount = new LifePayAccount
+                {
+                    Id = Guid.NewGuid(),
+                    UserId = input.UserId,
+                    Content = input.Content,
+                    Province = input.Province,
+                    LifePayType = input.LifePayType,
+                    City = input.City,
+                    Remark = input.Remark,
+                    Operators = input.Operators,
+                    ExtraProperties = input.ExtraProperties,
+                };
+                await _lifePayAccount.InsertAsync(userAccount);
+            }
+            
         }
 
         if (input.LifePayType == LifePayOrderTypeEnum.璇濊垂璁㈠崟)

--
Gitblit v1.9.1