From b3b8376d9a3dbca3ed2429ab88cc1e04ecf45df0 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Mon, 2 Dec 2024 15:13:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E5=85=A5=E8=8D=AF=E5=93=81=E9=98=BF?=
 =?UTF-8?q?=E9=87=8C=E4=B8=8D=E8=83=BD=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/basic/UdiContrastService.java | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
index 901ab970..10e2c73a 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
@@ -227,7 +227,7 @@ public class UdiContrastService {
 
     @Resource
     ThirdAliDrugService thirdAliDrugService;
-    @Transactional
+//    @Transactional
     public void createOnlyMainId(String mainId) {
         FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
         filterThrProductsRequest.setCode(mainId);
@@ -346,7 +346,7 @@ public class UdiContrastService {
                         if(thirdAliDrugService.addOrUpdate(thirdAliDrugsListGjk)){
 
                         }else {
-                            List<ThirdAliDrug> thirdAliDrugListNew;
+                            List<ThirdAliDrug> thirdAliDrugListNew = null;
 
                             String customerId =customerService.getCustomerId();
                             CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(customerId);
@@ -366,20 +366,22 @@ public class UdiContrastService {
                             if(baseResponse.getCode() == 20000){
                                  thirdAliDrugListNew  = baseResponse.getData();
                                  thirdAliDrugService.addOrUpdate(thirdAliDrugListNew);
+
                             }else {
                                 log.error("阿里接口未查到产品信息==="+baseResponse.getMessage());
-                                throw new JsonException(500, "阿里接口未查到产品信息");
-
+//                                throw new JsonException(500, "阿里接口未查到产品信息");
                             }
-                            // 上传到国家库
-                            try {
-                                Map mapNew = new HashMap();
-                                mapNew.put("list",thirdAliDrugListNew);
-                                String response =  HttpUtil.post(udiUrl+"/udiwms/aliDrug/addThirdAliDrug", JSONUtil.toJsonStr(mapNew));
-                                BaseResponse baseResponseAdd =  JSONUtil.toBean(response,BaseResponse.class);
-                                log.info("成功上传国家库阿里产品数据");
-                            } catch (Exception e) {
-                                log.error("国家库上传阿里产品访问出现错误==="+e.getMessage());
+                            if(thirdAliDrugListNew!=null && thirdAliDrugListNew.size() > 0 ){
+                                try {
+                                    // 上传到国家库
+                                    Map mapNew = new HashMap();
+                                    mapNew.put("list",thirdAliDrugListNew);
+                                    String response =  HttpUtil.post(udiUrl+"/udiwms/aliDrug/addThirdAliDrug", JSONUtil.toJsonStr(mapNew));
+                                    BaseResponse baseResponseAdd =  JSONUtil.toBean(response,BaseResponse.class);
+                                    log.info("成功上传国家库阿里产品数据");
+                                } catch (Exception e) {
+                                    log.error("国家库上传阿里产品访问出现错误==="+e.getMessage());
+                                }
                             }
 
                         }