From 9ae5f917ce8f88b0f5b7941defe1e2a8be632ab5 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 16 Apr 2025 20:20:54 +0800
Subject: [PATCH] 11

---
 .../service/impl/HardDoorFlowServiceImpl.java   |  8 +++++++-
 .../service/impl/ks/ThirdKsApiServiceImpl.java  | 17 ++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

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 dbd15b7a1..d732fad50 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
@@ -295,6 +295,12 @@ public class HardDoorFlowServiceImpl extends ServiceImpl<HardDoorFlowMapper, Har
             log.error("|{}|disposeRecognitionCallback 意外的错误,流程不存在dto|{}|", TAG, JSONUtil.toJsonStr(dto));
             return;
         }
+        if (ObjectUtil.isNotEmpty(flowDetail.getSkuCallbackTime())) {
+            log.error("|{}|disposeRecognitionCallback 该流程已经提交识别dto|{}|", TAG, JSONUtil.toJsonStr(dto));
+            return;
+        }           
+        HardDoorFlowEntity updateObj = HardDoorFlowEntity.builder().id(flowDetail.getId()).skuCallbackVo(JSONUtil.toJsonStr(dto)).skuCallbackTime(LocalDateTime.now()).build();
+        baseMapper.updateById(updateObj);
         // 查询订单
         HardOrderEntity orderDetail = hardOrderService.getById(flowDetail.getOrderId());
         if (ObjectUtil.isEmpty(orderDetail)) {
@@ -306,7 +312,7 @@ public class HardDoorFlowServiceImpl extends ServiceImpl<HardDoorFlowMapper, Har
         if (ObjectUtil.isNotEmpty(resultSkuList)) {
             Long orderId = hardOrderService.payHardDoorOrder(orderDetail, resultSkuList);
             if (ObjectUtil.isNotEmpty(orderId)) {
-                
+
             }
         }
     }
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/ks/ThirdKsApiServiceImpl.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/ks/ThirdKsApiServiceImpl.java
index d3e9b15a5..8ddea82f6 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/ks/ThirdKsApiServiceImpl.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/ks/ThirdKsApiServiceImpl.java
@@ -10,9 +10,12 @@ import com.bsd.pjcloud.thirdparty.entity.door.ThirdDoorLogEntity;
 import com.bsd.pjcloud.thirdparty.service.ThirdDoorLogService;
 import com.bsd.pjcloud.thirdparty.service.ThirdKsApiService;
 import com.bsd.pjcloud.thirdparty.utils.ks.api.KsApi;
+import com.bsd.pjcloud.thirdparty.utils.ks.tool.KsRetailSignUtils;
 import com.bsd.pjcloud.thirdparty.vo.ks.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpPost;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -305,7 +308,7 @@ public class ThirdKsApiServiceImpl implements ThirdKsApiService {
     @Override
     public void callbackSKu(String json, Map<String, String> headers) {
         KsSkuSubmitCallbackDto dto = JSONUtil.toBean(json, KsSkuSubmitCallbackDto.class);
-        boolean isSign = apiParseSign(json, headers);
+        boolean isSign = apiParseSign(json, ksDiscernConfig.getCallbackSkuUrl(), headers);
         if (!isSign) {
             log.error("|{}| callbackSKu 签名错误", TAG);
             return;
@@ -331,9 +334,8 @@ public class ThirdKsApiServiceImpl implements ThirdKsApiService {
      */
     @Override
     public void callbackRecognition(String json, Map<String, String> headers) {
-        String jsonStr = JSONUtil.toJsonStr(headers);
         KsRecognitionCallbackDto dto = JSONUtil.toBean(json, KsRecognitionCallbackDto.class);
-        boolean isSign = apiParseSign(json, headers);
+        boolean isSign = apiParseSign(json, ksDiscernConfig.getCallbackRecognitionUrl(), headers);
         if (!isSign) {
             log.error("|{}| callbackRecognition 签名错误", TAG);
             return;
@@ -357,7 +359,12 @@ public class ThirdKsApiServiceImpl implements ThirdKsApiService {
     /**
      * 接口解签
      */
-    private boolean apiParseSign(String json, Map<String, String> headers) {
-        return true;
+    private boolean apiParseSign(String json, String uri, Map<String, String> headers) {
+        String authorization = headers.get("Authorization");
+        String referer = headers.get("Referer");
+        String contentType = headers.get("Content-Type");
+        String timestamp = headers.get("REQUEST-START-TIME");
+        String signAuth = KsRetailSignUtils.getSignAuth(referer, uri, contentType, HttpPost.METHOD_NAME, Long.valueOf(timestamp), ksDiscernConfig.getAccessKey(), ksDiscernConfig.getSecretKey(), json, "");
+        return ObjectUtil.equals(signAuth, authorization);
     }
 }