From 021582091714c9c82daac3370d7defcb138d6cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 26 Nov 2025 10:04:48 +0800
Subject: [PATCH] =?UTF-8?q?ocr=E8=AF=86=E5=88=AB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/market/entity/MkOcr.java |  4 ++++
 .../src/main/java/com/czg/utils/AliOcrUtil.java    |  1 -
 .../service/impl/ConsStockFlowServiceImpl.java     | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkOcr.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkOcr.java
index 636bdb1f0..52b8b540b 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkOcr.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkOcr.java
@@ -46,4 +46,8 @@ public class MkOcr implements Serializable {
 
     private Long shopId;
 
+    private String md5;
+    private String status;
+    private String err;
+
 }
diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/utils/AliOcrUtil.java b/cash-common/cash-common-tools/src/main/java/com/czg/utils/AliOcrUtil.java
index f3da6f718..799ae4d5c 100644
--- a/cash-common/cash-common-tools/src/main/java/com/czg/utils/AliOcrUtil.java
+++ b/cash-common/cash-common-tools/src/main/java/com/czg/utils/AliOcrUtil.java
@@ -55,7 +55,6 @@ public class AliOcrUtil {
 
     public static ApplyFileUploadLeaseResponseBody.ApplyFileUploadLeaseResponseBodyData applyFileUpload(InputStream stream, String fileName) {
         String md5 = DigestUtil.md5Hex(stream);
-        System.out.println(md5);
         com.aliyun.bailian20231229.Client client = createClient();
         com.aliyun.bailian20231229.models.ApplyFileUploadLeaseRequest applyFileUploadLeaseRequest = new com.aliyun.bailian20231229.models.ApplyFileUploadLeaseRequest()
                 .setFileName(fileName)
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
index bfd05a220..6aa8e3609 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
@@ -6,6 +6,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.digest.DigestUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.exception.CzgException;
@@ -267,12 +268,17 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
     @Override
     public Integer ocr(String originalFilename, InputStream inputStream) {
         Long shopId = StpKit.USER.getShopId();
+        String md5 = DigestUtil.md5Hex(inputStream);
+        MkOcr ocr = ocrService.getOne(new QueryWrapper().eq(MkOcr::getShopId, shopId).eq(MkOcr::getMd5, md5));
+        if (ocr != null) {
+            return ocr.getId();
+        }
         MkOcr mkOcr = new MkOcr();
         mkOcr.setShopId(shopId);
+        mkOcr.setMd5(md5);
         ocrService.save(mkOcr);
         ThreadUtil.execAsync(() -> {
             try {
-
                 String infoStr = AliOcrUtil.appCall(inputStream, originalFilename);
                 SaleOrderDTO saleOrderDTO = JSONObject.parseObject(infoStr, SaleOrderDTO.class);
 
@@ -308,10 +314,14 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
                         .setOcrSaleOrder(saleOrderDTO);
 
 
+                mkOcr.setStatus("SUCCESS");
                 mkOcr.setResp(JSON.toJSONString(headParam));
-                ocrService.updateById(mkOcr);
             }catch (Exception e) {
+                mkOcr.setErr(e.getMessage());
+                mkOcr.setStatus("FAILED");
                 log.warn("ocr失败: {}", e.getMessage());
+            }finally {
+                ocrService.updateById(mkOcr);
             }
 
         });