From 7e6bdee92e0146ee1dd24d657cef6d5bcd8f4348 Mon Sep 17 00:00:00 2001 From: yewj Date: Sat, 29 Mar 2025 16:47:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B3=E9=87=87=E5=8D=95=E5=8F=B7=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alihealth/impl/AlihealthBusServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java b/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java index b67c9638..57ecf00e 100644 --- a/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java +++ b/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java @@ -149,9 +149,11 @@ public class AlihealthBusServiceImpl implements AlihealthBusService { YcFileCodeUploadVo ycFileCodeUploadVo = list.get(j); //第一条进行 阳采单号的校验 - if (j == 0 && StringUtils.isNotEmpty(ycBillNo)){ + if (j == 0 && StringUtils.isNotEmpty(ycBillNo)) { String ycBillNo1 = ycFileCodeUploadVo.getYcBillNo(); - throw new JsonException("导入订单编号错误：当前绑定阳采业务单号【" + ycBillNo + "】 ， 导入阳采业务单号【" + ycBillNo1 + "】 "); + if (!StrUtil.trimToEmpty(ycBillNo).equals(StrUtil.trimToEmpty(ycBillNo1))) { + throw new JsonException("导入订单编号错误：当前绑定阳采业务单号【" + ycBillNo + "】 ， 导入阳采业务单号【" + ycBillNo1 + "】 "); + } } String code = ycFileCodeUploadVo.getCode(); addOrderRequest.setCode(code); @@ -265,8 +267,8 @@ public class AlihealthBusServiceImpl implements AlihealthBusService { List companyProductRelevanceEntities = companyProductRelevanceDao.selectList(new LambdaQueryWrapper() .eq(CompanyProductRelevanceEntity::getUdiRlIdFk, id) .eq(CompanyProductRelevanceEntity::getCustomerId, userId)); - if (CollUtil.isEmpty(companyProductRelevanceEntities)){ - throw new JsonException(500, "当前产品标识:【"+ udiRelevance.getNameCode()+"】未添加文件中供应商配送服务！"); + if (CollUtil.isEmpty(companyProductRelevanceEntities)) { + throw new JsonException(500, "当前产品标识:【" + udiRelevance.getNameCode() + "】未添加文件中供应商配送服务！"); } AddBizProductReqeust productRequest = new AddBizProductReqeust();