From 1f39d91b3e49119e667ab51fe5c5fb47fb28a1b6 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sat, 11 Oct 2025 23:44:09 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9FBUG=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 --- .../xkt/migartion/GtAndFhbBizController.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 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 a6fe5da7b..26de439e0 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 @@ -302,20 +302,16 @@ public class GtAndFhbBizController extends BaseController { storeProdList.forEach(storeProd -> { // 获取clearArtNo String clearArtNo = this.extractCoreArticleNumber(storeProd.getProdArtNum()); - // FHB匹配的货号 - List fhbMatchArtNoList = multiSameFhbMap.get(clearArtNo); // 获取GT匹配的商品sku列表 List gtMatchSkuList = this.getGtFirstSku(multiSaleSameGoMap, gtSaleGroupMap, clearArtNo); - fhbMatchArtNoList.forEach(fhbArtNo -> { - // 初始化商品服务承诺 - prodSvcList.add(new StoreProductService().setStoreProdId(storeProd.getId()).setCustomRefund("0") - .setThirtyDayRefund("0").setOneBatchSale("1").setRefundWithinThreeDay("0")); - // 初始化商品的类目属性 - StoreProductCategoryAttribute cateAttr = Optional.ofNullable(prodAttrMap.get(gtMatchSkuList.get(0).getProduct_id())) - .orElseThrow(() -> new ServiceException("没有GT商品类目属性!" + storeProd.getProdArtNum(), HttpStatus.ERROR)); - cateAttr.setStoreId(storeProd.getStoreId()).setStoreProdId(storeProd.getId()); - prodAttrList.add(cateAttr); - }); + // 初始化商品服务承诺 + prodSvcList.add(new StoreProductService().setStoreProdId(storeProd.getId()).setCustomRefund("0") + .setThirtyDayRefund("0").setOneBatchSale("1").setRefundWithinThreeDay("0")); + // 初始化商品的类目属性 + StoreProductCategoryAttribute cateAttr = Optional.ofNullable(prodAttrMap.get(gtMatchSkuList.get(0).getProduct_id())) + .orElseThrow(() -> new ServiceException("没有GT商品类目属性!" + storeProd.getProdArtNum(), HttpStatus.ERROR)); + cateAttr.setStoreId(storeProd.getStoreId()).setStoreProdId(storeProd.getId()); + prodAttrList.add(cateAttr); }); // 插入档口服务承诺、商品基本属性 this.prodSvcMapper.insert(prodSvcList);