From 9c518ac914d7c61eff30174c27156e608325f2ee Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Tue, 11 Feb 2025 14:39:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E6=88=90=E5=A5=97?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8C=E6=AD=A5=E3=80=81=E5=AD=98=E8=B4=A7=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E5=90=8C=E6=AD=A5=E4=BC=98=E5=8C=96=E7=A9=BA=E6=A0=BC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/lets/plugin/base/KitPluginInitializer.java      | 7 +++++--
 .../plugin/lets/plugin/base/SKUPluginInitializer.java      | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/KitPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/KitPluginInitializer.java
index 6478eb71..29af7ac2 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/KitPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/KitPluginInitializer.java
@@ -164,7 +164,7 @@ public class KitPluginInitializer extends PluginBaseEntity {
     public void start(String SkuCode) {
         try {
             QueryOfsKitRequestVO queryOfsKitRequestVO = new QueryOfsKitRequestVO();
-            queryOfsKitRequestVO.setSkuCode(SkuCode);
+            queryOfsKitRequestVO.setSkuCode(SkuCode.trim());
             List<OfsKitOrderSearchResponse.OfsKit> ofsKits = queryOfsKits(queryOfsKitRequestVO);
             if(ofsKits.size()==0){
                 Assert.state(false,"根据OFS实物组套sku编码：{}，未查询到OFS实物组套，请检查。",SkuCode);
@@ -216,7 +216,7 @@ public class KitPluginInitializer extends PluginBaseEntity {
     public List<OfsKitOrderSearchResponse.OfsKit> filterData(List<OfsKitOrderSearchResponse.OfsKit> ofsKits) {
         List<OfsKitOrderSearchResponse.OfsKit> filterKits = new ArrayList<>();
         for (OfsKitOrderSearchResponse.OfsKit ofsKit : ofsKits) {
-            String rootAppPk = ofsKit.getHeader().getSkuCode();
+            String rootAppPk = ofsKit.getHeader().getSkuCode().trim();
             boolean isExis = true;
             IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
             integrationTaskLivingDetailsEntity.setRootAppPk(rootAppPk);
@@ -251,6 +251,9 @@ public class KitPluginInitializer extends PluginBaseEntity {
         //ofsKit列表
         for (OfsKitOrderSearchResponse.OfsKit ofsKit : filterKits) {
 
+            //处理空格
+            ofsKit.getHeader().setSkuCode(ofsKit.getHeader().getSkuCode().trim());
+
             String mapStr="";
             String response="";
             String format=ofsKit.getHeader().getLastUpdated();
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java
index fba89407..cf3dfe38 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java
@@ -247,7 +247,7 @@ public class SKUPluginInitializer extends PluginBaseEntity {
     public List<OFSSKUSearchResponse.OFSSKU> filterData(List<OFSSKUSearchResponse.OFSSKU> ofsskuList) {
         List<OFSSKUSearchResponse.OFSSKU> filterSkus = new ArrayList<>();
         for (OFSSKUSearchResponse.OFSSKU ofssku : ofsskuList) {
-            String rootAppPk = ofssku.getCode() + "_" + ofssku.getLastUpdated();
+            String rootAppPk = ofssku.getCode().trim() + "_" + ofssku.getLastUpdated();
             boolean isExis = true;
             IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
             integrationTaskLivingDetailsEntity.setRootAppPk(rootAppPk);