From b9c2436822c0d0240824d1df1112c908c3fd5f04 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Thu, 13 Mar 2025 13:40:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=20=E5=95=86=E5=93=81=20SKU?= =?UTF-8?q?=20=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CurProdGroupServiceImpl.java | 21 +++++----------- .../service/impl/CurProdSkuServiceImpl.java | 25 +++++++------------ .../service/impl/CurProductServiceImpl.java | 18 ++++--------- .../impl/CurShopProdCategoryServiceImpl.java | 2 -- 收银机数据迁移关系.md | 16 +++++++++++- 5 files changed, 35 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurProdGroupServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurProdGroupServiceImpl.java index 8e4d996..6e1e693 100644 --- a/src/main/java/com/czg/mergedata/cur/service/impl/CurProdGroupServiceImpl.java +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurProdGroupServiceImpl.java @@ -1,7 +1,6 @@ package com.czg.mergedata.cur.service.impl; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONArray; import com.czg.mergedata.common.resp.CzgResult; import com.czg.mergedata.common.utils.PageUtils; @@ -10,7 +9,6 @@ import com.czg.mergedata.cur.entity.CurProdGroupRelation; import com.czg.mergedata.cur.mapper.CurProdGroupMapper; import com.czg.mergedata.cur.mapper.CurProdGroupRelationMapper; import com.czg.mergedata.cur.service.CurProdGroupService; -import com.czg.mergedata.cur.service.CurShopIdRelationService; import com.czg.mergedata.old.entity.OldProductGroup; import com.czg.mergedata.old.service.OldProductGroupService; import com.mybatisflex.core.paginate.Page; @@ -19,11 +17,9 @@ import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.sql.Time; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; /** * 商品分组 服务层实现。 @@ -32,14 +28,11 @@ import java.util.Map; * @since 2025-02-18 */ @Service -public class CurProdGroupServiceImpl extends ServiceImpl implements CurProdGroupService{ +public class CurProdGroupServiceImpl extends ServiceImpl implements CurProdGroupService { @Resource private CurProdGroupRelationMapper curProdGroupRelationMapper; - @Resource - private CurShopIdRelationService curShopIdRelationService; - @Resource private OldProductGroupService oldProductGroupService; @@ -49,23 +42,21 @@ public class CurProdGroupServiceImpl extends ServiceImpl oldAndCurShopIdMap = curShopIdRelationService.getOldShopIdRelation(); - - execProdGroup(oldAndCurShopIdMap); + execProdGroup(); return CzgResult.success("迁移成功"); } - private void execProdGroup(Map oldAndCurShopIdMap) { + private void execProdGroup() { Page page = oldProductGroupService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { - saveProdGroup(page.getRecords(), oldAndCurShopIdMap); + saveProdGroup(page.getRecords()); page = oldProductGroupService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void saveProdGroup(List oldProductGroupList, Map oldAndCurShopIdMap) { + private void saveProdGroup(List oldProductGroupList) { List curProdGroupList = new ArrayList<>(); List curProdGroupRelationList = new ArrayList<>(); @@ -74,7 +65,7 @@ public class CurProdGroupServiceImpl extends ServiceImpl implements CurProdSkuService{ - - @Resource - private CurShopIdRelationService curShopIdRelationService; +public class CurProdSkuServiceImpl extends ServiceImpl implements CurProdSkuService { @Resource private OldProductSkuService oldProductSkuService; @@ -39,31 +34,29 @@ public class CurProdSkuServiceImpl extends ServiceImpl mergeData() { getMapper().truncateTable(); - Map oldAndCurShopIdMap = curShopIdRelationService.getOldShopIdRelation(); - - execProSku(oldAndCurShopIdMap); + execProSku(); return CzgResult.success("迁移成功"); } - private void execProSku(Map oldAndCurShopIdMap) { + private void execProSku() { Page page = oldProductSkuService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { - saveProSku(page.getRecords(), oldAndCurShopIdMap); + saveProSku(page.getRecords()); page = oldProductSkuService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void saveProSku(List oldProductSkuList, Map oldAndCurShopIdMap) { + private void saveProSku(List oldProductSkuList) { List curProdSkuList = new ArrayList<>(); for (OldProductSku oldProductSku : oldProductSkuList) { CurProdSku curProdSku = new CurProdSku(); curProdSku.setId(Long.valueOf(oldProductSku.getId())); - curProdSku.setShopId(oldAndCurShopIdMap.get(Long.valueOf(oldProductSku.getShopId()))); + curProdSku.setShopId(Long.valueOf(oldProductSku.getShopId())); curProdSku.setBarCode(oldProductSku.getBarCode()); curProdSku.setProductId(Long.valueOf(oldProductSku.getProductId())); curProdSku.setOriginPrice(oldProductSku.getOriginPrice()); diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurProductServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurProductServiceImpl.java index c3135f7..adc11cb 100644 --- a/src/main/java/com/czg/mergedata/cur/service/impl/CurProductServiceImpl.java +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurProductServiceImpl.java @@ -9,11 +9,9 @@ import com.czg.mergedata.common.utils.PageUtils; import com.czg.mergedata.cur.entity.CurProduct; import com.czg.mergedata.cur.mapper.CurProductMapper; import com.czg.mergedata.cur.service.CurProductService; -import com.czg.mergedata.cur.service.CurShopIdRelationService; import com.czg.mergedata.old.entity.OldProduct; import com.czg.mergedata.old.service.OldProductService; import com.mybatisflex.core.paginate.Page; -import com.mybatisflex.core.row.Db; import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -22,7 +20,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; /** * 商品 服务层实现。 @@ -33,9 +30,6 @@ import java.util.Map; @Service public class CurProductServiceImpl extends ServiceImpl implements CurProductService { - @Resource - private CurShopIdRelationService curShopIdRelationService; - @Resource private OldProductService oldProductService; @@ -44,24 +38,22 @@ public class CurProductServiceImpl extends ServiceImpl mergeData() { getMapper().truncateTable(); - Map oldAndCurShopIdMap = curShopIdRelationService.getOldShopIdRelation(); - - execProduct(oldAndCurShopIdMap); + execProduct(); return CzgResult.success("迁移成功"); } - private void execProduct(Map oldAndCurShopIdMap) { + private void execProduct() { Page page = oldProductService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { - saveProduct(page.getRecords(), oldAndCurShopIdMap); + saveProduct(page.getRecords()); page = oldProductService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void saveProduct(List products, Map oldAndCurShopIdMap) { + private void saveProduct(List products) { List productList = new ArrayList<>(); for (OldProduct oldProduct : products) { @@ -70,7 +62,7 @@ public class CurProductServiceImpl extends ServiceImpl /merge/product/mergeProduct +#### 执行表 +- tb_product 表 + +### 14. 商品 SKU +> /merge/product/mergeSku +#### 执行表 +- tb_prod_sku 表 + +### 15. 商品分组 +> /merge/product/mergeGroup +#### 执行表 +- tb_prod_group 表 +- tb_prod_group_relation 表