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 1e56e7f22..9302e66bb 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 @@ -49,6 +49,8 @@ import java.net.URLEncoder; import java.time.LocalDate; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.BinaryOperator; +import java.util.function.Function; import java.util.stream.Collectors; import static com.ruoyi.common.constant.Constants.WEIGHT_DEFAULT_ZERO; @@ -101,7 +103,7 @@ public class GtAndFhbBizController extends BaseController { .getCacheObject(CacheConstants.MIGRATION_GT_SALE_BASIC_KEY + userId), new ArrayList<>()); Map articleNoColorMap = gtSaleBasicList.stream().collect(Collectors.groupingBy(GtProdSkuVO::getArticle_number, Collectors.collectingAndThen(Collectors.mapping(GtProdSkuVO::getColor, Collectors.toList()), - list -> "(" + list.stream().sorted(Comparator.naturalOrder()).distinct().collect(Collectors.joining(",")) + ")"))); + list -> "(" + list.stream().sorted(Comparator.naturalOrder()).collect(Collectors.joining(",")) + ")"))); List doubleRunSaleArtNoList = gtSaleBasicList.stream().map(GtProdSkuVO::getArticle_number) .distinct().collect(Collectors.toList()); // 查看gt 在售的商品 这边有多少相似的货号 @@ -131,10 +133,9 @@ public class GtAndFhbBizController extends BaseController { .getCacheObject(CacheConstants.MIGRATION_SUPPLIER_PROD_KEY + supplierId), new ArrayList<>()); Map fhbArticleNoColorMap = fhbProdList.stream().collect(Collectors.groupingBy(FhbProdVO.SMIVO::getArtNo, Collectors.collectingAndThen(Collectors.mapping(FhbProdVO.SMIVO::getColor, Collectors.toList()), - list -> "(" + list.stream().sorted(Comparator.naturalOrder()).distinct().collect(Collectors.joining(",")) + ")"))); - List shipArtNoList = fhbProdList.stream().map(FhbProdVO.SMIVO::getArtNo) - .distinct().collect(Collectors.toList()); - shipArtNoList.forEach(artNo -> { + list -> "(" + list.stream().sorted(Comparator.naturalOrder()).collect(Collectors.joining(",")) + ")"))); + List fhbArtNoList = fhbProdList.stream().map(FhbProdVO.SMIVO::getArtNo).distinct().collect(Collectors.toList()); + fhbArtNoList.forEach(artNo -> { // 只保留核心连续的数字，去除其他所有符号 String cleanArtNo = this.extractCoreArticleNumber(artNo); List existList = multiSameFhbMap.containsKey(cleanArtNo) ? multiSameFhbMap.get(cleanArtNo) : new ArrayList<>(); @@ -460,6 +461,14 @@ public class GtAndFhbBizController extends BaseController { 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)) { + throw new ServiceException("FHB商品列表为空", HttpStatus.ERROR); + } + // fhb货号正在生效的颜色map，因为客户优惠有些是删除的颜色，需要通过这里去过滤 + Map> fhbExistArtNoColorMap = cacheList.stream().collect(Collectors + .groupingBy(FhbProdVO.SMIVO::getArtNo, Collectors.mapping(FhbProdVO.SMIVO::getColor, Collectors.toSet()))); Map> multiSameFhbMap = new HashMap<>(); // 查看Fhb 这边有多少相似的货号 List fhbProdList = ObjectUtils.defaultIfNull(redisCache @@ -506,12 +515,12 @@ public class GtAndFhbBizController extends BaseController { // 当前商品颜色列表 key 颜色中文名称 Map buJuProdColorMap = Optional.ofNullable(prodColorGroupMap.get(storeProd.getId())).orElseThrow(() -> new ServiceException("没有商品颜色!" + storeProd.getProdArtNum(), HttpStatus.ERROR)); // 根据步橘货号 找到FHB对应的货号，可能是列表 - List fhbAtrNoList = Optional.ofNullable(multiSameFhbMap.get(cleanArtNo)).orElseThrow(() -> new ServiceException("没有FHB货号!" + storeProd.getProdArtNum(), HttpStatus.ERROR)); - fhbAtrNoList.forEach(fhbAtrNo -> { + List fhbArtNoList = Optional.ofNullable(multiSameFhbMap.get(cleanArtNo)).orElseThrow(() -> new ServiceException("没有FHB货号!" + storeProd.getProdArtNum(), HttpStatus.ERROR)); + // 处理档口商品库存 + this.handleProdStock(fhbArtNoList, fhbStockGroupMap, buJuProdColorMap, storeProd.getStoreId(), storeProd.getId(), storeProd.getProdArtNum(), prodStockList); + fhbArtNoList.forEach(fhbArtNo -> { // 处理档口客户商品优惠 - this.handleCusDisc(fhbAtrNo, fhbCusDiscGroupMap, buJuProdColorMap, buJuStoreCusMap, storeProd.getStoreId(), storeProd.getId(), prodCusDiscList); - // 处理档口商品库存 - this.handleProdStock(fhbAtrNo, fhbStockGroupMap, buJuProdColorMap, storeProd.getStoreId(), storeProd.getId(), storeProd.getProdArtNum(), prodStockList); + this.handleCusDisc(fhbArtNo, fhbExistArtNoColorMap, fhbCusDiscGroupMap, buJuProdColorMap, buJuStoreCusMap, storeProd.getStoreId(), storeProd.getId(), prodCusDiscList); }); }); // 档口客户优惠 @@ -521,6 +530,7 @@ public class GtAndFhbBizController extends BaseController { return R.ok(); } + /** * step5 */ @@ -611,19 +621,50 @@ public class GtAndFhbBizController extends BaseController { } /** - * 处理货号颜色的库存 - * - * @param fhbAtrNo - * @param fhbStockGroupMap - * @param buJuProdColorMap - * @param storeId - * @param storeProdId - * @param prodArtNum - * @param prodStockList + * 处理客户优惠 */ - private void handleProdStock(String fhbAtrNo, Map> fhbStockGroupMap, Map buJuProdColorMap, - Long storeId, Long storeProdId, String prodArtNum, List prodStockList) { - Map fhbColorStockMap = fhbStockGroupMap.getOrDefault(fhbAtrNo, new HashMap<>()); + private void handleCusDisc(String fhbAtrNo, Map> fhbExistArtNoColorMap, + Map>> fhbCusDiscGroupMap, + Map buJuProdColorMap, Map buJuStoreCusMap, Long storeId, Long storeProdId, + List prodCusDiscList) { + // FHB货号下有哪些颜色存在客户优惠 + Map> fhbColorCusDiscMap = fhbCusDiscGroupMap.get(fhbAtrNo); + if (MapUtils.isEmpty(fhbColorCusDiscMap)) { + return; + } + // fhb当前货号正在生效的颜色列表 + Set existColorSet = fhbExistArtNoColorMap.getOrDefault(fhbAtrNo, Collections.emptySet()); + // 依次遍历存在优惠的颜色，设置步橘系统客户优惠关系 + fhbColorCusDiscMap.forEach((fhbColor, fhbCusDiscList) -> { + // 必须是现在正在生效的颜色，才会被添加到系统中 + if (!existColorSet.contains(fhbColor)) { + return; + } + // fhb优惠列表，如果对同一客户有多个优惠，则取修改时间最新的那条优惠 + Map latestCusDiscMap = fhbCusDiscList.stream().collect(Collectors.toMap(FhbCusDiscountVO.SMCDRecordVO::getCustomerName, Function.identity(), + BinaryOperator.maxBy(Comparator.comparing(FhbCusDiscountVO.SMCDRecordVO::getUpdateTime)))); + latestCusDiscMap.forEach((cusName, fhbCusDisc) -> { + // 获取步橘系统对应的颜色 + StoreProductColor buJuProdColor = buJuProdColorMap.get(fhbColor); + if (ObjectUtils.isNotEmpty(buJuProdColor)) { + StoreCustomer storeCus = Optional.ofNullable(buJuStoreCusMap.get(fhbCusDisc.getCustomerName())) + .orElseThrow(() -> new ServiceException("没有步橘系统对应的客户!" + fhbCusDisc.getCustomerName(), HttpStatus.ERROR)); + // 将FHB客户优惠 转为步橘系统优惠 + prodCusDiscList.add(new StoreCustomerProductDiscount().setStoreId(storeId).setStoreProdId(storeProdId).setStoreCusId(storeCus.getId()) + .setStoreCusName(storeCus.getCusName()).setStoreProdColorId(buJuProdColor.getId()).setDiscount(fhbCusDisc.getDiscount())); + } + }); + }); + } + + /** + * 匹配fhb货号颜色的库存 + */ + private void handleProdStock(List fhbArtNoList, Map> fhbStockGroupMap, + Map buJuProdColorMap, Long storeId, Long storeProdId, String prodArtNum, List prodStockList) { + // 获取fhb货号所有颜色的库存 + Map fhbColorStockMap = new HashMap<>(); + fhbArtNoList.forEach(fhbArtNo -> fhbColorStockMap.putAll(fhbStockGroupMap.getOrDefault(fhbArtNo, new HashMap<>()))); buJuProdColorMap.forEach((buJuColor, buJuProdColor) -> { StoreProductStock stock = new StoreProductStock().setStoreId(storeId).setStoreProdId(storeProdId).setProdArtNum(prodArtNum) .setColorName(buJuProdColorMap.get(buJuColor).getColorName()).setStoreProdColorId(buJuProdColorMap.get(buJuColor).getId()) @@ -650,27 +691,6 @@ public class GtAndFhbBizController extends BaseController { }); } - private void handleCusDisc(String fhbAtrNo, Map>> fhbCusDiscGroupMap, Map buJuProdColorMap, - Map buJuStoreCusMap, Long storeId, Long storeProdId, List prodCusDiscList) { - // FHB货号下有哪些颜色存在客户优惠 - Map> fhbColorCusDiscMap = fhbCusDiscGroupMap.get(fhbAtrNo); - if (MapUtils.isEmpty(fhbColorCusDiscMap)) { - return; - } - // 依次遍历存在优惠的颜色，设置步橘系统客户优惠关系 - fhbColorCusDiscMap.forEach((fhbColor, fhbCusDiscList) -> fhbCusDiscList.forEach(fhbCusDisc -> { - // 获取步橘系统对应的颜色 Z1065 黑手抓纹绒里、黑手抓纹单里 - StoreProductColor buJuProdColor = buJuProdColorMap.get(fhbColor); - if (ObjectUtils.isNotEmpty(buJuProdColor)) { - StoreCustomer storeCus = Optional.ofNullable(buJuStoreCusMap.get(fhbCusDisc.getCustomerName())) - .orElseThrow(() -> new ServiceException("没有步橘系统对应的客户!" + fhbCusDisc.getCustomerName(), HttpStatus.ERROR)); - // 将FHB客户优惠 转为步橘系统优惠 - prodCusDiscList.add(new StoreCustomerProductDiscount().setStoreId(storeId).setStoreProdId(storeProdId).setStoreCusId(storeCus.getId()) - .setStoreCusName(storeCus.getCusName()).setStoreProdColorId(buJuProdColor.getId()).setDiscount(fhbCusDisc.getDiscount())); - } - })); - } - /** * 初始化客户列表 * @@ -825,11 +845,10 @@ public class GtAndFhbBizController extends BaseController { /** * 初始化档口颜色 - * - * @param storeId 档口ID + * @param storeId 档口ID * @param supplierId 供应商ID */ - private Map initStoreColorList(Long storeId, Integer supplierId) { + private void initStoreColorList(Long storeId, Integer supplierId) { List cacheList = ObjectUtils.defaultIfNull(redisCache .getCacheObject(CacheConstants.MIGRATION_SUPPLIER_PROD_KEY + supplierId), new ArrayList<>()); if (CollectionUtils.isEmpty(cacheList)) { @@ -841,7 +860,6 @@ public class GtAndFhbBizController extends BaseController { storeColorList.add(new StoreColor().setStoreId(storeId).setColorName(fhbColorList.get(i)).setOrderNum(i + 1)); } this.storeColorMapper.insert(storeColorList); - return storeColorList.stream().collect(Collectors.toMap(StoreColor::getColorName, x -> x)); } @@ -868,4 +886,7 @@ public class GtAndFhbBizController extends BaseController { } + + + } 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 800b66dba..7341d4f4a 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 @@ -106,9 +106,8 @@ public class GtAndTyBizController extends BaseController { .getCacheObject(CacheConstants.MIGRATION_GT_SALE_BASIC_KEY + userId), new ArrayList<>()); Map articleNoColorMap = gtSaleBasicList.stream().collect(Collectors.groupingBy(GtProdSkuVO::getArticle_number, Collectors.collectingAndThen(Collectors.mapping(GtProdSkuVO::getColor, Collectors.toList()), - list -> "(" + list.stream().distinct().collect(Collectors.joining(",")) + ")"))); - List doubleRunSaleArtNoList = gtSaleBasicList.stream().map(GtProdSkuVO::getArticle_number) - .distinct().collect(Collectors.toList()); + list -> "(" + String.join(",", list) + ")"))); + List doubleRunSaleArtNoList = gtSaleBasicList.stream().map(GtProdSkuVO::getArticle_number).distinct().collect(Collectors.toList()); // 查看double_run 在售的商品 这边有多少相似的货号 doubleRunSaleArtNoList.forEach(article_number -> { // 只保留核心连续的数字，去除其他所有符号 @@ -121,8 +120,7 @@ public class GtAndTyBizController extends BaseController { // 查看gt 下架的商品有多少相似的货号 List doubleRunOffSaleBasicList = ObjectUtils.defaultIfNull(redisCache .getCacheObject(CacheConstants.MIGRATION_GT_OFF_SALE_BASIC_KEY + userId), new ArrayList<>()); - List doubleRunOffSaleArtNoList = doubleRunOffSaleBasicList.stream().map(GtProdSkuVO::getArticle_number) - .distinct().collect(Collectors.toList()); + List doubleRunOffSaleArtNoList = doubleRunOffSaleBasicList.stream().map(GtProdSkuVO::getArticle_number).distinct().collect(Collectors.toList()); doubleRunOffSaleArtNoList.forEach(article_number -> { // 只保留核心连续的数字，去除其他所有符号 String cleanArtNo = this.extractCoreArticleNumber(article_number); @@ -136,7 +134,7 @@ public class GtAndTyBizController extends BaseController { .getCacheObject(CacheConstants.MIGRATION_TY_PROD_KEY + userId), new ArrayList<>()); Map tyProdArtNumColorMap = tyProdList.stream().collect(Collectors.groupingBy(TyProdImportVO::getProdArtNum, Collectors.collectingAndThen(Collectors.mapping(TyProdImportVO::getColorName, Collectors.toList()), - list -> "(" + list.stream().distinct().collect(Collectors.joining(",")) + ")"))); + list -> "(" + String.join(",", list) + ")"))); List tyArtNoList = tyProdList.stream().map(TyProdImportVO::getProdArtNum).distinct().collect(Collectors.toList()); tyArtNoList.forEach(prodArtNum -> { // 只保留核心连续的数字，去除其他所有符号 @@ -447,6 +445,14 @@ public class GtAndTyBizController extends BaseController { } }); + // TY商品缓存 + List cacheList = redisCache.getCacheObject(CacheConstants.MIGRATION_TY_PROD_KEY + initVO.getUserId()); + if (CollectionUtils.isEmpty(cacheList)) { + throw new ServiceException("TY商品列表为空", HttpStatus.ERROR); + } + // ty货号正在生效的颜色map，因为客户优惠有些是删除的颜色，需要通过这里去过滤 + Map> tyExistArtNoColorMap = cacheList.stream().collect(Collectors + .groupingBy(TyProdImportVO::getProdArtNum, Collectors.mapping(TyProdImportVO::getColorName, Collectors.toSet()))); // 从redis中获取已存在的客户优惠数据 List tyCusDiscCacheList = redisCache.getCacheObject(CacheConstants.MIGRATION_TY_CUS_DISCOUNT_KEY + initVO.getUserId()); if (CollectionUtils.isEmpty(tyCusDiscCacheList)) { @@ -477,12 +483,18 @@ public class GtAndTyBizController extends BaseController { Map buJuProdColorMap = Optional.ofNullable(prodColorGroupMap.get(storeProd.getId())).orElseThrow(() -> new ServiceException("没有商品颜色!" + storeProd.getProdArtNum(), HttpStatus.ERROR)); // 根据步橘货号 找到TY对应的货号，可能是列表 List tyAtrNoList = Optional.ofNullable(multiSameTyMap.get(cleanArtNo)).orElseThrow(() -> new ServiceException("没有TY货号!" + storeProd.getProdArtNum(), HttpStatus.ERROR)); + // 处理档口商品库存 + this.handleProdStock(tyAtrNoList, tyProdStockMap, buJuProdColorMap, storeProd.getStoreId(), storeProd.getId(), storeProd.getProdArtNum(), prodStockList); + + tyAtrNoList.forEach(tyAtrNo -> { // 处理客户优惠 - this.handleCusDisc(tyAtrNo, tyCusDiscGroupMap, buJuProdColorMap, buJuStoreCusMap, prodCusDiscList, storeProd.getStoreId(), storeProd.getId()); - // 处理档口商品库存 - this.handleProdStock(tyAtrNo, tyProdStockMap, buJuProdColorMap, storeProd.getStoreId(), storeProd.getId(), storeProd.getProdArtNum(), prodStockList); + this.handleCusDisc(tyAtrNo, tyExistArtNoColorMap, tyCusDiscGroupMap, buJuProdColorMap, buJuStoreCusMap, prodCusDiscList, storeProd.getStoreId(), storeProd.getId()); }); + + + + }); // 档口客户优惠 this.storeCusProdDiscMapper.insert(prodCusDiscList); @@ -514,63 +526,13 @@ public class GtAndTyBizController extends BaseController { } /** - * 新建档口客户对应产品的优惠 - * - * @param initVO - * @param storeProdList - * @param storeCusList - * @param prodColorList - * @param multiSameTyMap + * 处理商品库存 */ - private void initStoreCusProdDiscAndProdStock(GtAndTYInitVO initVO, List storeProdList, List storeCusList, - List prodColorList, Map> multiSameTyMap) { - // 从redis中获取已存在的客户优惠数据 - List tyCusDiscCacheList = redisCache.getCacheObject(CacheConstants.MIGRATION_TY_CUS_DISCOUNT_KEY + initVO.getUserId()); - if (CollectionUtils.isEmpty(tyCusDiscCacheList)) { - throw new ServiceException("ty供应商客户优惠列表为空!" + initVO.getUserId(), HttpStatus.ERROR); - } - // 从redis中获取已存在的商品库存数据 - List tyStockList = redisCache.getCacheObject(CacheConstants.MIGRATION_TY_PROD_STOCK_KEY + initVO.getUserId()); - if (CollectionUtils.isEmpty(tyStockList)) { - throw new ServiceException("ty供应商商品库存列表为空!" + initVO.getUserId(), HttpStatus.ERROR); - } - // TY 货号颜色的库存对应关系 - Map> tyProdStockMap = tyStockList.stream().collect(Collectors - .groupingBy(TyProdStockVO::getProdArtNum, Collectors.toMap(TyProdStockVO::getColorName, x -> x))); - // TY 货号颜色优惠对应关系 - Map>> tyCusDiscGroupMap = tyCusDiscCacheList.stream().collect(Collectors - .groupingBy(TyCusDiscImportVO::getProdArtNum, Collectors.groupingBy(TyCusDiscImportVO::getColorName))); - // 步橘系统商品所有颜色maps - Map> prodColorGroupMap = prodColorList.stream().collect(Collectors - .groupingBy(StoreProductColor::getStoreProdId, Collectors.toMap(StoreProductColor::getColorName, x -> x))); - // 步橘系统客户名称map - Map buJuStoreCusMap = storeCusList.stream().collect(Collectors.toMap(StoreCustomer::getCusName, x -> x)); - List prodCusDiscList = new ArrayList<>(); - List prodStockList = new ArrayList<>(); - // 依次遍历商品列表，找到货号和FHB货号对应关系，然后用颜色进行匹配，建立客户优惠关系 - storeProdList.forEach(storeProd -> { - // 当前商品颜色列表 key 颜色中文名称 - Map buJuProdColorMap = Optional.ofNullable(prodColorGroupMap.get(storeProd.getId())).orElseThrow(() -> new ServiceException("没有商品颜色!" + storeProd.getProdArtNum(), HttpStatus.ERROR)); - // 根据步橘货号 找到TY对应的货号，可能是列表 - List tyAtrNoList = Optional.ofNullable(multiSameTyMap.get(storeProd.getProdArtNum())).orElseThrow(() -> new ServiceException("没有TY货号!" + storeProd.getProdArtNum(), HttpStatus.ERROR)); - tyAtrNoList.forEach(tyAtrNo -> { - // 处理客户优惠 - this.handleCusDisc(tyAtrNo, tyCusDiscGroupMap, buJuProdColorMap, buJuStoreCusMap, prodCusDiscList, storeProd.getStoreId(), storeProd.getId()); - // 处理档口商品库存 - this.handleProdStock(tyAtrNo, tyProdStockMap, buJuProdColorMap, storeProd.getStoreId(), storeProd.getId(), storeProd.getProdArtNum(), prodStockList); - }); - }); - - // 档口客户优惠 - this.storeCusProdDiscMapper.insert(prodCusDiscList); - // 档口客户库存 - this.prodStockMapper.insert(prodStockList); - - } - - private void handleProdStock(String tyAtrNo, Map> tyProdStockMap, Map buJuProdColorMap, + private void handleProdStock(List tyAtrNoList, Map> tyProdStockMap, Map buJuProdColorMap, Long storeId, Long storeProdId, String prodArtNum, List prodStockList) { - Map tyColorStockMap = tyProdStockMap.getOrDefault(tyAtrNo, new HashMap<>()); + // 获取ty货号所有颜色的库存 + Map tyColorStockMap = new HashMap<>(); + tyAtrNoList.forEach(tyArtNo -> tyColorStockMap.putAll(tyProdStockMap.getOrDefault(tyArtNo, new HashMap<>()))); buJuProdColorMap.forEach((buJuColor, buJuProdColor) -> { StoreProductStock stock = new StoreProductStock().setStoreId(storeId).setStoreProdId(storeProdId).setProdArtNum(prodArtNum) .setColorName(buJuProdColorMap.get(buJuColor).getColorName()).setStoreProdColorId(buJuProdColorMap.get(buJuColor).getId()) @@ -598,30 +560,34 @@ public class GtAndTyBizController extends BaseController { /** * 处理档口客户优惠 - * - * @param tyAtrNo - * @param tyCusDiscGroupMap - * @param buJuProdColorMap - * @param buJuStoreCusMap - * @param prodCusDiscList - * @param storeId - * @param storeProdId */ - private void handleCusDisc(String tyAtrNo, Map>> tyCusDiscGroupMap, Map buJuProdColorMap, - Map buJuStoreCusMap, List prodCusDiscList, Long storeId, Long storeProdId) { + private void handleCusDisc(String tyAtrNo, Map> tyExistArtNoColorMap, + Map>> tyCusDiscGroupMap, + Map buJuProdColorMap, Map buJuStoreCusMap, + List prodCusDiscList, Long storeId, Long storeProdId) { // TY货号下有哪些颜色存在客户优惠 Map> tyColorCusDiscMap = tyCusDiscGroupMap.get(tyAtrNo); if (MapUtils.isEmpty(tyColorCusDiscMap)) { return; } + // ty当前货号正在生效的颜色列表 + Set existColorSet = tyExistArtNoColorMap.getOrDefault(tyAtrNo, Collections.emptySet()); // 依次遍历存在优惠的颜色，设置步橘系统客户优惠关系 - tyColorCusDiscMap.forEach((tyColor, tyCusDiscList) -> tyCusDiscList.forEach(tyCusDisc -> { - StoreProductColor buJuProdColor = Optional.ofNullable(buJuProdColorMap.get(tyColor)).orElseThrow(() -> new ServiceException("没有步橘系统对应的颜色!" + tyColor, HttpStatus.ERROR)); - StoreCustomer storeCus = Optional.ofNullable(buJuStoreCusMap.get(tyCusDisc.getCusName())).orElseThrow(() -> new ServiceException("没有步橘系统对应的客户!" + tyCusDisc.getCusName(), HttpStatus.ERROR)); - // 将FHB客户优惠 转为步橘系统优惠 - prodCusDiscList.add(new StoreCustomerProductDiscount().setStoreId(storeId).setStoreProdId(storeProdId).setStoreCusId(storeCus.getId()) - .setStoreCusName(storeCus.getCusName()).setStoreProdColorId(buJuProdColor.getId()).setDiscount(tyCusDisc.getDiscount())); - })); + tyColorCusDiscMap.forEach((tyColor, tyCusDiscList) -> { + // 必须是现在正在生效的颜色，才会被添加到系统中 + if (!existColorSet.contains(tyColor)) { + return; + } + // TODO 该处TY 与 FHB处理不同 + // TODO 该处TY 与 FHB处理不同 + tyCusDiscList.forEach(tyCusDisc -> { + StoreProductColor buJuProdColor = Optional.ofNullable(buJuProdColorMap.get(tyColor)).orElseThrow(() -> new ServiceException("没有步橘系统对应的颜色!" + tyColor, HttpStatus.ERROR)); + StoreCustomer storeCus = Optional.ofNullable(buJuStoreCusMap.get(tyCusDisc.getCusName())).orElseThrow(() -> new ServiceException("没有步橘系统对应的客户!" + tyCusDisc.getCusName(), HttpStatus.ERROR)); + // 将FHB客户优惠 转为步橘系统优惠 + prodCusDiscList.add(new StoreCustomerProductDiscount().setStoreId(storeId).setStoreProdId(storeProdId).setStoreCusId(storeCus.getId()) + .setStoreCusName(storeCus.getCusName()).setStoreProdColorId(buJuProdColor.getId()).setDiscount(tyCusDisc.getDiscount())); + }); + }); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/vo/fhb/FhbCusDiscountVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/vo/fhb/FhbCusDiscountVO.java index d86cf6743..dcc370774 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/vo/fhb/FhbCusDiscountVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/vo/fhb/FhbCusDiscountVO.java @@ -27,6 +27,7 @@ public class FhbCusDiscountVO { private String customerName; private Integer supplierId; private Integer discount; + private String updateTime; }