From 777a80322c4bc850b15e18a7669625f648b260fe Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Wed, 12 Nov 2025 17:10:10 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E8=BF=81=E7=A7=BB=E8=B0=83?= =?UTF-8?q?=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migartion/FhbOtherBizAfterController.java | 3 +- .../xkt/migartion/GtAndFhbBizController.java | 43 +++----------- .../xkt/migartion/GtAndTyBiz2Controller.java | 20 +++---- .../xkt/migartion/GtAndTyBizController.java | 20 +++---- .../xkt/migartion/GtOnlyBizController.java | 56 ++++--------------- .../migartion/GtOtherBizAfterController.java | 20 +++---- .../migartion/TYOtherBizAfterController.java | 3 +- 7 files changed, 51 insertions(+), 114 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/FhbOtherBizAfterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/FhbOtherBizAfterController.java index 8334c2d28..5d8a200e6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/FhbOtherBizAfterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/FhbOtherBizAfterController.java @@ -134,9 +134,10 @@ public class FhbOtherBizAfterController extends BaseController { final Date voucherDate = java.sql.Date.valueOf(LocalDate.now()); // 默认为 单鞋下 弹力靴/袜靴 分类 final Long prodCateId = 13L; + final String prodCateName = "弹力靴/袜靴"; fhbAfterArtNumGroupMap.forEach((fhbArtNo, matchList) -> { // 初始化档口商品 默认为私款，只能打印条码出库等，不可在平台展示 - StoreProduct storeProd = new StoreProduct().setStoreId(storeId).setProdCateId(prodCateId).setPrivateItem(1) + StoreProduct storeProd = new StoreProduct().setStoreId(storeId).setProdCateId(prodCateId).setProdCateName(prodCateName).setPrivateItem(1) .setProdArtNum(fhbArtNo).setProdTitle("上架大卖").setListingWay(ListingType.RIGHT_NOW.getValue()) .setVoucherDate(voucherDate).setProdStatus(EProductStatus.ON_SALE.getValue()).setRecommendWeight(0L).setSaleWeight(0L).setPopularityWeight(0L); storeProdList.add(storeProd); 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 9b6c6cc32..c8e058843 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 @@ -267,12 +267,12 @@ public class GtAndFhbBizController extends BaseController { .getCacheObject(CacheConstants.MIGRATION_GT_SALE_CATE_KEY + initVO.getUserId()), new ArrayList<>()); List prodCateList = this.prodCateMapper.selectList(new LambdaQueryWrapper() .eq(SysProductCategory::getDelFlag, Constants.UNDELETED)); - Map dbCateNameMap = prodCateList.stream().collect(Collectors.toMap(SysProductCategory::getName, SysProductCategory::getId)); + Map dbCateNameMap = prodCateList.stream().collect(Collectors.toMap(SysProductCategory::getName, x -> x)); // GT商品分类和步橘分类映射 - Map cateRelationMap = new HashMap<>(); + Map cateRelationMap = new HashMap<>(); cacheList.forEach(gtCate -> { - final Long cateId = Optional.ofNullable(dbCateNameMap.get(gtCate.getName())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); - cateRelationMap.put(gtCate.getId(), cateId); + final SysProductCategory sysCate = Optional.ofNullable(dbCateNameMap.get(gtCate.getName())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); + cateRelationMap.put(gtCate.getId(), sysCate); }); // 清洗后，相同货号映射 @@ -287,8 +287,9 @@ public class GtAndFhbBizController extends BaseController { commonArtNos.forEach(cleanArtNo -> { // 获取GT匹配的商品中的第一个商品 List gtMatchSkuList = this.getGtFirstSku(multiSaleSameGoMap, gtSaleGroupMap, cleanArtNo); + final SysProductCategory sysCate = Optional.ofNullable(cateRelationMap.get(gtMatchSkuList.get(0).getCategory_nid())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); // 初始化档口商品 - StoreProduct storeProd = new StoreProduct().setStoreId(initVO.getStoreId()).setProdCateId(cateRelationMap.get(gtMatchSkuList.get(0).getCategory_nid())).setPrivateItem(0) + StoreProduct storeProd = new StoreProduct().setStoreId(initVO.getStoreId()).setProdCateId(sysCate.getId()).setProdCateName(sysCate.getName()).setPrivateItem(0) .setProdArtNum(gtMatchSkuList.get(0).getArticle_number()).setProdTitle(gtMatchSkuList.get(0).getCharacters()).setListingWay(ListingType.RIGHT_NOW.getValue()) .setVoucherDate(voucherDate).setProdStatus(EProductStatus.ON_SALE.getValue()).setRecommendWeight(0L).setSaleWeight(0L).setPopularityWeight(0L); // 提前设置档口商品的类目属性 @@ -335,13 +336,6 @@ public class GtAndFhbBizController extends BaseController { .eq(StoreColor::getStoreId, initVO.getStoreId()).eq(StoreColor::getDelFlag, Constants.UNDELETED)); Map storeColorMap = storeColorList.stream().collect(Collectors.toMap(StoreColor::getColorName, x -> x, (v1, v2) -> v2)); - - // TODO 临时处理，10-11之后的数据 - // TODO 临时处理，10-11之后的数据 - // TODO 临时处理，10-11之后的数据 - storeProdList = storeProdList.stream().filter(x -> x.getCreateTime().after(DateUtils.parseDate("2025-10-11 00:00:00"))).collect(Collectors.toList()); - - Map> multiSaleSameGoMap = new HashMap<>(); Map> multiOffSaleSameGoMap = new HashMap<>(); Map> multiSameFhbMap = new HashMap<>(); @@ -471,15 +465,6 @@ public class GtAndFhbBizController extends BaseController { List storeCusList = this.storeCusMapper.selectList(new LambdaQueryWrapper() .eq(StoreCustomer::getStoreId, initVO.getStoreId()).eq(StoreCustomer::getDelFlag, Constants.UNDELETED)); - - // TODO 临时处理，10-11之后的数据 - // TODO 临时处理，10-11之后的数据 - // TODO 临时处理，10-11之后的数据 - storeProdList = storeProdList.stream().filter(x -> x.getCreateTime().after(DateUtils.parseDate("2025-10-11 00:00:00"))).collect(Collectors.toList()); - storeCusList = storeCusList.stream().filter(x -> x.getCreateTime().after(DateUtils.parseDate("2025-10-11 00:00:00"))).collect(Collectors.toList()); - prodColorList = prodColorList.stream().filter(x -> x.getCreateTime().after(DateUtils.parseDate("2025-10-11 00:00:00"))).collect(Collectors.toList()); - - List cacheList = ObjectUtils.defaultIfNull(redisCache .getCacheObject(CacheConstants.MIGRATION_SUPPLIER_PROD_KEY + initVO.getSupplierId()), new ArrayList<>()); if (CollectionUtils.isEmpty(cacheList)) { @@ -563,13 +548,6 @@ public class GtAndFhbBizController extends BaseController { // 将公共的商品同步到ES List storeProdList = this.storeProdMapper.selectList(new LambdaQueryWrapper() .eq(StoreProduct::getDelFlag, Constants.UNDELETED).eq(StoreProduct::getStoreId, storeId)); - - // TODO 临时处理，10-11之后的数据 - // TODO 临时处理，10-11之后的数据 - // TODO 临时处理，10-11之后的数据 - storeProdList = storeProdList.stream().filter(x -> x.getCreateTime().after(DateUtils.parseDate("2025-10-11 00:00:00"))).collect(Collectors.toList()); - - if (CollectionUtils.isEmpty(storeProdList)) { return R.fail(); } @@ -757,12 +735,9 @@ public class GtAndFhbBizController extends BaseController { if (attrMap.containsKey(Constants.SHAFT_LINING_MATERIAL_NAME)) { prodAttr.setShaftLiningMaterial(attrMap.get(Constants.SHAFT_LINING_MATERIAL_NAME)); } - // 3. 鞋面材质（靴筒面材质） - if (attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME)) { - // 先看靴筒面材质，为空则找帮面材质 - String shaftMaterialAttr = attrMap.get(Constants.SHAFT_MATERIAL_NAME); - prodAttr.setShaftMaterial(org.apache.commons.lang3.StringUtils.isEmpty(shaftMaterialAttr) ? attrMap.get(Constants.UPPER_MATERIAL_NAME) : shaftMaterialAttr); - } + // 3. 鞋面材质（靴筒面材质）找不到就找帮面材质 + prodAttr.setShaftMaterial(attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME) + ? attrMap.get(Constants.SHAFT_MATERIAL_NAME) : attrMap.get(Constants.UPPER_MATERIAL_NAME)); // 5. 靴款品名 if (attrMap.containsKey(Constants.SHOE_STYLE_NAME_NAME)) { prodAttr.setShoeStyleName(attrMap.get(Constants.SHOE_STYLE_NAME_NAME)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBiz2Controller.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBiz2Controller.java index a5c5b1082..39742e197 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBiz2Controller.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBiz2Controller.java @@ -216,12 +216,12 @@ public class GtAndTyBiz2Controller extends BaseController { .getCacheObject(CacheConstants.MIGRATION_GT_SALE_CATE_KEY + initVO.getUserId()), new ArrayList<>()); List prodCateList = this.prodCateMapper.selectList(new LambdaQueryWrapper() .eq(SysProductCategory::getDelFlag, Constants.UNDELETED)); - Map dbCateNameMap = prodCateList.stream().collect(Collectors.toMap(SysProductCategory::getName, SysProductCategory::getId)); + Map dbCateNameMap = prodCateList.stream().collect(Collectors.toMap(SysProductCategory::getName, x -> x)); // GT商品分类和步橘分类映射 - Map cateRelationMap = new HashMap<>(); + Map cateRelationMap = new HashMap<>(); cacheList.forEach(gtCate -> { - final Long cateId = Optional.ofNullable(dbCateNameMap.get(gtCate.getName())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); - cateRelationMap.put(gtCate.getId(), cateId); + final SysProductCategory sysCate = Optional.ofNullable(dbCateNameMap.get(gtCate.getName())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); + cateRelationMap.put(gtCate.getId(), sysCate); }); // 当天 @@ -235,8 +235,9 @@ public class GtAndTyBiz2Controller extends BaseController { if (CollectionUtils.isEmpty(initVO.getExcludeArtNoList()) || !initVO.getExcludeArtNoList().contains(gtArtNo)) { // 获取GT匹配的商品中的第一个商品 List gtMatchSkuList = gtSaleGroupMap.get(gtArtNo); + final SysProductCategory sysCate = Optional.ofNullable(cateRelationMap.get(gtMatchSkuList.get(0).getCategory_nid())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); // 初始化档口商品 - StoreProduct storeProd = new StoreProduct().setStoreId(initVO.getStoreId()).setProdCateId(cateRelationMap.get(gtMatchSkuList.get(0).getCategory_nid())) + StoreProduct storeProd = new StoreProduct().setStoreId(initVO.getStoreId()).setProdCateId(sysCate.getId()).setProdCateName(sysCate.getName()) .setPrivateItem(0).setProdArtNum(gtMatchSkuList.get(0).getArticle_number()).setProdTitle(gtMatchSkuList.get(0).getCharacters()).setListingWay(ListingType.RIGHT_NOW.getValue()) .setVoucherDate(voucherDate).setProdStatus(EProductStatus.ON_SALE.getValue()).setRecommendWeight(0L).setSaleWeight(0L).setPopularityWeight(0L); // 提前设置档口商品的类目属性 @@ -677,12 +678,9 @@ public class GtAndTyBiz2Controller extends BaseController { if (attrMap.containsKey(Constants.SHAFT_LINING_MATERIAL_NAME)) { prodAttr.setShaftLiningMaterial(attrMap.get(Constants.SHAFT_LINING_MATERIAL_NAME)); } - // 3. 鞋面材质（靴筒面材质） - if (attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME)) { - // 先看靴筒面材质，为空则找帮面材质 - String shaftMaterialAttr = attrMap.get(Constants.SHAFT_MATERIAL_NAME); - prodAttr.setShaftMaterial(StringUtils.isEmpty(shaftMaterialAttr) ? attrMap.get(Constants.UPPER_MATERIAL_NAME) : shaftMaterialAttr); - } + // 3. 鞋面材质（靴筒面材质）找不到就找帮面材质 + prodAttr.setShaftMaterial(attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME) + ? attrMap.get(Constants.SHAFT_MATERIAL_NAME) : attrMap.get(Constants.UPPER_MATERIAL_NAME)); // 5. 靴款品名 if (attrMap.containsKey(Constants.SHOE_STYLE_NAME_NAME)) { prodAttr.setShoeStyleName(attrMap.get(Constants.SHOE_STYLE_NAME_NAME)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java index 007c7880b..a7f66e23d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java @@ -250,12 +250,12 @@ public class GtAndTyBizController extends BaseController { .getCacheObject(CacheConstants.MIGRATION_GT_SALE_CATE_KEY + initVO.getUserId()), new ArrayList<>()); List prodCateList = this.prodCateMapper.selectList(new LambdaQueryWrapper() .eq(SysProductCategory::getDelFlag, Constants.UNDELETED)); - Map dbCateNameMap = prodCateList.stream().collect(Collectors.toMap(SysProductCategory::getName, SysProductCategory::getId)); + Map dbCateNameMap = prodCateList.stream().collect(Collectors.toMap(SysProductCategory::getName, x -> x)); // GT商品分类和步橘分类映射 - Map cateRelationMap = new HashMap<>(); + Map cateRelationMap = new HashMap<>(); cacheList.forEach(gtCate -> { - final Long cateId = Optional.ofNullable(dbCateNameMap.get(gtCate.getName())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); - cateRelationMap.put(gtCate.getId(), cateId); + final SysProductCategory sysCate = Optional.ofNullable(dbCateNameMap.get(gtCate.getName())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); + cateRelationMap.put(gtCate.getId(), sysCate); }); System.err.println("============ 两边系统“一致”的货号 ============"); @@ -271,9 +271,10 @@ public class GtAndTyBizController extends BaseController { commonArtNos.forEach(cleanArtNo -> { // 获取GT匹配的商品中的第一个商品 List gtMatchSkuList = this.getGtFirstSku(multiSaleSameGoMap, gtSaleGroupMap, cleanArtNo); + final SysProductCategory sysCate = Optional.ofNullable(cateRelationMap.get(gtMatchSkuList.get(0).getCategory_nid())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); // 初始化档口商品 StoreProduct storeProd = new StoreProduct().setStoreId(initVO.getStoreId()) - .setProdCateId(cateRelationMap.get(gtMatchSkuList.get(0).getCategory_nid())).setPrivateItem(0) + .setProdCateId(sysCate.getId()).setProdCateName(sysCate.getName()).setPrivateItem(0) .setProdArtNum(gtMatchSkuList.get(0).getArticle_number()).setProdTitle(gtMatchSkuList.get(0).getCharacters()) .setListingWay(ListingType.RIGHT_NOW.getValue()).setVoucherDate(voucherDate).setProdStatus(EProductStatus.ON_SALE.getValue()) .setRecommendWeight(0L).setSaleWeight(0L).setPopularityWeight(0L); @@ -722,12 +723,9 @@ public class GtAndTyBizController extends BaseController { if (attrMap.containsKey(Constants.SHAFT_LINING_MATERIAL_NAME)) { prodAttr.setShaftLiningMaterial(attrMap.get(Constants.SHAFT_LINING_MATERIAL_NAME)); } - // 3. 鞋面材质（靴筒面材质） - if (attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME)) { - // 先看靴筒面材质，为空则找帮面材质 - String shaftMaterialAttr = attrMap.get(Constants.SHAFT_MATERIAL_NAME); - prodAttr.setShaftMaterial(StringUtils.isEmpty(shaftMaterialAttr) ? attrMap.get(Constants.UPPER_MATERIAL_NAME) : shaftMaterialAttr); - } + // 3. 鞋面材质（靴筒面材质）找不到就找帮面材质 + prodAttr.setShaftMaterial(attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME) + ? attrMap.get(Constants.SHAFT_MATERIAL_NAME) : attrMap.get(Constants.UPPER_MATERIAL_NAME)); // 5. 靴款品名 if (attrMap.containsKey(Constants.SHOE_STYLE_NAME_NAME)) { prodAttr.setShoeStyleName(attrMap.get(Constants.SHOE_STYLE_NAME_NAME)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOnlyBizController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOnlyBizController.java index c7fc3414b..643cedb78 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOnlyBizController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOnlyBizController.java @@ -94,13 +94,15 @@ public class GtOnlyBizController extends BaseController { .getCacheObject(CacheConstants.MIGRATION_GT_SALE_CATE_KEY + initVO.getUserId()), new ArrayList<>()); List prodCateList = this.prodCateMapper.selectList(new LambdaQueryWrapper() .eq(SysProductCategory::getDelFlag, Constants.UNDELETED)); - Map dbCateNameMap = prodCateList.stream().collect(Collectors.toMap(SysProductCategory::getName, SysProductCategory::getId)); // GT商品分类和步橘分类映射 - Map cateRelationMap = new HashMap<>(); + Map dbCateNameMap = prodCateList.stream().collect(Collectors.toMap(SysProductCategory::getName, x -> x)); + // GT商品分类和步橘分类映射 + Map cateRelationMap = new HashMap<>(); cacheList.forEach(gtCate -> { - final Long cateId = Optional.ofNullable(dbCateNameMap.get(gtCate.getName())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); - cateRelationMap.put(gtCate.getId(), cateId); + final SysProductCategory sysCate = Optional.ofNullable(dbCateNameMap.get(gtCate.getName())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); + cateRelationMap.put(gtCate.getId(), sysCate); }); + // 步骤2: 新增商品 List storeProdList = new ArrayList<>(); // 所有商品的类目属性map key gt的product_id value StoreProductCategoryAttribute @@ -109,8 +111,9 @@ public class GtOnlyBizController extends BaseController { final Date voucherDate = java.sql.Date.valueOf(LocalDate.now()); Map gtProdMap = gtOnSaleCacheList.stream().collect(Collectors.toMap(GtProdSkuVO::getArticle_number, x -> x, (s1, s2) -> s2)); gtProdMap.forEach((artNum, gtProdSkuVO) -> { + final SysProductCategory sysCate = Optional.ofNullable(cateRelationMap.get(gtProdSkuVO.getCategory_nid())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); // 初始化档口商品 - StoreProduct storeProd = new StoreProduct().setStoreId(initVO.getStoreId()).setProdCateId(cateRelationMap.get(gtProdSkuVO.getCategory_nid())).setPrivateItem(0) + StoreProduct storeProd = new StoreProduct().setStoreId(initVO.getStoreId()).setProdCateId(sysCate.getId()).setProdCateName(sysCate.getName()).setPrivateItem(0) .setProdArtNum(gtProdSkuVO.getArticle_number()).setProdTitle(gtProdSkuVO.getCharacters()).setListingWay(ListingType.RIGHT_NOW.getValue()) .setVoucherDate(voucherDate).setProdStatus(EProductStatus.ON_SALE.getValue()).setRecommendWeight(0L).setSaleWeight(0L).setPopularityWeight(0L); // 提前设置档口商品的类目属性 @@ -350,46 +353,9 @@ public class GtOnlyBizController extends BaseController { if (attrMap.containsKey(Constants.SHAFT_LINING_MATERIAL_NAME)) { prodAttr.setShaftLiningMaterial(attrMap.get(Constants.SHAFT_LINING_MATERIAL_NAME)); } - // 3. 鞋面材质（靴筒面材质） - if (attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME)) { - // 先看靴筒面材质，为空则找帮面材质 - String shaftMaterialAttr = attrMap.get(Constants.SHAFT_MATERIAL_NAME); - prodAttr.setShaftMaterial(org.apache.commons.lang3.StringUtils.isEmpty(shaftMaterialAttr) ? attrMap.get(Constants.UPPER_MATERIAL_NAME) : shaftMaterialAttr); - } - - - - - - - - - - /* - // 4. 鞋面内里材质 - if (attrMap.containsKey(Constants.SHOE_UPPER_LINING_MATERIAL_NAME)) { - // 先找鞋面内里材质，为空 则 再找 内里材质，为空则再找 里料材质 - String shoeUpperLiningMaterialAttr = attrMap.get(Constants.SHOE_UPPER_LINING_MATERIAL_NAME); - if (org.apache.commons.lang3.StringUtils.isEmpty(shoeUpperLiningMaterialAttr)) { - shoeUpperLiningMaterialAttr = attrMap.get(Constants.INNER_MATERIAL); - if (org.apache.commons.lang3.StringUtils.isEmpty(shoeUpperLiningMaterialAttr)) { - shoeUpperLiningMaterialAttr = attrMap.get(Constants.OUTER_MATERIAL); - } - } - prodAttr.setShoeUpperLiningMaterial(shoeUpperLiningMaterialAttr); - } - */ - - - - - - - - - - - + // 3. 鞋面材质（靴筒面材质）找不到就找帮面材质 + prodAttr.setShaftMaterial(attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME) + ? attrMap.get(Constants.SHAFT_MATERIAL_NAME) : attrMap.get(Constants.UPPER_MATERIAL_NAME)); // 5. 靴款品名 if (attrMap.containsKey(Constants.SHOE_STYLE_NAME_NAME)) { prodAttr.setShoeStyleName(attrMap.get(Constants.SHOE_STYLE_NAME_NAME)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOtherBizAfterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOtherBizAfterController.java index c86b11935..d3fd3527a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOtherBizAfterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOtherBizAfterController.java @@ -109,12 +109,12 @@ public class GtOtherBizAfterController extends BaseController { .getCacheObject(CacheConstants.MIGRATION_GT_SALE_CATE_KEY + userId), new ArrayList<>()); List prodCateList = this.prodCateMapper.selectList(new LambdaQueryWrapper() .eq(SysProductCategory::getDelFlag, Constants.UNDELETED)); - Map dbCateNameMap = prodCateList.stream().collect(Collectors.toMap(SysProductCategory::getName, SysProductCategory::getId)); + Map dbCateNameMap = prodCateList.stream().collect(Collectors.toMap(SysProductCategory::getName, x -> x)); // GT商品分类和步橘分类映射 - Map cateRelationMap = new HashMap<>(); + Map cateRelationMap = new HashMap<>(); cacheList.forEach(gtCate -> { - final Long cateId = Optional.ofNullable(dbCateNameMap.get(gtCate.getName())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); - cateRelationMap.put(gtCate.getId(), cateId); + final SysProductCategory sysCate = Optional.ofNullable(dbCateNameMap.get(gtCate.getName())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); + cateRelationMap.put(gtCate.getId(), sysCate); }); // 步骤2: 新增商品 List storeProdList = new ArrayList<>(); @@ -124,8 +124,9 @@ public class GtOtherBizAfterController extends BaseController { final Date voucherDate = java.sql.Date.valueOf(LocalDate.now()); Map gtProdMap = gtOnSaleCacheList.stream().collect(Collectors.toMap(GtProdSkuVO::getArticle_number, x -> x, (s1, s2) -> s2)); gtProdMap.forEach((artNum, gtProdSkuVO) -> { + final SysProductCategory sysCate = Optional.ofNullable(cateRelationMap.get(gtProdSkuVO.getCategory_nid())).orElseThrow(() -> new ServiceException("GT分类不存在!", HttpStatus.ERROR)); // 初始化档口商品 - StoreProduct storeProd = new StoreProduct().setStoreId(storeId).setProdCateId(cateRelationMap.get(gtProdSkuVO.getCategory_nid())).setPrivateItem(0) + StoreProduct storeProd = new StoreProduct().setStoreId(storeId).setProdCateId(sysCate.getId()).setProdCateName(sysCate.getName()).setPrivateItem(0) .setProdArtNum(gtProdSkuVO.getArticle_number()).setProdTitle(gtProdSkuVO.getCharacters()).setListingWay(ListingType.RIGHT_NOW.getValue()) .setVoucherDate(voucherDate).setProdStatus(EProductStatus.ON_SALE.getValue()).setRecommendWeight(0L).setSaleWeight(0L).setPopularityWeight(0L); // 提前设置档口商品的类目属性 @@ -395,12 +396,9 @@ public class GtOtherBizAfterController extends BaseController { if (attrMap.containsKey(Constants.SHAFT_LINING_MATERIAL_NAME)) { prodAttr.setShaftLiningMaterial(attrMap.get(Constants.SHAFT_LINING_MATERIAL_NAME)); } - // 3. 鞋面材质（靴筒面材质） - if (attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME)) { - // 先看靴筒面材质，为空则找帮面材质 - String shaftMaterialAttr = attrMap.get(Constants.SHAFT_MATERIAL_NAME); - prodAttr.setShaftMaterial(org.apache.commons.lang3.StringUtils.isEmpty(shaftMaterialAttr) ? attrMap.get(Constants.UPPER_MATERIAL_NAME) : shaftMaterialAttr); - } + // 3. 鞋面材质（靴筒面材质）找不到就找帮面材质 + prodAttr.setShaftMaterial(attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME) + ? attrMap.get(Constants.SHAFT_MATERIAL_NAME) : attrMap.get(Constants.UPPER_MATERIAL_NAME)); // 5. 靴款品名 if (attrMap.containsKey(Constants.SHOE_STYLE_NAME_NAME)) { prodAttr.setShoeStyleName(attrMap.get(Constants.SHOE_STYLE_NAME_NAME)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/TYOtherBizAfterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/TYOtherBizAfterController.java index aaa56b7bb..2a7c47767 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/TYOtherBizAfterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/TYOtherBizAfterController.java @@ -118,9 +118,10 @@ public class TYOtherBizAfterController extends BaseController { final Date voucherDate = java.sql.Date.valueOf(LocalDate.now()); // 默认为 单鞋下 弹力靴/袜靴 分类 final Long prodCateId = 13L; + final String prodCateName = "弹力靴/袜靴"; tyAfterArtNumGroupMap.forEach((tyArtNum, matchList) -> { // 初始化档口商品 默认为私款，只能打印条码出库等，不可在平台展示 - StoreProduct storeProd = new StoreProduct().setStoreId(storeId).setProdCateId(prodCateId).setPrivateItem(1) + StoreProduct storeProd = new StoreProduct().setStoreId(storeId).setProdCateId(prodCateId).setProdCateName(prodCateName).setPrivateItem(1) .setProdArtNum(tyArtNum).setProdTitle("上架大卖").setListingWay(ListingType.RIGHT_NOW.getValue()) .setVoucherDate(voucherDate).setProdStatus(EProductStatus.ON_SALE.getValue()).setRecommendWeight(0L).setSaleWeight(0L).setPopularityWeight(0L); storeProdList.add(storeProd);