From 428a563f5ecaf02057343e061c1b7c82279ca398 Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Wed, 24 Sep 2025 09:25:02 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xkt/migartion/GtAndFhbBizController.java  | 33 ++++++++++++++-----
 .../service/impl/StoreProductServiceImpl.java | 10 ++----
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java
index 5e631415b..1de39d0b2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java
@@ -190,6 +190,8 @@ public class GtAndFhbBizController extends BaseController {
      * // a. 商品与颜色对应关系
      * // b. 商品颜色尺码 + 价格 对应关系
      * // c. 库存初始化
+     * // d. 服务承诺初始化
+     * // e. 类目属性初始化
      * 步骤3: 准备数据，新建客户
      * 步骤4: 客户与货号的优惠关系
      * 步骤5: 批量创建数据到ES服务器
@@ -207,11 +209,13 @@ public class GtAndFhbBizController extends BaseController {
             // a. 商品与颜色对应关系
             // b. 商品颜色尺码 + 价格 对应关系
             // c. 库存初始化
-        this.initStoreProdList(initVO, storeColorMap);
-
-
+            // d. 服务承诺初始化
+            // e. 类目属性初始化
+        List<StoreProduct> storeProdList = this.initStoreProdList(initVO, storeColorMap);
 
         // 步骤3: 准备数据，新建客户
+        List<StoreCustomer> storeCusList = this.initStoreCusList(initVO);
+
 
         // 步骤4: 客户与货号的优惠关系
 
@@ -223,15 +227,28 @@ public class GtAndFhbBizController extends BaseController {
 
     }
 
+    /**
+     * 初始化客户列表
+     * @param initVO 入参
+     * @return
+     */
+    private List<StoreCustomer> initStoreCusList(GtAndFHBInitVO initVO) {
+
+        return null;
+
+    }
+
     /**
      * 初始化档口商品列表
      * @param storeColorMap 档口颜色map
      */
-    private void initStoreProdList(GtAndFHBInitVO initVO, Map<String, StoreColor> storeColorMap) {
+    private List<StoreProduct> initStoreProdList(GtAndFHBInitVO initVO, Map<String, StoreColor> storeColorMap) {
         // 步骤2: GT 和 FHB 货号对应关系，然后直接copy 对应的属性关系
-        // a. 商品与颜色对应关系
-        // b. 商品颜色尺码 + 价格 对应关系
-        // c. 库存初始化
+            // a. 商品与颜色对应关系
+            // b. 商品颜色尺码 + 价格 对应关系
+            // c. 库存初始化
+            // d. 服务承诺初始化
+            // e. 类目属性初始化
         Map<String, List<String>> multiSaleSameGoMap = new HashMap<>();
         Map<String, List<String>> multiOffSaleSameGoMap = new HashMap<>();
         Map<String, List<String>> multiSameFhbMap = new HashMap<>();
@@ -354,7 +371,6 @@ public class GtAndFhbBizController extends BaseController {
             StoreProductCategoryAttribute cateAttr = Optional.ofNullable(prodAttrMap.get(gtMatchSkuList.get(0).getProduct_id()))
                     .orElseThrow(() -> new ServiceException("没有GT商品类目属性!" + storeProd.getProdArtNum(), HttpStatus.ERROR));
             prodAttrList.add(cateAttr);
-
         });
         // 插入商品颜色及颜色对应的尺码，档口服务承诺
         this.prodColorMapper.insert(prodColorList);
@@ -372,6 +388,7 @@ public class GtAndFhbBizController extends BaseController {
                         .setStoreProdColorId(color.getId()).setStoreColorId(color.getStoreColorId()).setColorName(color.getColorName()))
                 .collect(Collectors.toList());
         this.prodStockMapper.insert(prodStockList);
+        return storeProdList;
     }
 
     /**
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
index cfcc133a5..de7ff8e7b 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
@@ -1473,19 +1473,15 @@ public class StoreProductServiceImpl implements IStoreProductService {
         if (ObjectUtils.isNotEmpty(cateAttr.getOccasion())) {
             cateAttrMap.put(Constants.CATE_RELATE_MAP.get(OCCASION), cateAttr.getOccasion());
         }
-        // 18. 适用年龄
-        if (ObjectUtils.isNotEmpty(cateAttr.getSuitableAge())) {
-            cateAttrMap.put(Constants.CATE_RELATE_MAP.get(SUITABLE_AGE), cateAttr.getSuitableAge());
-        }
-        // 19. 厚薄
+        // 18. 厚薄
         if (ObjectUtils.isNotEmpty(cateAttr.getThickness())) {
             cateAttrMap.put(Constants.CATE_RELATE_MAP.get(THICKNESS), cateAttr.getThickness());
         }
-        // 20. 流行元素
+        // 19. 流行元素
         if (ObjectUtils.isNotEmpty(cateAttr.getFashionElements())) {
             cateAttrMap.put(Constants.CATE_RELATE_MAP.get(FASHION_ELEMENTS), cateAttr.getFashionElements());
         }
-        // 21. 适用对象
+        // 20. 适用对象
         if (ObjectUtils.isNotEmpty(cateAttr.getSuitablePerson())) {
             cateAttrMap.put(Constants.CATE_RELATE_MAP.get(SUITABLE_PERSON), cateAttr.getSuitablePerson());
         }