From f6d6b51bd76e75d9b80d8405f01426b43b2c9ed9 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Thu, 13 Mar 2025 09:50:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=20=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cur/entity/CurPointsBasicSetting.java | 19 +++---- .../cur/entity/CurPointsExchangeRecord.java | 6 +-- .../CurPointsBasicSettingServiceImpl.java | 54 +++++++++---------- 收银机数据迁移关系.md | 8 +++ 4 files changed, 41 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/czg/mergedata/cur/entity/CurPointsBasicSetting.java b/src/main/java/com/czg/mergedata/cur/entity/CurPointsBasicSetting.java index 2b1b35f..36cfbd9 100644 --- a/src/main/java/com/czg/mergedata/cur/entity/CurPointsBasicSetting.java +++ b/src/main/java/com/czg/mergedata/cur/entity/CurPointsBasicSetting.java @@ -2,19 +2,17 @@ package com.czg.mergedata.cur.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -import java.io.Serial; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + /** * 积分基本设置 实体类。 * @@ -31,15 +29,10 @@ public class CurPointsBasicSetting implements Serializable { @Serial private static final long serialVersionUID = 1L; - /** - * id - */ - @Id(keyType = KeyType.Auto) - private Long id; - /** * 店铺id */ + @Id private Long shopId; /** diff --git a/src/main/java/com/czg/mergedata/cur/entity/CurPointsExchangeRecord.java b/src/main/java/com/czg/mergedata/cur/entity/CurPointsExchangeRecord.java index 4284a1e..f255ab4 100644 --- a/src/main/java/com/czg/mergedata/cur/entity/CurPointsExchangeRecord.java +++ b/src/main/java/com/czg/mergedata/cur/entity/CurPointsExchangeRecord.java @@ -63,19 +63,19 @@ public class CurPointsExchangeRecord implements Serializable { private String goodsImageUrl; /** - * 领取方式 self-自取 post-邮寄 + * 领取方式 self-自取 post-邮寄 */ private String pickupMethod; /** * 会员id */ - private Long memberId; + private Long userId; /** * 会员名称 */ - private String memberName; + private String nickName; /** * 手机号码 diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurPointsBasicSettingServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurPointsBasicSettingServiceImpl.java index a2b397a..1accd10 100644 --- a/src/main/java/com/czg/mergedata/cur/service/impl/CurPointsBasicSettingServiceImpl.java +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurPointsBasicSettingServiceImpl.java @@ -4,12 +4,14 @@ import cn.hutool.core.bean.BeanUtil; import com.czg.mergedata.common.resp.CzgResult; import com.czg.mergedata.common.utils.PageUtils; import com.czg.mergedata.cur.entity.CurMemberPointsLog; +import com.czg.mergedata.cur.entity.CurPointsBasicSetting; import com.czg.mergedata.cur.entity.CurPointsExchangeRecord; import com.czg.mergedata.cur.entity.CurPointsGoodsSetting; import com.czg.mergedata.cur.mapper.CurMemberPointsLogMapper; +import com.czg.mergedata.cur.mapper.CurPointsBasicSettingMapper; import com.czg.mergedata.cur.mapper.CurPointsExchangeRecordMapper; import com.czg.mergedata.cur.mapper.CurPointsGoodsSettingMapper; -import com.czg.mergedata.cur.service.CurShopIdRelationService; +import com.czg.mergedata.cur.service.CurPointsBasicSettingService; import com.czg.mergedata.old.entity.OldMemberPointsLog; import com.czg.mergedata.old.entity.OldPointsBasicSetting; import com.czg.mergedata.old.entity.OldPointsExchangeRecord; @@ -20,16 +22,12 @@ import com.czg.mergedata.old.service.OldPointsExchangeRecordService; import com.czg.mergedata.old.service.OldPointsGoodsSettingService; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.mergedata.cur.entity.CurPointsBasicSetting; -import com.czg.mergedata.cur.mapper.CurPointsBasicSettingMapper; -import com.czg.mergedata.cur.service.CurPointsBasicSettingService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * 积分基本设置 服务层实现。 @@ -40,9 +38,6 @@ import java.util.Map; @Service public class CurPointsBasicSettingServiceImpl extends ServiceImpl implements CurPointsBasicSettingService { - @Resource - private CurShopIdRelationService curShopIdRelationService; - @Resource private CurPointsExchangeRecordMapper curPointsExchangeRecordMapper; @@ -72,56 +67,54 @@ public class CurPointsBasicSettingServiceImpl extends ServiceImpl oldAndCurShopIdMap = curShopIdRelationService.getOldShopIdRelation(); - - execPointsBasicSetting(oldAndCurShopIdMap); - execPointsExchangeRecord(oldAndCurShopIdMap); - execPointsGoodsSetting(oldAndCurShopIdMap); - execMemberPointsLog(oldAndCurShopIdMap); + execPointsBasicSetting(); + execPointsExchangeRecord(); + execPointsGoodsSetting(); + execMemberPointsLog(); return CzgResult.success("迁移成功"); } - private void execPointsBasicSetting(Map oldAndCurShopIdMap) { + private void execPointsBasicSetting() { Page page = oldPointsBasicSettingService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { - savePointsBasicSetting(page.getRecords(), oldAndCurShopIdMap); + savePointsBasicSetting(page.getRecords()); page = oldPointsBasicSettingService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void execPointsExchangeRecord(Map oldAndCurShopIdMap) { + private void execPointsExchangeRecord() { Page page = oldPointsExchangeRecordService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { - savePointsExchangeRecord(page.getRecords(), oldAndCurShopIdMap); + savePointsExchangeRecord(page.getRecords()); page = oldPointsExchangeRecordService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void execPointsGoodsSetting(Map oldAndCurShopIdMap) { + private void execPointsGoodsSetting() { Page page = oldPointsGoodsSettingService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { - savePointsGoodsSetting(page.getRecords(), oldAndCurShopIdMap); + savePointsGoodsSetting(page.getRecords()); page = oldPointsGoodsSettingService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void execMemberPointsLog(Map oldAndCurShopIdMap) { + private void execMemberPointsLog() { Page page = oldMemberPointsLogService.page(PageUtils.buildPage()); while (!page.getRecords().isEmpty()) { - saveMemberPointsLog(page.getRecords(), oldAndCurShopIdMap); + saveMemberPointsLog(page.getRecords()); page = oldMemberPointsLogService.page(PageUtils.buildPage(page.getPageNumber() + 1)); } } - private void savePointsBasicSetting(List oldPointsBasicSettingList, Map oldAndCurShopIdMap) { + private void savePointsBasicSetting(List oldPointsBasicSettingList) { List curPointsBasicSettingList = new ArrayList<>(); for (OldPointsBasicSetting oldPointsBasicSetting : oldPointsBasicSettingList) { CurPointsBasicSetting curPointsBasicSetting = BeanUtil.toBean(oldPointsBasicSetting, CurPointsBasicSetting.class); - curPointsBasicSetting.setShopId(oldAndCurShopIdMap.get(oldPointsBasicSetting.getShopId())); + curPointsBasicSetting.setShopId(oldPointsBasicSetting.getShopId()); curPointsBasicSettingList.add(curPointsBasicSetting); } @@ -129,36 +122,37 @@ public class CurPointsBasicSettingServiceImpl extends ServiceImpl oldPointsExchangeRecordList, Map oldAndCurShopIdMap) { + private void savePointsExchangeRecord(List oldPointsExchangeRecordList) { List curPointsExchangeRecordList = new ArrayList<>(); for (OldPointsExchangeRecord oldPointsExchangeRecord : oldPointsExchangeRecordList) { CurPointsExchangeRecord curPointsExchangeRecord = BeanUtil.toBean(oldPointsExchangeRecord, CurPointsExchangeRecord.class); - curPointsExchangeRecord.setShopId(oldAndCurShopIdMap.get(oldPointsExchangeRecord.getShopId())); + curPointsExchangeRecord.setUserId(oldPointsExchangeRecord.getMemberId()); + curPointsExchangeRecord.setNickName(oldPointsExchangeRecord.getMemberName()); curPointsExchangeRecordList.add(curPointsExchangeRecord); } curPointsExchangeRecordMapper.insertBatch(curPointsExchangeRecordList); } - private void savePointsGoodsSetting(List oldPointsGoodsSettingList, Map oldAndCurShopIdMap) { + private void savePointsGoodsSetting(List oldPointsGoodsSettingList) { List curPointsGoodsSettingList = new ArrayList<>(); for (OldPointsGoodsSetting oldPointsGoodsSetting : oldPointsGoodsSettingList) { CurPointsGoodsSetting curPointsGoodsSetting = BeanUtil.toBean(oldPointsGoodsSetting, CurPointsGoodsSetting.class); - curPointsGoodsSetting.setShopId(oldAndCurShopIdMap.get(oldPointsGoodsSetting.getShopId())); + curPointsGoodsSetting.setShopId(oldPointsGoodsSetting.getShopId()); curPointsGoodsSettingList.add(curPointsGoodsSetting); } curPointsGoodsSettingMapper.insertBatch(curPointsGoodsSettingList); } - private void saveMemberPointsLog(List oldMemberPointsLogList, Map oldAndCurShopIdMap) { + private void saveMemberPointsLog(List oldMemberPointsLogList) { List curMemberPointsLogs = new ArrayList<>(); for (OldMemberPointsLog oldMemberPointsLog : oldMemberPointsLogList) { CurMemberPointsLog memberPointsLog = BeanUtil.toBean(oldMemberPointsLog, CurMemberPointsLog.class); - memberPointsLog.setShopId(oldAndCurShopIdMap.get(oldMemberPointsLog.getShopId())); + memberPointsLog.setUserId(oldMemberPointsLog.getMemberId()); curMemberPointsLogs.add(memberPointsLog); } diff --git a/收银机数据迁移关系.md b/收银机数据迁移关系.md index afcc115..1e38a7e 100644 --- a/收银机数据迁移关系.md +++ b/收银机数据迁移关系.md @@ -39,5 +39,13 @@ - tb_shop_user_flow 表 - tb_order_payment 表 +### 4. 用户积分流水 +> /merge/points/mergePoints +#### 执行表 +- tb_points_basic_setting 表 +- tb_points_exchange_record 表 +- tb_points_goods_setting 表 +- tb_member_points_log 表 +