From 0c0ecc9cb0536b8600bc2a4ffe407b0836bfac35 Mon Sep 17 00:00:00 2001
From: khalil <842328916@qq.com>
Date: Wed, 27 Aug 2025 13:57:14 +0800
Subject: [PATCH] =?UTF-8?q?ios=E5=86=85=E8=B4=AD-=E9=AA=8C=E5=8D=95-?=
 =?UTF-8?q?=E5=8A=A0=E5=88=A4=E5=8F=82=E6=95=B0=E9=9D=9E=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 40a49976f57dc6927428821669e6b90f52e4a3ac)
---
 .../service/apple/IOSStoreKitV2Service.java         |  6 +++---
 .../controller/IOSStorekitV2Controller.java         | 13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/apple/IOSStoreKitV2Service.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/apple/IOSStoreKitV2Service.java
index 9d4093cec..f5ea0b7a3 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/apple/IOSStoreKitV2Service.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/apple/IOSStoreKitV2Service.java
@@ -58,7 +58,7 @@ public class IOSStoreKitV2Service {
                 clientIp, null, null, deviceInfo, roomUid, null, null, null);
     }
 
-    public String verifyOrder(String uid, String chargeRecordId, String transcationId, String clientIp, DeviceInfo deviceInfo) {
+    public String verifyOrder(String chargeRecordId, String transcationId, String clientIp, DeviceInfo deviceInfo) {
         boolean locked = false;
         String lockKey = RedisKey.lock_iospay_verify.getKey(transcationId);
         RLock lock = redissonClient.getLock(lockKey);
@@ -67,7 +67,7 @@ public class IOSStoreKitV2Service {
             if (!locked){
                 throw new ServiceException(BusiStatus.SERVERBUSY);
             }
-            log.info("[verifyOrder] 参数 {} {} {} {} {}", uid, chargeRecordId, transcationId, clientIp, deviceInfo.getDeviceId());
+            log.info("[verifyOrder] 参数 {} {} {} {} {}", chargeRecordId, transcationId, clientIp, deviceInfo.getDeviceId());
 
             ChargeRecord chargeRecord = chargeRecordService.getChargeRecordById(chargeRecordId);
             if (null == chargeRecord
@@ -76,7 +76,7 @@ public class IOSStoreKitV2Service {
                 throw new ServiceException(BusiStatus.TRANSFER_COMPLETED);
             }
 
-            ChargeRecord pingxxChargeRecord = chargeRecordService.getChargeRecordByPingxxChargeId(chargeRecord.getPingxxChargeId());
+            ChargeRecord pingxxChargeRecord = chargeRecordService.getChargeRecordByPingxxChargeId(transcationId);
             if (null != pingxxChargeRecord && !Constant.ChargeRecordStatus.create.equals(pingxxChargeRecord.getChargeStatus())){
                 throw new ServiceException(BusiStatus.TRANSFER_COMPLETED);
             }
diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/IOSStorekitV2Controller.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/IOSStorekitV2Controller.java
index 654c8103b..ecde9774c 100644
--- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/IOSStorekitV2Controller.java
+++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/IOSStorekitV2Controller.java
@@ -38,14 +38,17 @@ public class IOSStorekitV2Controller extends BaseController {
 
     @Authorization
     @RequestMapping("/verifyOrder")
-    public BusiResult<String> verifyOrder(String uid, String chargeRecordId, String transcationId,
+    public BusiResult<String> verifyOrder(String chargeRecordId, String transcationId,
                                              HttpServletRequest request) {
-        String clientIp = IPUtils.getRealIpAddress(request);
-        DeviceInfo deviceInfo = getDeviceInfo(request);
-        if (!StringUtils.hasText(uid) || !StringUtils.hasText(deviceInfo.getDeviceId())) {
+        if (!StringUtils.hasText(chargeRecordId) || !StringUtils.hasText(transcationId)) {
             return new BusiResult<>(BusiStatus.PARAMETERILLEGAL);
         }
-        String tId = iosPayPlaService.verifyOrder(uid, chargeRecordId, transcationId, clientIp, deviceInfo);
+        String clientIp = IPUtils.getRealIpAddress(request);
+        DeviceInfo deviceInfo = getDeviceInfo(request);
+        if (!StringUtils.hasText(deviceInfo.getDeviceId())) {
+            return new BusiResult<>(BusiStatus.PARAMETERILLEGAL);
+        }
+        String tId = iosPayPlaService.verifyOrder(chargeRecordId, transcationId, clientIp, deviceInfo);
         return new BusiResult<>(tId);
     }