From f478ad10ea617f9ca6078398d9d7138ac9ff6d8d Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 21 Apr 2025 20:04:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AE=8C=E5=96=84=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java  | 1 +
 .../pjcloud/hard/service/impl/HardDoorFlowServiceImpl.java  | 1 +
 .../service/impl/door/ThirdDoorApiServiceImpl.java          | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java
index d51fba8ad..c53ad4724 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java
@@ -92,6 +92,7 @@ public class HardAuthServiceImpl extends ServiceImpl<HardAuthMapper, HardAuthEnt
      * app智能柜授权
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Long appAuthHardDoor(HardAuthAppDto dto) {
         // 查询授权信息
         HardAuthEntity authEntity = baseMapper.selectById(dto.getAuthId());
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardDoorFlowServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardDoorFlowServiceImpl.java
index e31b477f0..7087d991b 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardDoorFlowServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardDoorFlowServiceImpl.java
@@ -185,6 +185,7 @@ public class HardDoorFlowServiceImpl extends ServiceImpl<HardDoorFlowMapper, Har
      * 购买开门
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void openDoorPay(HardDoorFlowOpenDto dto, HardDoorManagerVo hardDoorDetail) {
         if (ObjectUtil.isNotEmpty(dto.getHardDoorFlowId()) || ObjectUtil.isEmpty(hardDoorDetail)) {
             return;
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/door/ThirdDoorApiServiceImpl.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/door/ThirdDoorApiServiceImpl.java
index fd7617d0e..f69a22d07 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/door/ThirdDoorApiServiceImpl.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/door/ThirdDoorApiServiceImpl.java
@@ -387,12 +387,12 @@ public class ThirdDoorApiServiceImpl implements ThirdDoorApiService {
             log.error("|{}|apiParseSign 接口解签错误headers为空dto|{}|headers|{}|", TAG, json, JSONUtil.toJsonStr(headers));
             return false;
         }
-        String appid = headers.get("Appid");
+        String appid = headers.get("appId");
         String noncestr = headers.get("Noncestr");
         String timestamp = headers.get("Timestamp");
-        String sign = headers.get("Sign");
+        String sign = headers.get("sign");
         if (ObjectUtil.notEqual(doorConfig.getAppId(), appid)) {
-            log.error("|{}|apiParseSign 接口解签错误appId错误dto|{}|headers|{}|", TAG, json, JSONUtil.toJsonStr(headers));
+            log.error("|{}|apiParseSign 接口解签错误appId错误dto|{}|headers|{}|appid|{}|noncestr|{}|timestamp|{}|sign|{}|", TAG, json, JSONUtil.toJsonStr(headers), appid, noncestr, timestamp, sign);
             return false;
         }
         // 计算正确的sign