优化精简项目结构

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;

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;

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;

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;

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;

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;

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;

mapper/src/main/resources/mapper/OLogisticsCompanyMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.mapper.OLogisticsCompanyMapper">
+<mapper namespace="cn.qihangerp.mapper.OLogisticsCompanyMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OLogisticsCompany">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/OShopMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.mapper.OShopMapper">
+<mapper namespace="cn.qihangerp.mapper.OShopMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OShop">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/OShopPlatformMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.mapper.OShopPlatformMapper">
+<mapper namespace="cn.qihangerp.mapper.OShopPlatformMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OShopPlatform">
             <id property="id" column="id" jdbcType="INTEGER"/>

mapper/src/main/resources/mapper/OShopPullLasttimeMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.mapper.OShopPullLasttimeMapper">
+<mapper namespace="cn.qihangerp.mapper.OShopPullLasttimeMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OShopPullLasttime">
             <id property="id" column="id" jdbcType="INTEGER"/>

mapper/src/main/resources/mapper/OShopPullLogsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.mapper.OShopPullLogsMapper">
+<mapper namespace="cn.qihangerp.mapper.OShopPullLogsMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OShopPullLogs">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/SysTaskLogsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.mapper.SysTaskLogsMapper">
+<mapper namespace="cn.qihangerp.mapper.SysTaskLogsMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.SysTaskLogs">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/SysTaskMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.mapper.SysTaskMapper">
+<mapper namespace="cn.qihangerp.mapper.SysTaskMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.SysTask">
             <id property="id" column="id" jdbcType="INTEGER"/>

service/pom.xml

@@ -22,6 +22,11 @@
             <artifactId>interfaces</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>cn.qihangerp.mapper</groupId>
+            <artifactId>mapper</artifactId>
+            <version>2.0.0</version>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>cn.qihangerp.core</groupId>-->
 <!--            <artifactId>common</artifactId>-->

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;

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;
 

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;

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;

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;

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;

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;

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.mapper.OLogisticsCompanyMapper;
-import cn.qihangerp.module.mapper.OShopMapper;
+import cn.qihangerp.mapper.OShopMapper;
 import cn.qihangerp.model.entity.OShipment;
 import cn.qihangerp.model.entity.OShipmentItem;
 import cn.qihangerp.model.bo.OrderShipBo;

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;

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;