diff --git a/service/src/main/java/cn/qihangerp/module/mapper/OLogisticsCompanyMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OLogisticsCompanyMapper.java similarity index 91% rename from service/src/main/java/cn/qihangerp/module/mapper/OLogisticsCompanyMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OLogisticsCompanyMapper.java index cec0eadf..7c03fb74 100644 --- a/service/src/main/java/cn/qihangerp/module/mapper/OLogisticsCompanyMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OLogisticsCompanyMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OLogisticsCompany; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service/src/main/java/cn/qihangerp/module/mapper/OShopMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OShopMapper.java similarity index 90% rename from service/src/main/java/cn/qihangerp/module/mapper/OShopMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OShopMapper.java index 2cbf73a8..1823e8ad 100644 --- a/service/src/main/java/cn/qihangerp/module/mapper/OShopMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OShopMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OShop; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service/src/main/java/cn/qihangerp/module/mapper/OShopPlatformMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OShopPlatformMapper.java similarity index 91% rename from service/src/main/java/cn/qihangerp/module/mapper/OShopPlatformMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OShopPlatformMapper.java index 00e98bf5..6fbfeb4b 100644 --- a/service/src/main/java/cn/qihangerp/module/mapper/OShopPlatformMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OShopPlatformMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OShopPlatform; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service/src/main/java/cn/qihangerp/module/mapper/OShopPullLasttimeMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OShopPullLasttimeMapper.java similarity index 91% rename from service/src/main/java/cn/qihangerp/module/mapper/OShopPullLasttimeMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OShopPullLasttimeMapper.java index d09d4b7a..4c8f7447 100644 --- a/service/src/main/java/cn/qihangerp/module/mapper/OShopPullLasttimeMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OShopPullLasttimeMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OShopPullLasttime; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service/src/main/java/cn/qihangerp/module/mapper/OShopPullLogsMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OShopPullLogsMapper.java similarity index 91% rename from service/src/main/java/cn/qihangerp/module/mapper/OShopPullLogsMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OShopPullLogsMapper.java index a79e14f1..eabd0488 100644 --- a/service/src/main/java/cn/qihangerp/module/mapper/OShopPullLogsMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OShopPullLogsMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OShopPullLogs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service/src/main/java/cn/qihangerp/module/mapper/SysTaskLogsMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/SysTaskLogsMapper.java similarity index 90% rename from service/src/main/java/cn/qihangerp/module/mapper/SysTaskLogsMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/SysTaskLogsMapper.java index e88d339b..dd3e5eb6 100644 --- a/service/src/main/java/cn/qihangerp/module/mapper/SysTaskLogsMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/SysTaskLogsMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.SysTaskLogs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service/src/main/java/cn/qihangerp/module/mapper/SysTaskMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/SysTaskMapper.java similarity index 90% rename from service/src/main/java/cn/qihangerp/module/mapper/SysTaskMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/SysTaskMapper.java index c971cc52..8e38214c 100644 --- a/service/src/main/java/cn/qihangerp/module/mapper/SysTaskMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/SysTaskMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.SysTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service/src/main/resources/mapper/OLogisticsCompanyMapper.xml b/mapper/src/main/resources/mapper/OLogisticsCompanyMapper.xml similarity index 92% rename from service/src/main/resources/mapper/OLogisticsCompanyMapper.xml rename to mapper/src/main/resources/mapper/OLogisticsCompanyMapper.xml index 21af5b21..0ddfea61 100644 --- a/service/src/main/resources/mapper/OLogisticsCompanyMapper.xml +++ b/mapper/src/main/resources/mapper/OLogisticsCompanyMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/service/src/main/resources/mapper/OShopMapper.xml b/mapper/src/main/resources/mapper/OShopMapper.xml similarity index 97% rename from service/src/main/resources/mapper/OShopMapper.xml rename to mapper/src/main/resources/mapper/OShopMapper.xml index 2d8ec093..36315c2d 100644 --- a/service/src/main/resources/mapper/OShopMapper.xml +++ b/mapper/src/main/resources/mapper/OShopMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/service/src/main/resources/mapper/OShopPlatformMapper.xml b/mapper/src/main/resources/mapper/OShopPlatformMapper.xml similarity index 93% rename from service/src/main/resources/mapper/OShopPlatformMapper.xml rename to mapper/src/main/resources/mapper/OShopPlatformMapper.xml index 811f8eef..fa1a64a2 100644 --- a/service/src/main/resources/mapper/OShopPlatformMapper.xml +++ b/mapper/src/main/resources/mapper/OShopPlatformMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/service/src/main/resources/mapper/OShopPullLasttimeMapper.xml b/mapper/src/main/resources/mapper/OShopPullLasttimeMapper.xml similarity index 92% rename from service/src/main/resources/mapper/OShopPullLasttimeMapper.xml rename to mapper/src/main/resources/mapper/OShopPullLasttimeMapper.xml index 306ed8f2..1217439e 100644 --- a/service/src/main/resources/mapper/OShopPullLasttimeMapper.xml +++ b/mapper/src/main/resources/mapper/OShopPullLasttimeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/service/src/main/resources/mapper/OShopPullLogsMapper.xml b/mapper/src/main/resources/mapper/OShopPullLogsMapper.xml similarity index 94% rename from service/src/main/resources/mapper/OShopPullLogsMapper.xml rename to mapper/src/main/resources/mapper/OShopPullLogsMapper.xml index e7228fab..b9e241a9 100644 --- a/service/src/main/resources/mapper/OShopPullLogsMapper.xml +++ b/mapper/src/main/resources/mapper/OShopPullLogsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/service/src/main/resources/mapper/SysTaskLogsMapper.xml b/mapper/src/main/resources/mapper/SysTaskLogsMapper.xml similarity index 93% rename from service/src/main/resources/mapper/SysTaskLogsMapper.xml rename to mapper/src/main/resources/mapper/SysTaskLogsMapper.xml index c8e527b9..966480ad 100644 --- a/service/src/main/resources/mapper/SysTaskLogsMapper.xml +++ b/mapper/src/main/resources/mapper/SysTaskLogsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/service/src/main/resources/mapper/SysTaskMapper.xml b/mapper/src/main/resources/mapper/SysTaskMapper.xml similarity index 93% rename from service/src/main/resources/mapper/SysTaskMapper.xml rename to mapper/src/main/resources/mapper/SysTaskMapper.xml index 25c5fa84..31d6d1fb 100644 --- a/service/src/main/resources/mapper/SysTaskMapper.xml +++ b/mapper/src/main/resources/mapper/SysTaskMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/service/pom.xml b/service/pom.xml index cf31e5af..7a6bf4fd 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -22,6 +22,11 @@ interfaces 2.0.0 + + cn.qihangerp.mapper + mapper + 2.0.0 + diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/OLogisticsCompanyServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OLogisticsCompanyServiceImpl.java index d0432dd0..fdaacf83 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/OLogisticsCompanyServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OLogisticsCompanyServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.OLogisticsCompany; -import cn.qihangerp.module.mapper.OLogisticsCompanyMapper; +import cn.qihangerp.mapper.OLogisticsCompanyMapper; import cn.qihangerp.module.service.OLogisticsCompanyService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/OShopPlatformServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OShopPlatformServiceImpl.java index 3c4fa78a..657be85b 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/OShopPlatformServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OShopPlatformServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.OShopPlatform; -import cn.qihangerp.module.mapper.OShopPlatformMapper; +import cn.qihangerp.mapper.OShopPlatformMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.module.service.OShopPlatformService; diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/OShopPullLasttimeServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OShopPullLasttimeServiceImpl.java index efa880af..45b3d439 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/OShopPullLasttimeServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OShopPullLasttimeServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.OShopPullLasttime; -import cn.qihangerp.module.mapper.OShopPullLasttimeMapper; +import cn.qihangerp.mapper.OShopPullLasttimeMapper; import cn.qihangerp.module.service.OShopPullLasttimeService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/OShopPullLogsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OShopPullLogsServiceImpl.java index 6184117f..7bd4b43f 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/OShopPullLogsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OShopPullLogsServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.OShopPullLogs; -import cn.qihangerp.module.mapper.OShopPullLogsMapper; +import cn.qihangerp.mapper.OShopPullLogsMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/OShopServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OShopServiceImpl.java index 9190b822..3159ed4a 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/OShopServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OShopServiceImpl.java @@ -2,7 +2,7 @@ package cn.qihangerp.module.service.impl; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.model.entity.OShop; -import cn.qihangerp.module.mapper.OShopMapper; +import cn.qihangerp.mapper.OShopMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.module.service.OShopService; diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/SysTaskLogsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/SysTaskLogsServiceImpl.java index e8f56bd8..5ad08d3d 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/SysTaskLogsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/SysTaskLogsServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.SysTaskLogs; -import cn.qihangerp.module.mapper.SysTaskLogsMapper; +import cn.qihangerp.mapper.SysTaskLogsMapper; import cn.qihangerp.module.service.SysTaskLogsService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/SysTaskServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/SysTaskServiceImpl.java index 16538b1f..fa65028c 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/SysTaskServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/SysTaskServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.SysTask; -import cn.qihangerp.module.mapper.SysTaskMapper; +import cn.qihangerp.mapper.SysTaskMapper; import cn.qihangerp.module.service.SysTaskService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java index 1a26d89e..50ab0ddc 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java @@ -5,8 +5,8 @@ import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.entity.OLogisticsCompany; import cn.qihangerp.model.entity.OShop; -import cn.qihangerp.module.mapper.OLogisticsCompanyMapper; -import cn.qihangerp.module.mapper.OShopMapper; +import cn.qihangerp.mapper.OLogisticsCompanyMapper; +import cn.qihangerp.mapper.OShopMapper; import cn.qihangerp.model.entity.OShipment; import cn.qihangerp.model.entity.OShipmentItem; import cn.qihangerp.model.bo.OrderShipBo; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java index f4019d98..ee2ad8e6 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java @@ -5,7 +5,7 @@ import cn.qihangerp.model.request.OrderSearchRequest; import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper; -import cn.qihangerp.module.mapper.OLogisticsCompanyMapper; +import cn.qihangerp.mapper.OLogisticsCompanyMapper; import cn.qihangerp.model.bo.OrderAllocateShipRequest; import cn.qihangerp.model.bo.OrderShipRequest; import cn.qihangerp.model.vo.OrderDiscountVo; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java index 25821d28..77e5dcfc 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java @@ -8,7 +8,7 @@ import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.mapper.ErpStockOutItemMapper; import cn.qihangerp.mapper.ErpStockOutMapper; import cn.qihangerp.model.entity.*; -import cn.qihangerp.module.mapper.OLogisticsCompanyMapper; +import cn.qihangerp.mapper.OLogisticsCompanyMapper; import cn.qihangerp.model.entity.OOrderShipListItem; import cn.qihangerp.model.bo.ShipStockUpBo; import cn.qihangerp.model.bo.SupplierOrderShipBo;