czg_team
/
merge_data
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

版本控制

This commit is contained in:
GYJ 2025-03-17 10:52:15 +08:00
parent 5fab0966eb
commit 069c5d5968
12 changed files with 99 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/czg/mergedata/cur/service/impl/CurCallConfigServiceImpl.java
View File

@ -10,6 +10,8 @@ import com.czg.mergedata.cur.mapper.CurCallConfigMapper;
import com.czg.mergedata.cur.mapper.CurCallQueueMapper;
import com.czg.mergedata.cur.mapper.CurCallTableMapper;
import com.czg.mergedata.cur.service.CurCallConfigService;
import com.czg.mergedata.cur.service.CurCallQueueService;
import com.czg.mergedata.cur.service.CurCallTableService;
import com.czg.mergedata.old.entity.OldCallConfig;
import com.czg.mergedata.old.entity.OldCallQueue;
import com.czg.mergedata.old.entity.OldCallTable;
@ -37,9 +39,15 @@ public class CurCallConfigServiceImpl extends ServiceImpl<CurCallConfigMapper, C
@Resource
private CurCallQueueMapper curCallQueueMapper;
@Resource
private CurCallQueueService curCallQueueService;
@Resource
private CurCallTableMapper curCallTableMapper;
@Resource
private CurCallTableService curCallTableService;
@Resource
private OldCallConfigService oldCallConfigService;
@ -111,7 +119,7 @@ public class CurCallConfigServiceImpl extends ServiceImpl<CurCallConfigMapper, C
curCallQueueList.add(curCallQueue);
}
curCallQueueMapper.insertBatch(curCallQueueList);
curCallQueueService.saveBatch(curCallQueueList);
}
private void saveCallTable(List<OldCallTable> oldCallTableList) {
@ -123,6 +131,6 @@ public class CurCallConfigServiceImpl extends ServiceImpl<CurCallConfigMapper, C
curCallTableList.add(curCallTable);
}
curCallTableMapper.insertBatch(curCallTableList);
curCallTableService.saveBatch(curCallTableList);
}
}

6
src/main/java/com/czg/mergedata/cur/service/impl/CurCouponCategoryServiceImpl.java
View File

@ -8,6 +8,7 @@ import com.czg.mergedata.cur.entity.CurGroupOrderCoupon;
import com.czg.mergedata.cur.mapper.CurCouponCategoryMapper;
import com.czg.mergedata.cur.mapper.CurGroupOrderCouponMapper;
import com.czg.mergedata.cur.service.CurCouponCategoryService;
import com.czg.mergedata.cur.service.CurGroupOrderCouponService;
import com.czg.mergedata.old.entity.OldCouponCategory;
import com.czg.mergedata.old.entity.OldGroupOrderCoupon;
import com.czg.mergedata.old.service.OldCouponCategoryService;
@ -35,6 +36,9 @@ public class CurCouponCategoryServiceImpl extends ServiceImpl<CurCouponCategoryM
@Resource
private CurGroupOrderCouponMapper curGroupOrderCouponMapper;
@Resource
private CurGroupOrderCouponService curGroupOrderCouponService;
@Resource
private OldGroupOrderCouponService oldGroupOrderCouponService;
@ -88,6 +92,6 @@ public class CurCouponCategoryServiceImpl extends ServiceImpl<CurCouponCategoryM
curGroupOrderCouponList.add(curGroupOrderCoupon);
}
curGroupOrderCouponMapper.insertBatch(curGroupOrderCouponList);
curGroupOrderCouponService.saveBatch(curGroupOrderCouponList);
}
}

12
src/main/java/com/czg/mergedata/cur/service/impl/CurCreditBuyerServiceImpl.java
View File

@ -6,6 +6,8 @@ import com.czg.mergedata.cur.entity.CurCreditBuyerOrder;
import com.czg.mergedata.cur.entity.CurCreditPaymentRecord;
import com.czg.mergedata.cur.mapper.CurCreditBuyerOrderMapper;
import com.czg.mergedata.cur.mapper.CurCreditPaymentRecordMapper;
import com.czg.mergedata.cur.service.CurCreditBuyerOrderService;
import com.czg.mergedata.cur.service.CurCreditPaymentRecordService;
import com.czg.mergedata.old.entity.OldCreditBuyer;
import com.czg.mergedata.old.entity.OldCreditBuyerOrder;
import com.czg.mergedata.old.entity.OldCreditPaymentRecord;
@ -34,9 +36,15 @@ public class CurCreditBuyerServiceImpl extends ServiceImpl<CurCreditBuyerMapper,
@Resource
private CurCreditBuyerOrderMapper curCreditBuyerOrderMapper;
@Resource
private CurCreditBuyerOrderService curCreditBuyerOrderService;
@Resource
private CurCreditPaymentRecordMapper curCreditPaymentRecordMapper;
@Resource
private CurCreditPaymentRecordService curCreditPaymentRecordService;
@Resource
private OldCreditBuyerService oldCreditBuyerService;
@ -79,7 +87,7 @@ public class CurCreditBuyerServiceImpl extends ServiceImpl<CurCreditBuyerMapper,
CurCreditBuyerOrder bean = BeanUtil.toBean(oldCreditBuyerOrder, CurCreditBuyerOrder.class);
curList.add(bean);
}
curCreditBuyerOrderMapper.insertBatch(curList);
curCreditBuyerOrderService.saveBatch(curList);
}
private void execPaymentRecord() {
@ -90,6 +98,6 @@ public class CurCreditBuyerServiceImpl extends ServiceImpl<CurCreditBuyerMapper,
CurCreditPaymentRecord bean = BeanUtil.toBean(oldCreditPaymentRecord, CurCreditPaymentRecord.class);
curList.add(bean);
}
curCreditPaymentRecordMapper.insertBatch(curList);
curCreditPaymentRecordService.saveBatch(curList);
}
}

12
src/main/java/com/czg/mergedata/cur/service/impl/CurPadLayoutServiceImpl.java
View File

@ -10,6 +10,8 @@ import com.czg.mergedata.cur.mapper.CurPadLayoutMapper;
import com.czg.mergedata.cur.mapper.CurPadProductCategoryDetailMapper;
import com.czg.mergedata.cur.mapper.CurPadProductCategoryMapper;
import com.czg.mergedata.cur.service.CurPadLayoutService;
import com.czg.mergedata.cur.service.CurPadProductCategoryDetailService;
import com.czg.mergedata.cur.service.CurPadProductCategoryService;
import com.czg.mergedata.old.entity.OldPadLayout;
import com.czg.mergedata.old.entity.OldPadProductCategory;
import com.czg.mergedata.old.entity.OldPadProductCategoryDetail;
@ -36,9 +38,15 @@ public class CurPadLayoutServiceImpl extends ServiceImpl<CurPadLayoutMapper, Cur
@Resource
private CurPadProductCategoryMapper curPadProductCategoryMapper;
@Resource
private CurPadProductCategoryService curPadProductCategoryService;
@Resource
private CurPadProductCategoryDetailMapper curPadProductCategoryDetailMapper;
@Resource
private CurPadProductCategoryDetailService curPadProductCategoryDetailService;
@Resource
private OldPadLayoutService oldPadLayoutService;
@ -111,7 +119,7 @@ public class CurPadLayoutServiceImpl extends ServiceImpl<CurPadLayoutMapper, Cur
curPadProductCategoryList.add(curPadProductCategory);
}
curPadProductCategoryMapper.insertBatch(curPadProductCategoryList);
curPadProductCategoryService.saveBatch(curPadProductCategoryList);
}
private void savePadProductCategoryDetail(List<OldPadProductCategoryDetail> oldPadProductCategoryDetailList) {
@ -122,6 +130,6 @@ public class CurPadLayoutServiceImpl extends ServiceImpl<CurPadLayoutMapper, Cur
curPadProductCategoryDetailList.add(curPadProductCategoryDetail);
}
curPadProductCategoryDetailMapper.insertBatch(curPadProductCategoryDetailList);
curPadProductCategoryDetailService.saveBatch(curPadProductCategoryDetailList);
}
}

18
src/main/java/com/czg/mergedata/cur/service/impl/CurPointsBasicSettingServiceImpl.java
View File

@ -11,7 +11,10 @@ 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.CurMemberPointsLogService;
import com.czg.mergedata.cur.service.CurPointsBasicSettingService;
import com.czg.mergedata.cur.service.CurPointsExchangeRecordService;
import com.czg.mergedata.cur.service.CurPointsGoodsSettingService;
import com.czg.mergedata.old.entity.OldMemberPointsLog;
import com.czg.mergedata.old.entity.OldPointsBasicSetting;
import com.czg.mergedata.old.entity.OldPointsExchangeRecord;
@ -41,12 +44,21 @@ public class CurPointsBasicSettingServiceImpl extends ServiceImpl<CurPointsBasic
@Resource
private CurPointsExchangeRecordMapper curPointsExchangeRecordMapper;
@Resource
private CurPointsExchangeRecordService curPointsExchangeRecordService;
@Resource
private CurPointsGoodsSettingMapper curPointsGoodsSettingMapper;
@Resource
private CurPointsGoodsSettingService curPointsGoodsSettingService;
@Resource
private CurMemberPointsLogMapper curMemberPointsLogMapper;
@Resource
private CurMemberPointsLogService curMemberPointsLogService;
@Resource
private OldPointsBasicSettingService oldPointsBasicSettingService;
@ -132,7 +144,7 @@ public class CurPointsBasicSettingServiceImpl extends ServiceImpl<CurPointsBasic
curPointsExchangeRecordList.add(curPointsExchangeRecord);
}
curPointsExchangeRecordMapper.insertBatch(curPointsExchangeRecordList);
curPointsExchangeRecordService.saveBatch(curPointsExchangeRecordList);
}
private void savePointsGoodsSetting(List<OldPointsGoodsSetting> oldPointsGoodsSettingList) {
@ -144,7 +156,7 @@ public class CurPointsBasicSettingServiceImpl extends ServiceImpl<CurPointsBasic
curPointsGoodsSettingList.add(curPointsGoodsSetting);
}
curPointsGoodsSettingMapper.insertBatch(curPointsGoodsSettingList);
curPointsGoodsSettingService.saveBatch(curPointsGoodsSettingList);
}
private void saveMemberPointsLog(List<OldMemberPointsLog> oldMemberPointsLogList) {
@ -156,6 +168,6 @@ public class CurPointsBasicSettingServiceImpl extends ServiceImpl<CurPointsBasic
curMemberPointsLogs.add(memberPointsLog);
}
curMemberPointsLogMapper.insertBatch(curMemberPointsLogs);
curMemberPointsLogService.saveBatch(curMemberPointsLogs);
}
}

6
src/main/java/com/czg/mergedata/cur/service/impl/CurProdGroupServiceImpl.java
View File

@ -8,6 +8,7 @@ import com.czg.mergedata.cur.entity.CurProdGroup;
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.CurProdGroupRelationService;
import com.czg.mergedata.cur.service.CurProdGroupService;
import com.czg.mergedata.old.entity.OldProductGroup;
import com.czg.mergedata.old.service.OldProductGroupService;
@ -33,6 +34,9 @@ public class CurProdGroupServiceImpl extends ServiceImpl<CurProdGroupMapper, Cur
@Resource
private CurProdGroupRelationMapper curProdGroupRelationMapper;
@Resource
private CurProdGroupRelationService curProdGroupRelationService;
@Resource
private OldProductGroupService oldProductGroupService;
@ -88,6 +92,6 @@ public class CurProdGroupServiceImpl extends ServiceImpl<CurProdGroupMapper, Cur
}
saveBatch(curProdGroupList);
curProdGroupRelationMapper.insertBatch(curProdGroupRelationList);
curProdGroupRelationService.saveBatch(curProdGroupRelationList);
}
}

6
src/main/java/com/czg/mergedata/cur/service/impl/CurShopShareServiceImpl.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import com.czg.mergedata.common.resp.CzgResult;
import com.czg.mergedata.cur.entity.CurShopShareRecord;
import com.czg.mergedata.cur.mapper.CurShopShareRecordMapper;
import com.czg.mergedata.cur.service.CurShopShareRecordService;
import com.czg.mergedata.old.entity.OldShopShare;
import com.czg.mergedata.old.entity.OldShopShareRecord;
import com.czg.mergedata.old.service.OldShopShareRecordService;
@ -31,6 +32,9 @@ public class CurShopShareServiceImpl extends ServiceImpl<CurShopShareMapper, Cur
@Resource
private CurShopShareRecordMapper curShopShareRecordMapper;
@Resource
private CurShopShareRecordService curShopShareRecordService;
@Resource
private OldShopShareService oldShopShareService;
@ -70,6 +74,6 @@ public class CurShopShareServiceImpl extends ServiceImpl<CurShopShareMapper, Cur
curShopShareRecordList.add(curShopShareRecord);
}
curShopShareRecordMapper.insertBatch(curShopShareRecordList);
curShopShareRecordService.saveBatch(curShopShareRecordList);
}
}

7
src/main/java/com/czg/mergedata/cur/service/impl/CurShopSongServiceImpl.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import com.czg.mergedata.common.resp.CzgResult;
import com.czg.mergedata.cur.entity.CurShopSongOrder;
import com.czg.mergedata.cur.mapper.CurShopSongOrderMapper;
import com.czg.mergedata.cur.service.CurShopSongOrderService;
import com.czg.mergedata.old.entity.OldShopSong;
import com.czg.mergedata.old.entity.OldShopSongOrder;
import com.czg.mergedata.old.service.OldShopSongOrderService;
@ -30,6 +31,9 @@ public class CurShopSongServiceImpl extends ServiceImpl<CurShopSongMapper, CurSh
@Resource
private CurShopSongOrderMapper curShopSongOrderMapper;
@Resource
private CurShopSongOrderService curShopSongOrderService;
@Resource
private OldShopSongService oldShopSongService;
@ -69,6 +73,7 @@ public class CurShopSongServiceImpl extends ServiceImpl<CurShopSongMapper, CurSh
CurShopSongOrder bean = BeanUtil.toBean(oldShopSongOrder, CurShopSongOrder.class);
curShopSongOrders.add(bean);
}
curShopSongOrderMapper.insertBatch(curShopSongOrders);
curShopSongOrderService.saveBatch(curShopSongOrders);
}
}

18
src/main/java/com/czg/mergedata/cur/service/impl/CurShopStorageServiceImpl.java
View File

@ -2,10 +2,15 @@ package com.czg.mergedata.cur.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.czg.mergedata.common.resp.CzgResult;
import com.czg.mergedata.cur.entity.CurShopStorage;
import com.czg.mergedata.cur.entity.CurShopStorageGood;
import com.czg.mergedata.cur.entity.CurShopStorageRecord;
import com.czg.mergedata.cur.mapper.CurShopStorageGoodMapper;
import com.czg.mergedata.cur.mapper.CurShopStorageMapper;
import com.czg.mergedata.cur.mapper.CurShopStorageRecordMapper;
import com.czg.mergedata.cur.service.CurShopStorageGoodService;
import com.czg.mergedata.cur.service.CurShopStorageRecordService;
import com.czg.mergedata.cur.service.CurShopStorageService;
import com.czg.mergedata.old.entity.OldShopStorage;
import com.czg.mergedata.old.entity.OldShopStorageGood;
import com.czg.mergedata.old.entity.OldShopStorageRecord;
@ -13,9 +18,6 @@ import com.czg.mergedata.old.service.OldShopStorageGoodService;
import com.czg.mergedata.old.service.OldShopStorageRecordService;
import com.czg.mergedata.old.service.OldShopStorageService;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.czg.mergedata.cur.entity.CurShopStorage;
import com.czg.mergedata.cur.mapper.CurShopStorageMapper;
import com.czg.mergedata.cur.service.CurShopStorageService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -35,9 +37,15 @@ public class CurShopStorageServiceImpl extends ServiceImpl<CurShopStorageMapper,
@Resource
private CurShopStorageRecordMapper curShopStorageRecordMapper;
@Resource
private CurShopStorageRecordService curShopStorageRecordService;
@Resource
private CurShopStorageGoodMapper curShopStorageGoodMapper;
@Resource
private CurShopStorageGoodService curShopStorageGoodService;
@Resource
private OldShopStorageService oldShopStorageService;
@ -80,7 +88,7 @@ public class CurShopStorageServiceImpl extends ServiceImpl<CurShopStorageMapper,
CurShopStorageRecord record = BeanUtil.toBean(oldShopStorageRecord, CurShopStorageRecord.class);
curShopStorageRecordList.add(record);
}
curShopStorageRecordMapper.insertBatch(curShopStorageRecordList);
curShopStorageRecordService.saveBatch(curShopStorageRecordList);
}
private void mergeStorageGood() {
@ -90,6 +98,6 @@ public class CurShopStorageServiceImpl extends ServiceImpl<CurShopStorageMapper,
CurShopStorageGood good = BeanUtil.toBean(oldShopStorageGood, CurShopStorageGood.class);
curShopStorageGoodList.add(good);
}
curShopStorageGoodMapper.insertBatch(curShopStorageGoodList);
curShopStorageGoodService.saveBatch(curShopStorageGoodList);
}
}

6
src/main/java/com/czg/mergedata/cur/service/impl/CurShopTableServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.czg.mergedata.common.resp.CzgResult;
import com.czg.mergedata.common.utils.PageUtils;
import com.czg.mergedata.cur.entity.CurShopTableArea;
import com.czg.mergedata.cur.mapper.CurShopTableAreaMapper;
import com.czg.mergedata.cur.service.CurShopTableAreaService;
import com.czg.mergedata.old.entity.OldShopArea;
import com.czg.mergedata.old.entity.OldShopTable;
import com.czg.mergedata.old.service.OldShopAreaService;
@ -35,6 +36,9 @@ public class CurShopTableServiceImpl extends ServiceImpl<CurShopTableMapper, Cur
@Resource
private CurShopTableAreaMapper curShopTableAreaMapper;
@Resource
private CurShopTableAreaService curShopTableAreaService;
@Resource
private OldShopAreaService oldShopAreaService;
@ -89,7 +93,7 @@ public class CurShopTableServiceImpl extends ServiceImpl<CurShopTableMapper, Cur
curShopTableAreas.add(curShopTableArea);
}
curShopTableAreaMapper.insertBatch(curShopTableAreas);
curShopTableAreaService.saveBatch(curShopTableAreas);
}
private void saveTable(List<OldShopTable> oldShopTableList) {

12
src/main/java/com/czg/mergedata/cur/service/impl/CurShopVendorServiceImpl.java
View File

@ -7,6 +7,8 @@ import com.czg.mergedata.cur.entity.CurShopVendorTransact;
import com.czg.mergedata.cur.entity.CurShopVendorTransactPay;
import com.czg.mergedata.cur.mapper.CurShopVendorTransactMapper;
import com.czg.mergedata.cur.mapper.CurShopVendorTransactPayMapper;
import com.czg.mergedata.cur.service.CurShopVendorTransactPayService;
import com.czg.mergedata.cur.service.CurShopVendorTransactService;
import com.czg.mergedata.old.entity.OldShopPurveyor;
import com.czg.mergedata.old.entity.OldShopPurveyorTransact;
import com.czg.mergedata.old.entity.OldShopPurveyorTransactPay;
@ -37,9 +39,15 @@ public class CurShopVendorServiceImpl extends ServiceImpl<CurShopVendorMapper, C
@Resource
private CurShopVendorTransactMapper curShopVendorTransactMapper;
@Resource
private CurShopVendorTransactService curShopVendorTransactService;
@Resource
private CurShopVendorTransactPayMapper curShopVendorTransactPayMapper;
@Resource
private CurShopVendorTransactPayService curShopVendorTransactPayService;
@Resource
private OldShopPurveyorService oldShopPurveyorService;
@ -104,7 +112,7 @@ public class CurShopVendorServiceImpl extends ServiceImpl<CurShopVendorMapper, C
curShopVendorTransacts.add(curShopVendorTransact);
}
curShopVendorTransactMapper.insertBatch(curShopVendorTransacts);
curShopVendorTransactService.saveBatch(curShopVendorTransacts);
}
private void execVendorTransactPay() {
@ -118,6 +126,6 @@ public class CurShopVendorServiceImpl extends ServiceImpl<CurShopVendorMapper, C
curShopVendorTransactPays.add(curShopVendorTransactPay);
}
curShopVendorTransactPayMapper.insertBatch(curShopVendorTransactPays);
curShopVendorTransactPayService.saveBatch(curShopVendorTransactPays);
}
}

6
src/main/java/com/czg/mergedata/cur/service/impl/CurSysUserServiceImpl.java
View File

@ -14,6 +14,7 @@ import com.czg.mergedata.cur.mapper.CurStaffIdRelationMapper;
import com.czg.mergedata.cur.mapper.CurSysUserMapper;
import com.czg.mergedata.cur.service.CurShopInfoService;
import com.czg.mergedata.cur.service.CurShopStaffService;
import com.czg.mergedata.cur.service.CurStaffIdRelationService;
import com.czg.mergedata.cur.service.CurSysUserService;
import com.czg.mergedata.old.entity.OldMerchantAccount;
import com.czg.mergedata.old.entity.OldPlussShopStaff;
@ -60,6 +61,9 @@ public class CurSysUserServiceImpl extends ServiceImpl<CurSysUserMapper, CurSysU
@Resource
private CurStaffIdRelationMapper curStaffIdRelationMapper;
@Resource
private CurStaffIdRelationService curStaffIdRelationService;
@Resource
private OldMerchantAccountService oldMerchantAccountService;
@ -248,7 +252,7 @@ public class CurSysUserServiceImpl extends ServiceImpl<CurSysUserMapper, CurSysU
}
updateBatch(curSysUsers);
curStaffIdRelationMapper.insertBatch(staffIdRelations);
curStaffIdRelationService.saveBatch(staffIdRelations);
}
private CurSysUser getUserByOldSysUser(OldSysUser oldSysUser, Long userId) {