From 3de25f7dfc863b05ca9c35487b99ac660fc1f5be Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 13 Jan 2025 09:37:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=8B=E5=8A=A1=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOriginService.java       | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
index 316c07589..82a69e502 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
@@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusTypeConstant;
@@ -106,7 +107,7 @@ public class IoCollectOriginService {
      *
      * @param collectOrderRequest
      */
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     public BaseResponse errorHandle(CollectOrderRequest collectOrderRequest) {
         if (StrUtil.isBlank(collectOrderRequest.getBillNo())) {
             throw new JsonException(500, "单据号不能为空");
@@ -117,14 +118,20 @@ public class IoCollectOriginService {
         if (StrUtil.isBlank(collectOrderRequest.getBusType())) {
             throw new JsonException(500, "单据类型不能为空");
         }
-        //删除异常单据
-        collectOrderBizService.remove(new LambdaQueryWrapper<IoCollectOrderBiz>()
-                .eq(IoCollectOrderBiz::getOrderIdFk, collectOrderRequest.getBillNo()));
-        collectOrderService.remove(new LambdaQueryWrapper<IoCollectOrder>()
-                .eq(IoCollectOrder::getBillNo, collectOrderRequest.getBillNo())
-                .eq(IoCollectOrder::getTagStatus, 4));
+
+        BaseResponse response = this.downloadOrderV2(collectOrderRequest);
+
+        if(ResultEnum.SUCCESS.getCode().equals(response.getCode())){
+            //删除异常单据
+            collectOrderBizService.remove(new LambdaQueryWrapper<IoCollectOrderBiz>()
+                    .eq(IoCollectOrderBiz::getOrderIdFk, collectOrderRequest.getBillNo()));
+            collectOrderService.remove(new LambdaQueryWrapper<IoCollectOrder>()
+                    .eq(IoCollectOrder::getBillNo, collectOrderRequest.getBillNo())
+                    .eq(IoCollectOrder::getTagStatus, 4));
+        }
+
         //重新拉取
-        return this.downloadOrderV2(collectOrderRequest);
+        return response;
     }
 
     @Transactional(rollbackFor = Exception.class)