diff --git a/README.md b/README.md index e4d29615..cd69eee8 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ > **项目持续更新中,还有很多不足,请多包含!如有任何疑问请提交issuse!谢谢! 💪✨🏆** ## 一、系统介绍 -启航电商ERP系统2.0版本是一个完整开箱即用的开源电商ERP系统,经历1.0版本的迭代优化和客户使用验证。开发者可以直接部署即可使用。 +启航电商ERP系统3.0版本在原版本基础上新增自动任务拉取订单、订单自动导入订单库等重大升级,进一步提升了开箱即用的特性。 启航电商ERP系统逐步演变成了一个完整的ERP,主体功能包括:采购管理、商品管理、店铺商品管理、订单库、店铺订单管理、发货管理(手动发货、电子面单发货、供应商发货)、售后管理、库存管理等。 diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseLogisticsController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseLogisticsController.java index 787dad4f..d85a02f2 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseLogisticsController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseLogisticsController.java @@ -2,7 +2,7 @@ package cn.qihangerp.erp.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.erp.domain.ErpLogistics; +import cn.qihangerp.model.entity.ErpLogistics; import cn.qihangerp.module.erp.service.ErpLogisticsService; import cn.qihangerp.security.common.BaseController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/bo/DouOrderConfirmBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/DouOrderConfirmBo.java similarity index 92% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/bo/DouOrderConfirmBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/DouOrderConfirmBo.java index 8692828e..21d2da38 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/bo/DouOrderConfirmBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/DouOrderConfirmBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.dou.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/domain/ErpLogistics.java b/core/model/src/main/java/cn/qihangerp/model/entity/ErpLogistics.java similarity index 87% rename from serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/domain/ErpLogistics.java rename to core/model/src/main/java/cn/qihangerp/model/entity/ErpLogistics.java index 0a2b7ba7..c8edc5c1 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/domain/ErpLogistics.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/ErpLogistics.java @@ -1,7 +1,6 @@ -package cn.qihangerp.module.erp.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java index 9b017b82..7ca20d87 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java @@ -1,7 +1,7 @@ package cn.qihangerp.api.dou.controller; -import cn.qihangerp.module.open.dou.bo.DouOrderConfirmBo; +import cn.qihangerp.model.bo.DouOrderConfirmBo; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java index 08debbda..f729ea27 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java +++ b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java @@ -5,7 +5,7 @@ import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.entity.DouOrder; import cn.qihangerp.model.bo.DouOrderBo; -import cn.qihangerp.module.open.dou.bo.DouOrderConfirmBo; +import cn.qihangerp.model.bo.DouOrderConfirmBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java index c66517ba..bc47fbcc 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java +++ b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java @@ -8,14 +8,13 @@ import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.model.entity.*; import cn.qihangerp.model.bo.DouOrderBo; -import cn.qihangerp.module.open.dou.bo.DouOrderConfirmBo; +import cn.qihangerp.model.bo.DouOrderConfirmBo; import cn.qihangerp.module.open.dou.mapper.*; import cn.qihangerp.module.open.dou.service.DouOrderService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; -import lombok.extern.java.Log; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.java b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.java index c1d2bf56..7ba05c75 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.java +++ b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.erp.mapper; -import cn.qihangerp.module.erp.domain.ErpLogistics; +import cn.qihangerp.model.entity.ErpLogistics; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author 1 * @description 针对表【erp_logistics(采购物流公司表)】的数据库操作Mapper * @createDate 2025-12-30 08:20:08 -* @Entity cn.qihangerp.module.erp.domain.ErpLogistics +* @Entity cn.qihangerp.model.entity.ErpLogistics */ public interface ErpLogisticsMapper extends BaseMapper { diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpLogisticsService.java b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpLogisticsService.java index bb714ebb..f38d1b14 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpLogisticsService.java +++ b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpLogisticsService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.erp.service; -import cn.qihangerp.module.erp.domain.ErpLogistics; +import cn.qihangerp.model.entity.ErpLogistics; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpLogisticsServiceImpl.java b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpLogisticsServiceImpl.java index 318000b8..6e4c757d 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpLogisticsServiceImpl.java +++ b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpLogisticsServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.erp.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.module.erp.domain.ErpLogistics; +import cn.qihangerp.model.entity.ErpLogistics; import cn.qihangerp.module.erp.service.ErpLogisticsService; import cn.qihangerp.module.erp.mapper.ErpLogisticsMapper; import org.springframework.stereotype.Service; diff --git a/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.xml b/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.xml index 74fde7e2..d6af9893 100644 --- a/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.xml +++ b/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +