From 88df994553ecafa13d170a25bebebc036393b761 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Thu, 13 Mar 2025 11:33:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=20=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=20=E8=A7=84=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CurShopProdSpecServiceImpl.java | 28 +++++++++---------- .../impl/CurShopProdUnitServiceImpl.java | 27 +++++++----------- 收银机数据迁移关系.md | 9 ++++++ 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopProdSpecServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopProdSpecServiceImpl.java index 9e76990..6e917e8 100644 --- a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopProdSpecServiceImpl.java +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopProdSpecServiceImpl.java @@ -5,19 +5,21 @@ import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.czg.mergedata.common.resp.CzgResult; import com.czg.mergedata.common.utils.PageUtils; -import com.czg.mergedata.cur.service.CurShopIdRelationService; +import com.czg.mergedata.cur.entity.CurShopProdSpec; +import com.czg.mergedata.cur.mapper.CurShopProdSpecMapper; +import com.czg.mergedata.cur.service.CurShopProdSpecService; import com.czg.mergedata.old.entity.OldProductSpec; import com.czg.mergedata.old.service.OldProductSpecService; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.mergedata.cur.entity.CurShopProdSpec; -import com.czg.mergedata.cur.mapper.CurShopProdSpecMapper; -import com.czg.mergedata.cur.service.CurShopProdSpecService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -29,9 +31,6 @@ import java.util.stream.Collectors; @Service public class CurShopProdSpecServiceImpl extends ServiceImpl implements CurShopProdSpecService{ - @Resource - private CurShopIdRelationService curShopIdRelationService; - @Resource private OldProductSpecService oldProductSpecService; @@ -39,23 +38,22 @@ public class CurShopProdSpecServiceImpl extends ServiceImpl mergeProductSpec() { getMapper().truncateTable(); - Map oldAndCurShopIdMap = curShopIdRelationService.getOldShopIdRelation(); - mergeProductSpec(oldAndCurShopIdMap); + execProductSpec(); return CzgResult.success("迁移成功"); } - private void mergeProductSpec(Map oldAndCurShopIdMap) { + private void execProductSpec() { Page page = oldProductSpecService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { - saveProdSpec(page.getRecords(), oldAndCurShopIdMap); + saveProdSpec(page.getRecords()); page = oldProductSpecService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void saveProdSpec(List oldProductSpecs, Map oldAndCurShopIdMap) { + private void saveProdSpec(List oldProductSpecs) { List firstSpecs = new ArrayList<>(); // 保存一级规格 @@ -66,9 +64,9 @@ public class CurShopProdSpecServiceImpl extends ServiceImpl implements CurShopProdUnitService { - @Resource - private CurShopIdRelationService curShopIdRelationService; - @Resource private OldShopUnitService oldShopUnitService; @@ -40,34 +35,32 @@ public class CurShopProdUnitServiceImpl extends ServiceImpl mergeProductUnit() { getMapper().truncateTable(); - Map oldAndCurShopIdMap = curShopIdRelationService.getOldShopIdRelation(); - - mergeUnit(oldAndCurShopIdMap); - return null; + mergeUnit(); + return CzgResult.success("商品单位合并成功"); } - private void mergeUnit(Map oldAndCurShopIdMap) { + private void mergeUnit() { Page page = oldShopUnitService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { - saveUnitInfo(page.getRecords(), oldAndCurShopIdMap); + saveUnitInfo(page.getRecords()); page = oldShopUnitService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void saveUnitInfo(List oldShopUnits, Map oldAndCurShopIdMap) { + private void saveUnitInfo(List oldShopUnits) { List curShopProdUnits = new ArrayList<>(); for (OldShopUnit oldShopUnit : oldShopUnits) { CurShopProdUnit curShopProdUnit = new CurShopProdUnit(); - Long shopId = oldAndCurShopIdMap.get(Long.valueOf(oldShopUnit.getShopId())); + Long shopId = Long.valueOf(oldShopUnit.getShopId()); curShopProdUnit.setId(Long.valueOf(oldShopUnit.getId())); curShopProdUnit.setName(oldShopUnit.getName()); curShopProdUnit.setUnitType(oldShopUnit.getUnitType()); curShopProdUnit.setIsSystem("1".equals(oldShopUnit.getShopId()) ? 1 : 0); curShopProdUnit.setStatus(oldShopUnit.getStatus()); - curShopProdUnit.setShopId(shopId == null ? 1L : shopId); + curShopProdUnit.setShopId(shopId); curShopProdUnit.setCreateTime(DateUtil.toLocalDateTime(oldShopUnit.getCreatedAt() == null ? new Date() : new Date(oldShopUnit.getCreatedAt()))); curShopProdUnits.add(curShopProdUnit); diff --git a/收银机数据迁移关系.md b/收银机数据迁移关系.md index 6aadc13..87615e8 100644 --- a/收银机数据迁移关系.md +++ b/收银机数据迁移关系.md @@ -80,6 +80,15 @@ - tb_call_queue 表 - tb_call_table 表 +### 10. 商品单位 +> /merge/product/mergeUnit +#### 执行表 +- tb_shop_prod_unit 表 + +### 11. 商品规格 +> /merge/product/mergeSpec +#### 执行表 +- tb_shop_prod_spec 表