From 5f915dffe251694a202158e424439f2b159e77b5 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 18 Oct 2024 17:01:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=B8=8A=E8=B4=A7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/collect/IoCollectOrderService.java     |  3 +++
 .../com/glxp/api/service/inout/IoAddInoutService.java  |  2 +-
 src/main/java/com/glxp/api/util/IntUtil.java           | 10 ++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
index 4e27948ad..5635ae1a9 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -86,6 +86,8 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     @Resource
     IoCollectOrderBizService collectOrderBizService;
     @Resource
+    IoOrderDetailResultService orderDetailResultService;
+    @Resource
     UdiRelevanceService udiRelevanceService;
     @Resource
     BasicSkPrescribeService basicSkPrescribeService;
@@ -249,6 +251,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                         orderService.deleteByBillNo(billNo);
                         orderDetailBizService.deleteByOrderId(billNo);
                         orderDetailCodeService.deleteByOrderId(billNo);
+                        orderDetailResultService.deleteByOrderId(billNo);
                         codeTempService.deleteByBillNo(billNo);
                         codeService.deleteCodeByOrderId(billNo);
                     }
diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
index 27473ad86..23353fca4 100644
--- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
@@ -454,7 +454,7 @@ public class IoAddInoutService {
             for (IoOrderDetailCodeEntity orderDetailCodeEntity : ioOrderDetailCodeEntities) {
                 if (orderDetailCodeEntity.getBindRlFk().longValue() == udiRelevanceResponse.getId().longValue()
                         && StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo()).equals(StrUtil.trimToEmpty(codeTempEntity.getBatchNo()))
-                        && BigDecimalUtil.equalTo(orderDetailCodeEntity.getPrice(), codeTempEntity.getPrice())
+                        && BigDecimalUtil.equalTo(IntUtil.value(orderDetailCodeEntity.getPrice()), IntUtil.value(codeTempEntity.getPrice()))
                 ) {
                     orderDetailCodeEntity.setCount(orderDetailCodeEntity.getCount() + codeTempEntity.getMyCount());
                     orderDetailCodeEntity.setReCount(orderDetailCodeEntity.getReCount() + codeTempEntity.getMyReCount());
diff --git a/src/main/java/com/glxp/api/util/IntUtil.java b/src/main/java/com/glxp/api/util/IntUtil.java
index 6969ec1f0..5dc2e49b6 100644
--- a/src/main/java/com/glxp/api/util/IntUtil.java
+++ b/src/main/java/com/glxp/api/util/IntUtil.java
@@ -2,6 +2,8 @@ package com.glxp.api.util;
 
 import cn.hutool.core.util.StrUtil;
 
+import java.math.BigDecimal;
+
 public class IntUtil {
 
     public static int value(Integer value) {
@@ -11,6 +13,14 @@ public class IntUtil {
 
     }
 
+    public static BigDecimal value(BigDecimal value) {
+        if (value == null)
+            return new BigDecimal(0);
+        else return value;
+
+    }
+
+
     public static long value(Long value) {
         if (value == null)
             return 0l;