From c3ee94139c0aae50809568914e56839b0d5e1e0c Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Mon, 10 Oct 2022 16:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szwh/service/impl/GoodsServiceImpl.java   |  4 +--
 .../cn/chjyj/szwh/utils/ApiGoodsUtils.java    | 30 +++++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
index 915c1d8..abd5e84 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
@@ -504,9 +504,7 @@ public class GoodsServiceImpl implements GoodsService {
                     JSONObject nsdjson = JSONObject.parseObject(nsdstr);
                     // 从sourcedata节点中提取商品唯一编号
                     String goodsId = nsdjson.getString("identifiers");
-                    // 以identifier为主键查询详情
-                    //JSONObject rqjson = new JSONObject();
-                    //rqjson.put("isliCode", goodsId);
+                    // 以identifiers为主键查询详情
                     JSONObject gdJson = SzwhApiUtils.apiGoodsDetail(goodsId);
                     log.info(goodsId + "详情:" + gdJson);
                     //处理返回的结果
diff --git a/src/main/java/cn/chjyj/szwh/utils/ApiGoodsUtils.java b/src/main/java/cn/chjyj/szwh/utils/ApiGoodsUtils.java
index b35cdbf..85b3c3f 100644
--- a/src/main/java/cn/chjyj/szwh/utils/ApiGoodsUtils.java
+++ b/src/main/java/cn/chjyj/szwh/utils/ApiGoodsUtils.java
@@ -40,19 +40,30 @@ public class ApiGoodsUtils {
         goodsSource.setSourceName(innerJson.getString("sourceName"));
         //
         goodsSource.setSourceIdentify(innerJson.getString("sourceIdentify"));
-        goodsSource.setSourceFragment(innerJson.getString("sourceFragment"));
-        goodsSource.setTargetName(innerJson.getString("targetName"));
-        goodsSource.setTargetNameType(innerJson.getString("targetNameType"));
-        goodsSource.setTargetIdentify(innerJson.getString("targetIdentify"));
+        String sourceFragment=innerJson.getString("sourceFragment");
+        goodsSource.setSourceFragment(StringUtils.isNotBlank(sourceFragment)?sourceFragment:" ");
+        String targetName=innerJson.getString("targetName");
+        goodsSource.setTargetName(StringUtils.isNotBlank(targetName)?targetName:" ");
         //
-        goodsSource.setTargetFragment(innerJson.getString("targetFragment"));
-        goodsSource.setTargetFormat(innerJson.getString("targetFormat"));
+        String targetNameType=innerJson.getString("targetNameType");
+        goodsSource.setTargetNameType(StringUtils.isNotBlank(targetNameType)?targetNameType:" ");
+        //
+        String targetIdentify=innerJson.getString("targetIdentify");
+        goodsSource.setTargetIdentify(StringUtils.isNotBlank(targetIdentify)?targetIdentify:" ");
+        //
+        String targetFragment=innerJson.getString("targetFragment");
+        goodsSource.setTargetFragment(StringUtils.isNotBlank(targetFragment)?targetFragment:" ");
+        String targetFormat=innerJson.getString("targetFormat");
+        goodsSource.setTargetFormat(StringUtils.isNotBlank(targetFormat)?targetFormat:"");
         // 存放了json字符串
         goodsSource.setSourceData(innerJson.getString("sourceData"));
         goodsSource.setTargetData(innerJson.getString("targetData"));
         //
-        goodsSource.setMetadataXml(innerJson.getString("metadataXml"));
-        goodsSource.setCancellationReason(innerJson.getString("cancellationReason"));
+        String metadataXml=innerJson.getString("metadataXml");
+        goodsSource.setMetadataXml(StringUtils.isNotBlank(metadataXml)?metadataXml:" ");
+        //
+        String cancelReason = innerJson.getString("cancellationReason");
+        goodsSource.setCancellationReason(StringUtils.isNotBlank(cancelReason)?cancelReason:" ");
         // 字符串转为日期时间格式
         String aldate =innerJson.getString("allocationDate");
         try {
@@ -61,7 +72,8 @@ public class ApiGoodsUtils {
         }catch (Exception ex){
             // do nothing
         }
-        goodsSource.setSourceType(innerJson.getString("dataType"));
+        //Integer dataType =innerJson.getInteger("dataType");
+        goodsSource.setDatatype(innerJson.getInteger("dataType"));
         try{
             String cldate = innerJson.getString("cancellationDate");
             Date cndate =sdf.parse(cldate);