diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java index 7bc0fa6d..a0b20802 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java @@ -4,9 +4,7 @@ import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.domain.OLogisticsCompany; -import cn.qihangerp.domain.OShop; -import cn.qihangerp.domain.OShopPlatform; +import cn.qihangerp.model.entity.OLogisticsCompany; import cn.qihangerp.module.service.OLogisticsCompanyService; import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java index 9a633ed0..ea1cb1ce 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java @@ -1,10 +1,9 @@ package cn.qihangerp.oms.controller; -import cn.qihangerp.domain.OLogisticsCompany; -import cn.qihangerp.domain.OShopPlatform; +import cn.qihangerp.model.entity.OShop; +import cn.qihangerp.model.entity.OShopPlatform; import cn.qihangerp.module.service.OLogisticsCompanyService; import cn.qihangerp.module.service.OShopPlatformService; -import cn.qihangerp.domain.OShop; import cn.qihangerp.module.service.OShopService; import cn.qihangerp.oms.request.ShopBo; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopPullLogsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopPullLogsController.java index fa32a0e7..5b48bd95 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopPullLogsController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopPullLogsController.java @@ -2,10 +2,7 @@ package cn.qihangerp.oms.controller; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.TableDataInfo; - -import cn.qihangerp.domain.OShopPullLogs; - - +import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; diff --git a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictDataController.java b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictDataController.java index 390af1a5..e782722c 100644 --- a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictDataController.java +++ b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictDataController.java @@ -1,15 +1,12 @@ package cn.qihangerp.sys.controller; - - import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.utils.StringUtils; -import cn.qihangerp.domain.SysDictData; +import cn.qihangerp.model.entity.SysDictData; import cn.qihangerp.module.service.ISysDictDataService; import cn.qihangerp.module.service.ISysDictTypeService; import cn.qihangerp.security.common.BaseController; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; diff --git a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysLoginController.java b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysLoginController.java index f116055f..07609659 100644 --- a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysLoginController.java +++ b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysLoginController.java @@ -1,25 +1,19 @@ package cn.qihangerp.sys.controller; - -import cn.qihangerp.domain.SysUser; +import cn.qihangerp.model.entity.SysUser; import cn.qihangerp.module.domain.LoginBody; import cn.qihangerp.module.domain.SysMenu; import cn.qihangerp.module.service.ISysMenuService; import cn.qihangerp.module.service.SysPermissionService; import cn.qihangerp.security.common.Constants; - - import cn.qihangerp.common.AjaxResult; import cn.qihangerp.security.common.SecurityUtils; import cn.qihangerp.security.service.SysLoginService; - - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; - import java.util.List; import java.util.Set; diff --git a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysRoleController.java b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysRoleController.java index 611b9850..2295c2f2 100644 --- a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysRoleController.java +++ b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysRoleController.java @@ -1,9 +1,10 @@ package cn.qihangerp.sys.controller; + import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.utils.StringUtils; -import cn.qihangerp.domain.SysRole; -import cn.qihangerp.domain.SysUser; +import cn.qihangerp.model.entity.SysRole; +import cn.qihangerp.model.entity.SysUser; import cn.qihangerp.module.domain.SysDept; import cn.qihangerp.module.domain.SysUserRole; import cn.qihangerp.module.service.ISysDeptService; diff --git a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysTaskController.java b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysTaskController.java index 26f4e0be..cb7dc2fd 100644 --- a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysTaskController.java +++ b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysTaskController.java @@ -1,11 +1,10 @@ package cn.qihangerp.sys.controller; - import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.domain.SysTask; +import cn.qihangerp.model.entity.SysTask; import cn.qihangerp.module.service.SysTaskService; import cn.qihangerp.module.service.SysTaskLogsService; import cn.qihangerp.security.common.BaseController; diff --git a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysUserController.java b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysUserController.java index bcc84873..a2d84608 100644 --- a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysUserController.java +++ b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysUserController.java @@ -1,13 +1,10 @@ package cn.qihangerp.sys.controller; - import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.utils.StringUtils; -import cn.qihangerp.domain.SysUser; +import cn.qihangerp.model.entity.SysUser; import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.SecurityUtils; - - import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.service.ISysUserService; import org.apache.commons.lang3.ArrayUtils; diff --git a/core/model/pom.xml b/core/model/pom.xml index d328b364..1311b233 100644 --- a/core/model/pom.xml +++ b/core/model/pom.xml @@ -18,6 +18,11 @@ UTF-8 + + cn.qihangerp.core + common + 1.0 + org.apache.commons commons-lang3 diff --git a/core/common/src/main/java/cn/qihangerp/common/DictUtils.java b/core/model/src/main/java/cn/qihangerp/model/DictUtils.java similarity index 98% rename from core/common/src/main/java/cn/qihangerp/common/DictUtils.java rename to core/model/src/main/java/cn/qihangerp/model/DictUtils.java index 1e750b93..c16b372f 100644 --- a/core/common/src/main/java/cn/qihangerp/common/DictUtils.java +++ b/core/model/src/main/java/cn/qihangerp/model/DictUtils.java @@ -1,7 +1,6 @@ -package cn.qihangerp.common; +package cn.qihangerp.model; - -import cn.qihangerp.domain.SysDictData; +import cn.qihangerp.model.entity.SysDictData; import com.alibaba.fastjson2.JSONArray; import cn.qihangerp.common.config.RedisCache; import cn.qihangerp.common.constant.CacheConstants; diff --git a/core/security/src/main/java/cn/qihangerp/security/LoginUser.java b/core/security/src/main/java/cn/qihangerp/security/LoginUser.java index 637171a9..615a55ee 100644 --- a/core/security/src/main/java/cn/qihangerp/security/LoginUser.java +++ b/core/security/src/main/java/cn/qihangerp/security/LoginUser.java @@ -1,6 +1,6 @@ package cn.qihangerp.security; -import cn.qihangerp.domain.SysUser; +import cn.qihangerp.model.entity.SysUser; import com.alibaba.fastjson2.annotation.JSONField; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/core/security/src/main/java/cn/qihangerp/security/UserDetailsServiceImpl.java b/core/security/src/main/java/cn/qihangerp/security/UserDetailsServiceImpl.java index d86add88..9e8425a4 100644 --- a/core/security/src/main/java/cn/qihangerp/security/UserDetailsServiceImpl.java +++ b/core/security/src/main/java/cn/qihangerp/security/UserDetailsServiceImpl.java @@ -1,14 +1,11 @@ package cn.qihangerp.security; - import cn.qihangerp.common.ServiceException; import cn.qihangerp.common.enums.UserStatus; import cn.qihangerp.common.utils.MessageUtils; import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.model.entity.SysUser; import cn.qihangerp.service.ISysUserService; - - -import cn.qihangerp.domain.SysUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/security/src/main/java/cn/qihangerp/security/service/SysLoginService.java b/core/security/src/main/java/cn/qihangerp/security/service/SysLoginService.java index 7a5e56c9..19a0727c 100644 --- a/core/security/src/main/java/cn/qihangerp/security/service/SysLoginService.java +++ b/core/security/src/main/java/cn/qihangerp/security/service/SysLoginService.java @@ -11,12 +11,12 @@ import cn.qihangerp.common.exception.CaptchaExpireException; import cn.qihangerp.common.exception.UserNotExistsException; import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.common.utils.StringUtils; +import cn.qihangerp.model.entity.SysUser; import cn.qihangerp.module.service.SysConfigService; import cn.qihangerp.security.AuthenticationContextHolder; import cn.qihangerp.security.LoginUser; import cn.qihangerp.security.TokenService; import cn.qihangerp.security.UserPasswordNotMatchException; -import cn.qihangerp.domain.SysUser; import cn.qihangerp.security.utils.IpUtils; import cn.qihangerp.service.ISysUserService; import jakarta.annotation.Resource; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java index 37ada00f..a7fa3803 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java @@ -5,7 +5,7 @@ import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; -import cn.qihangerp.domain.OShopPlatform; +import cn.qihangerp.model.entity.OShopPlatform; import cn.qihangerp.module.service.OShopService; import cn.qihangerp.open.common.ApiResultVo; import cn.qihangerp.sdk.dou.DouTokenApiHelper; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java index c087e7c6..03fb6d99 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java @@ -5,8 +5,8 @@ import cn.qihangerp.api.dou.DouApiCommon; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; -import cn.qihangerp.domain.OShopPullLasttime; -import cn.qihangerp.domain.OShopPullLogs; +import cn.qihangerp.model.entity.OShopPullLasttime; +import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.module.open.dou.domain.DouGoods; import cn.qihangerp.module.open.dou.domain.DouGoodsSku; import cn.qihangerp.module.open.dou.service.DouGoodsService; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java index b90806de..f9b45efa 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java @@ -2,7 +2,7 @@ package cn.qihangerp.api.dou.controller; import cn.qihangerp.common.*; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.open.dou.domain.DouGoods; import cn.qihangerp.module.open.dou.domain.DouGoodsSku; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java index 46c13e8f..c3e10340 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java @@ -9,8 +9,8 @@ import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.domain.OShopPullLasttime; -import cn.qihangerp.domain.OShopPullLogs; +import cn.qihangerp.model.entity.OShopPullLasttime; +import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.module.open.dou.domain.DouOrder; import cn.qihangerp.module.open.dou.domain.DouOrderItem; import cn.qihangerp.module.open.dou.service.DouOrderService; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java index 2cc9c539..18d9a95e 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java @@ -8,8 +8,8 @@ import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.domain.OShopPullLasttime; -import cn.qihangerp.domain.OShopPullLogs; +import cn.qihangerp.model.entity.OShopPullLasttime; +import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.module.open.dou.domain.DouRefund; import cn.qihangerp.module.open.dou.service.DouRefundService; import cn.qihangerp.module.service.OShopPullLasttimeService; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java index 8f1fdba3..e5c9f827 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java @@ -5,7 +5,7 @@ import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; -import cn.qihangerp.domain.OShopPlatform; +import cn.qihangerp.model.entity.OShopPlatform; import cn.qihangerp.module.service.OShopService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java index d0f91a4b..13c069ac 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java @@ -5,8 +5,8 @@ import cn.qihangerp.api.jd.JdApiCommon; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; -import cn.qihangerp.domain.OShopPullLasttime; -import cn.qihangerp.domain.OShopPullLogs; +import cn.qihangerp.model.entity.OShopPullLasttime; +import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.module.open.jd.domain.JdGoodsSku; import cn.qihangerp.module.open.jd.service.JdGoodsService; import cn.qihangerp.module.service.OShopPullLasttimeService; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java index 39dd8e1f..cfefd670 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java @@ -2,7 +2,7 @@ package cn.qihangerp.api.jd.controller; import cn.qihangerp.common.*; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.open.jd.domain.JdGoods; import cn.qihangerp.module.open.jd.domain.JdGoodsSku; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java index 47ed9035..3182aee7 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java @@ -1,7 +1,7 @@ package cn.qihangerp.api.jd.controller; import cn.qihangerp.common.AjaxResult; -import cn.qihangerp.domain.OShopPlatform; +import cn.qihangerp.model.entity.OShopPlatform; import cn.qihangerp.module.open.jd.domain.bo.JdTokenCreateBo; import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java index 07dd5bba..154e3e3f 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java @@ -11,8 +11,8 @@ import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.utils.DateUtils; -import cn.qihangerp.domain.OShopPullLasttime; -import cn.qihangerp.domain.OShopPullLogs; +import cn.qihangerp.model.entity.OShopPullLasttime; +import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.module.open.jd.domain.JdRefund; import cn.qihangerp.module.open.jd.service.JdRefundService; import cn.qihangerp.module.service.OShopPullLasttimeService; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java index 227f2774..c2d43b43 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java @@ -9,8 +9,8 @@ import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.domain.OShopPullLasttime; -import cn.qihangerp.domain.OShopPullLogs; +import cn.qihangerp.model.entity.OShopPullLasttime; +import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.module.open.jd.domain.JdOrder; import cn.qihangerp.module.open.jd.domain.JdOrderItem; import cn.qihangerp.module.open.jd.service.JdOrderService; diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineOrderController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineOrderController.java index bd406881..f51df507 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineOrderController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineOrderController.java @@ -1,6 +1,5 @@ package cn.qihangerp.api.order.controller; - import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.TableDataInfo; @@ -8,10 +7,10 @@ import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; +import cn.qihangerp.model.request.OrderSearchRequest; import cn.qihangerp.module.order.domain.bo.OfflineOrderCreateBo; import cn.qihangerp.module.order.domain.bo.OfflineOrderPushBo; import cn.qihangerp.module.order.service.OfflineOrderService; -import cn.qihangerp.request.OrderSearchRequest; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineRefundController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineRefundController.java index c96e4aef..a70d4198 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineRefundController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineRefundController.java @@ -1,10 +1,9 @@ package cn.qihangerp.api.order.controller; - import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.TableDataInfo; +import cn.qihangerp.model.request.RefundSearchRequest; import cn.qihangerp.module.order.service.OfflineRefundService; -import cn.qihangerp.request.RefundSearchRequest; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java index 22d1e11a..53a82ff5 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java @@ -1,14 +1,13 @@ package cn.qihangerp.api.order.controller; - import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.TableDataInfo; +import cn.qihangerp.model.request.OrderSearchRequest; import cn.qihangerp.module.order.domain.bo.OrderAllocateShipRequest; import cn.qihangerp.module.order.domain.bo.OrderShipRequest; import cn.qihangerp.module.order.service.OOrderItemService; import cn.qihangerp.module.order.service.OOrderService; -import cn.qihangerp.request.OrderSearchRequest; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java index d32d63fa..e914883c 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java @@ -5,7 +5,7 @@ import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; -import cn.qihangerp.domain.OShopPlatform; +import cn.qihangerp.model.entity.OShopPlatform; import cn.qihangerp.module.service.OShopService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java index c93e58c1..6fdb21a1 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java @@ -5,8 +5,8 @@ import cn.qihangerp.api.pdd.PddApiCommon; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; -import cn.qihangerp.domain.OShopPullLasttime; -import cn.qihangerp.domain.OShopPullLogs; +import cn.qihangerp.model.entity.OShopPullLasttime; +import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.module.open.pdd.domain.PddGoods; import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; import cn.qihangerp.module.open.pdd.service.PddGoodsService; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java index 8045aedf..21a95d2f 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java @@ -2,7 +2,7 @@ package cn.qihangerp.api.pdd.controller; import cn.qihangerp.common.*; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.open.pdd.domain.PddGoods; import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOAuthController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOAuthController.java index 86e03698..5814d322 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOAuthController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOAuthController.java @@ -5,7 +5,7 @@ package cn.qihangerp.api.pdd.controller; import cn.qihangerp.api.pdd.PddTokenCreateBo; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.enums.EnumShopType; -import cn.qihangerp.domain.OShopPlatform; +import cn.qihangerp.model.entity.OShopPlatform; import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; import cn.qihangerp.open.common.ApiResultVo; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java index 095ca929..f3405ea9 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java @@ -9,8 +9,8 @@ import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.domain.OShopPullLasttime; -import cn.qihangerp.domain.OShopPullLogs; +import cn.qihangerp.model.entity.OShopPullLasttime; +import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.module.open.pdd.domain.PddOrder; import cn.qihangerp.module.open.pdd.domain.PddOrderItem; import cn.qihangerp.module.open.pdd.service.PddOrderService; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java index a384c696..4296add5 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java @@ -9,8 +9,8 @@ import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.domain.OShopPullLasttime; -import cn.qihangerp.domain.OShopPullLogs; +import cn.qihangerp.model.entity.OShopPullLasttime; +import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.module.open.pdd.domain.PddRefund; import cn.qihangerp.module.open.pdd.service.PddRefundService; import cn.qihangerp.module.service.OShopPullLasttimeService; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java index e9836654..c858d171 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java @@ -5,7 +5,7 @@ import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; -import cn.qihangerp.domain.OShopPlatform; +import cn.qihangerp.model.entity.OShopPlatform; import cn.qihangerp.module.service.OShopService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java index 79b762fb..59fa2ad3 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java @@ -10,8 +10,8 @@ import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.common.utils.StringUtils; -import cn.qihangerp.domain.OShopPullLasttime; -import cn.qihangerp.domain.OShopPullLogs; +import cn.qihangerp.model.entity.OShopPullLasttime; +import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.module.open.tao.domain.TaoGoods; import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; import cn.qihangerp.module.open.tao.service.TaoGoodsService; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java index 84c3545b..2279fea8 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java @@ -2,7 +2,7 @@ package cn.qihangerp.api.tao.controller; import cn.qihangerp.common.*; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.open.tao.domain.TaoGoods; import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java index 6fe044c3..3475d001 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java @@ -2,7 +2,7 @@ package cn.qihangerp.api.tao.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.utils.StringUtils; -import cn.qihangerp.domain.OShopPlatform; +import cn.qihangerp.model.entity.OShopPlatform; import cn.qihangerp.module.open.tao.domain.bo.TaoTokenSaveBo; import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java index fbb51462..abda7c47 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java @@ -11,8 +11,8 @@ import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.domain.OShopPullLasttime; -import cn.qihangerp.domain.OShopPullLogs; +import cn.qihangerp.model.entity.OShopPullLasttime; +import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.module.open.tao.domain.TaoOrder; import cn.qihangerp.module.open.tao.service.TaoOrderService; import cn.qihangerp.module.service.OShopPullLasttimeService; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java index e8c3e571..0b08643c 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java @@ -10,8 +10,8 @@ import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.domain.OShopPullLasttime; -import cn.qihangerp.domain.OShopPullLogs; +import cn.qihangerp.model.entity.OShopPullLasttime; +import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.module.open.tao.domain.TaoRefund; import cn.qihangerp.module.open.tao.service.TaoRefundService; import cn.qihangerp.module.service.OShopPullLasttimeService; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java index 2b708de1..4b587424 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java +++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java @@ -5,7 +5,7 @@ import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; -import cn.qihangerp.domain.OShop; +import cn.qihangerp.model.entity.OShop; import cn.qihangerp.module.service.OShopService; import cn.qihangerp.open.common.ApiResultVo; import cn.qihangerp.open.wei.WeiTokenApiHelper; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiGoodsController.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiGoodsController.java index 238528b8..609b980f 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiGoodsController.java +++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiGoodsController.java @@ -2,7 +2,7 @@ package cn.qihangerp.api.wei.controller; import cn.qihangerp.common.*; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.open.wei.domain.WeiGoods; import cn.qihangerp.module.open.wei.domain.WeiGoodsSku; diff --git a/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java index 889b350e..c2691865 100644 --- a/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java @@ -3,7 +3,7 @@ package cn.qihangerp.module.open.dou.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.open.dou.domain.DouGoodsSku; import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java index e986c682..7d891fa9 100644 --- a/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java @@ -3,7 +3,7 @@ package cn.qihangerp.module.open.dou.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.service.OGoodsService; diff --git a/module/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java b/module/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java index c952c8ff..473ec278 100644 --- a/module/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java +++ b/module/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java @@ -1,7 +1,5 @@ package cn.qihangerp.module.goods.service; - -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.domain.OGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/module/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java b/module/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java index 39d6dd97..98253000 100644 --- a/module/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java +++ b/module/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java @@ -1,7 +1,5 @@ package cn.qihangerp.module.goods.service.impl; - -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.service.OGoodsSkuService; diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java index 3e14c415..ccfbd6ab 100644 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java +++ b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java @@ -3,7 +3,7 @@ package cn.qihangerp.module.open.jd.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.open.jd.domain.JdGoodsSku; import cn.qihangerp.module.open.jd.domain.bo.JdGoodsBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java index cd7e13b2..19e42e95 100644 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java +++ b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.jd.service.impl; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.service.OGoodsService; diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java index 28cb5758..19a0a97a 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java @@ -1,12 +1,11 @@ package cn.qihangerp.module.order.service; - +import cn.qihangerp.model.request.OrderSearchRequest; import cn.qihangerp.module.order.domain.OOrder; import cn.qihangerp.module.order.domain.OOrderItem; import cn.qihangerp.module.order.domain.bo.OrderAllocateShipRequest; import cn.qihangerp.module.order.domain.bo.OrderShipRequest; import cn.qihangerp.module.order.domain.vo.SalesDailyVo; -import cn.qihangerp.request.OrderSearchRequest; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; import cn.qihangerp.common.PageQuery; diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderService.java index ffce6459..f6b02330 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderService.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderService.java @@ -2,14 +2,12 @@ package cn.qihangerp.module.order.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; - +import cn.qihangerp.model.request.OrderSearchRequest; import cn.qihangerp.module.order.domain.OfflineOrder; import cn.qihangerp.module.order.domain.bo.OfflineOrderCreateBo; import cn.qihangerp.module.order.domain.bo.OfflineOrderShipBo; import com.baomidou.mybatisplus.extension.service.IService; -import cn.qihangerp.request.OrderSearchRequest; - /** * @author qilip diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OfflineRefundService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OfflineRefundService.java index 7c8d5f5b..d69a3c81 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OfflineRefundService.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OfflineRefundService.java @@ -2,9 +2,8 @@ package cn.qihangerp.module.order.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; - +import cn.qihangerp.model.request.RefundSearchRequest; import cn.qihangerp.module.order.domain.OfflineRefund; -import cn.qihangerp.request.RefundSearchRequest; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java index 5ad7a8a6..2f2351ef 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.order.service.impl; - -import cn.qihangerp.domain.OLogisticsCompany; +import cn.qihangerp.model.entity.OLogisticsCompany; +import cn.qihangerp.model.request.OrderSearchRequest; import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.domain.OGoodsSupplier; @@ -16,7 +16,6 @@ import cn.qihangerp.module.order.domain.vo.OrderDiscountVo; import cn.qihangerp.module.order.domain.vo.SalesDailyVo; import cn.qihangerp.module.order.mapper.*; import cn.qihangerp.module.order.service.OOrderService; -import cn.qihangerp.request.OrderSearchRequest; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderServiceImpl.java index 6e34f0f6..c7f48a7d 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderServiceImpl.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderServiceImpl.java @@ -1,5 +1,6 @@ package cn.qihangerp.module.order.service.impl; +import cn.qihangerp.model.request.OrderSearchRequest; import cn.qihangerp.module.order.domain.OfflineOrder; import cn.qihangerp.module.order.domain.OfflineOrderItem; import cn.qihangerp.module.order.domain.bo.OfflineOrderCreateBo; @@ -17,9 +18,6 @@ import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; - -import cn.qihangerp.request.OrderSearchRequest; - import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineRefundServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineRefundServiceImpl.java index 4c972499..31a2ba5b 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineRefundServiceImpl.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineRefundServiceImpl.java @@ -2,10 +2,10 @@ package cn.qihangerp.module.order.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; +import cn.qihangerp.model.request.RefundSearchRequest; import cn.qihangerp.module.order.domain.OfflineRefund; import cn.qihangerp.module.order.mapper.OfflineRefundMapper; import cn.qihangerp.module.order.service.OfflineRefundService; -import cn.qihangerp.request.RefundSearchRequest; 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/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java index 09b49fa5..d2ea6b50 100644 --- a/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java +++ b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java @@ -3,7 +3,7 @@ package cn.qihangerp.module.open.pdd.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java index 5844d03d..64882748 100644 --- a/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java +++ b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java @@ -3,7 +3,7 @@ package cn.qihangerp.module.open.pdd.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.service.OGoodsService; diff --git a/module/shop/pom.xml b/module/shop/pom.xml index b49a4afe..e1fcd2ec 100644 --- a/module/shop/pom.xml +++ b/module/shop/pom.xml @@ -20,15 +20,20 @@ - cn.qihangerp.core - common - 1.0 - - - com.baomidou - mybatis-plus-spring-boot3-starter - 3.5.5 - compile + cn.qihangerp.service + interfaces + 1.0.0 + + + + + + + + + + + diff --git a/module/shop/src/main/java/cn/qihangerp/module/mapper/OLogisticsCompanyMapper.java b/module/shop/src/main/java/cn/qihangerp/module/mapper/OLogisticsCompanyMapper.java index 7310f87c..cec0eadf 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/mapper/OLogisticsCompanyMapper.java +++ b/module/shop/src/main/java/cn/qihangerp/module/mapper/OLogisticsCompanyMapper.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.mapper; -import cn.qihangerp.domain.OLogisticsCompany; +import cn.qihangerp.model.entity.OLogisticsCompany; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopMapper.java b/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopMapper.java index f2db8248..2cbf73a8 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopMapper.java +++ b/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopMapper.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.mapper; -import cn.qihangerp.domain.OShop; +import cn.qihangerp.model.entity.OShop; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPlatformMapper.java b/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPlatformMapper.java index 0b36f598..00e98bf5 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPlatformMapper.java +++ b/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPlatformMapper.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.mapper; -import cn.qihangerp.domain.OShopPlatform; +import cn.qihangerp.model.entity.OShopPlatform; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPullLasttimeMapper.java b/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPullLasttimeMapper.java index 0fb2aaae..d09d4b7a 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPullLasttimeMapper.java +++ b/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPullLasttimeMapper.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.mapper; -import cn.qihangerp.domain.OShopPullLasttime; +import cn.qihangerp.model.entity.OShopPullLasttime; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPullLogsMapper.java b/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPullLogsMapper.java index af484638..a79e14f1 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPullLogsMapper.java +++ b/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPullLogsMapper.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.mapper; -import cn.qihangerp.domain.OShopPullLogs; +import cn.qihangerp.model.entity.OShopPullLogs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/module/shop/src/main/java/cn/qihangerp/module/mapper/SysTaskLogsMapper.java b/module/shop/src/main/java/cn/qihangerp/module/mapper/SysTaskLogsMapper.java index 7a60fb45..e88d339b 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/mapper/SysTaskLogsMapper.java +++ b/module/shop/src/main/java/cn/qihangerp/module/mapper/SysTaskLogsMapper.java @@ -1,7 +1,6 @@ package cn.qihangerp.module.mapper; - -import cn.qihangerp.domain.SysTaskLogs; +import cn.qihangerp.model.entity.SysTaskLogs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/module/shop/src/main/java/cn/qihangerp/module/mapper/SysTaskMapper.java b/module/shop/src/main/java/cn/qihangerp/module/mapper/SysTaskMapper.java index c4efa06b..c971cc52 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/mapper/SysTaskMapper.java +++ b/module/shop/src/main/java/cn/qihangerp/module/mapper/SysTaskMapper.java @@ -1,7 +1,6 @@ package cn.qihangerp.module.mapper; - -import cn.qihangerp.domain.SysTask; +import cn.qihangerp.model.entity.SysTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/OLogisticsCompanyService.java b/module/shop/src/main/java/cn/qihangerp/module/service/OLogisticsCompanyService.java index cff29f18..b9761633 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/OLogisticsCompanyService.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/OLogisticsCompanyService.java @@ -2,7 +2,7 @@ package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.domain.OLogisticsCompany; +import cn.qihangerp.model.entity.OLogisticsCompany; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/OShopPlatformService.java b/module/shop/src/main/java/cn/qihangerp/module/service/OShopPlatformService.java index ce9a26b5..54c9c5fb 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/OShopPlatformService.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/OShopPlatformService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.service; -import cn.qihangerp.domain.OShopPlatform; +import cn.qihangerp.model.entity.OShopPlatform; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/OShopPullLasttimeService.java b/module/shop/src/main/java/cn/qihangerp/module/service/OShopPullLasttimeService.java index 2d4e2b42..90d1ee01 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/OShopPullLasttimeService.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/OShopPullLasttimeService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.service; -import cn.qihangerp.domain.OShopPullLasttime; +import cn.qihangerp.model.entity.OShopPullLasttime; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/OShopPullLogsService.java b/module/shop/src/main/java/cn/qihangerp/module/service/OShopPullLogsService.java index 437f4ff8..e80f36a5 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/OShopPullLogsService.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/OShopPullLogsService.java @@ -2,7 +2,7 @@ package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.domain.OShopPullLogs; +import cn.qihangerp.model.entity.OShopPullLogs; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/OShopService.java b/module/shop/src/main/java/cn/qihangerp/module/service/OShopService.java index 510cd6a8..60e21ceb 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/OShopService.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/OShopService.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.service; import cn.qihangerp.common.enums.EnumShopType; -import cn.qihangerp.domain.OShop; +import cn.qihangerp.model.entity.OShop; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/SysTaskLogsService.java b/module/shop/src/main/java/cn/qihangerp/module/service/SysTaskLogsService.java index f1257c01..c21f8047 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/SysTaskLogsService.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/SysTaskLogsService.java @@ -1,9 +1,8 @@ package cn.qihangerp.module.service; - import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.domain.SysTaskLogs; +import cn.qihangerp.model.entity.SysTaskLogs; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/SysTaskService.java b/module/shop/src/main/java/cn/qihangerp/module/service/SysTaskService.java index ab9b6fb8..d4cb89de 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/SysTaskService.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/SysTaskService.java @@ -1,9 +1,8 @@ package cn.qihangerp.module.service; - import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.domain.SysTask; +import cn.qihangerp.model.entity.SysTask; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/impl/OLogisticsCompanyServiceImpl.java b/module/shop/src/main/java/cn/qihangerp/module/service/impl/OLogisticsCompanyServiceImpl.java index 11be31ea..8b5d8374 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/impl/OLogisticsCompanyServiceImpl.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/impl/OLogisticsCompanyServiceImpl.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.service.impl; - +import cn.qihangerp.model.entity.OLogisticsCompany; import cn.qihangerp.module.mapper.OLogisticsCompanyMapper; import cn.qihangerp.module.service.OLogisticsCompanyService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.domain.OLogisticsCompany; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPlatformServiceImpl.java b/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPlatformServiceImpl.java index 813b9c09..3c4fa78a 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPlatformServiceImpl.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPlatformServiceImpl.java @@ -1,8 +1,8 @@ package cn.qihangerp.module.service.impl; +import cn.qihangerp.model.entity.OShopPlatform; import cn.qihangerp.module.mapper.OShopPlatformMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.domain.OShopPlatform; import cn.qihangerp.module.service.OShopPlatformService; import lombok.AllArgsConstructor; diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPullLasttimeServiceImpl.java b/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPullLasttimeServiceImpl.java index 3144cfac..efa880af 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPullLasttimeServiceImpl.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPullLasttimeServiceImpl.java @@ -1,11 +1,10 @@ package cn.qihangerp.module.service.impl; +import cn.qihangerp.model.entity.OShopPullLasttime; import cn.qihangerp.module.mapper.OShopPullLasttimeMapper; import cn.qihangerp.module.service.OShopPullLasttimeService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.domain.OShopPullLasttime; - import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPullLogsServiceImpl.java b/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPullLogsServiceImpl.java index 271bc3d6..6184117f 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPullLogsServiceImpl.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPullLogsServiceImpl.java @@ -1,13 +1,12 @@ package cn.qihangerp.module.service.impl; +import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.module.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; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.domain.OShopPullLogs; - import cn.qihangerp.module.service.OShopPullLogsService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopServiceImpl.java b/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopServiceImpl.java index c70b6dff..3f7c5c3d 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopServiceImpl.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopServiceImpl.java @@ -1,10 +1,10 @@ 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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.domain.OShop; import cn.qihangerp.module.service.OShopService; import lombok.AllArgsConstructor; diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/impl/SysTaskLogsServiceImpl.java b/module/shop/src/main/java/cn/qihangerp/module/service/impl/SysTaskLogsServiceImpl.java index 90022146..e8f56bd8 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/impl/SysTaskLogsServiceImpl.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/impl/SysTaskLogsServiceImpl.java @@ -1,8 +1,6 @@ package cn.qihangerp.module.service.impl; - -import cn.qihangerp.domain.SysTaskLogs; - +import cn.qihangerp.model.entity.SysTaskLogs; import cn.qihangerp.module.mapper.SysTaskLogsMapper; import cn.qihangerp.module.service.SysTaskLogsService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/impl/SysTaskServiceImpl.java b/module/shop/src/main/java/cn/qihangerp/module/service/impl/SysTaskServiceImpl.java index ba5fa225..16538b1f 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/impl/SysTaskServiceImpl.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/impl/SysTaskServiceImpl.java @@ -1,8 +1,6 @@ package cn.qihangerp.module.service.impl; - -import cn.qihangerp.domain.SysTask; - +import cn.qihangerp.model.entity.SysTask; import cn.qihangerp.module.mapper.SysTaskMapper; import cn.qihangerp.module.service.SysTaskService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/module/sys/pom.xml b/module/sys/pom.xml index 5a9df266..3363ec16 100644 --- a/module/sys/pom.xml +++ b/module/sys/pom.xml @@ -20,15 +20,20 @@ - cn.qihangerp.core - common - 1.0 - - - com.baomidou - mybatis-plus-spring-boot3-starter - 3.5.5 - compile + cn.qihangerp.service + interfaces + 1.0.0 + + + + + + + + + + + diff --git a/module/sys/src/main/java/cn/qihangerp/module/domain/SysDept.java b/module/sys/src/main/java/cn/qihangerp/module/domain/SysDept.java index 5699a395..1861c86b 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/domain/SysDept.java +++ b/module/sys/src/main/java/cn/qihangerp/module/domain/SysDept.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.domain; -import cn.qihangerp.domain.BaseEntity; +import cn.qihangerp.model.entity.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import java.util.ArrayList; diff --git a/module/sys/src/main/java/cn/qihangerp/module/domain/SysDictType.java b/module/sys/src/main/java/cn/qihangerp/module/domain/SysDictType.java index 13a2cb80..64dabf19 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/domain/SysDictType.java +++ b/module/sys/src/main/java/cn/qihangerp/module/domain/SysDictType.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.domain; -import cn.qihangerp.domain.BaseEntity; +import cn.qihangerp.model.entity.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/module/sys/src/main/java/cn/qihangerp/module/domain/SysMenu.java b/module/sys/src/main/java/cn/qihangerp/module/domain/SysMenu.java index 0faef5bb..60ebc745 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/domain/SysMenu.java +++ b/module/sys/src/main/java/cn/qihangerp/module/domain/SysMenu.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.domain; -import cn.qihangerp.domain.BaseEntity; +import cn.qihangerp.model.entity.BaseEntity; import cn.qihangerp.module.domain.vo.MenusDetailVo; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/module/sys/src/main/java/cn/qihangerp/module/mapper/SysDictDataMapper.java b/module/sys/src/main/java/cn/qihangerp/module/mapper/SysDictDataMapper.java index a85e0e2e..5ad6e9db 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/mapper/SysDictDataMapper.java +++ b/module/sys/src/main/java/cn/qihangerp/module/mapper/SysDictDataMapper.java @@ -1,8 +1,6 @@ package cn.qihangerp.module.mapper; - - -import cn.qihangerp.domain.SysDictData; +import cn.qihangerp.model.entity.SysDictData; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/module/sys/src/main/java/cn/qihangerp/module/mapper/SysRoleMapper.java b/module/sys/src/main/java/cn/qihangerp/module/mapper/SysRoleMapper.java index 7febeeeb..b845d53e 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/mapper/SysRoleMapper.java +++ b/module/sys/src/main/java/cn/qihangerp/module/mapper/SysRoleMapper.java @@ -1,9 +1,6 @@ package cn.qihangerp.module.mapper; - - - -import cn.qihangerp.domain.SysRole; +import cn.qihangerp.model.entity.SysRole; import java.util.List; diff --git a/module/sys/src/main/java/cn/qihangerp/module/mapper/SysUserMapper.java b/module/sys/src/main/java/cn/qihangerp/module/mapper/SysUserMapper.java index e7ac889b..3b182391 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/mapper/SysUserMapper.java +++ b/module/sys/src/main/java/cn/qihangerp/module/mapper/SysUserMapper.java @@ -1,7 +1,6 @@ package cn.qihangerp.module.mapper; - -import cn.qihangerp.domain.SysUser; +import cn.qihangerp.model.entity.SysUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/module/sys/src/main/java/cn/qihangerp/module/service/ISysDictDataService.java b/module/sys/src/main/java/cn/qihangerp/module/service/ISysDictDataService.java index 4904c8ef..ca677395 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/service/ISysDictDataService.java +++ b/module/sys/src/main/java/cn/qihangerp/module/service/ISysDictDataService.java @@ -1,7 +1,6 @@ package cn.qihangerp.module.service; - -import cn.qihangerp.domain.SysDictData; +import cn.qihangerp.model.entity.SysDictData; import java.util.List; diff --git a/module/sys/src/main/java/cn/qihangerp/module/service/ISysDictTypeService.java b/module/sys/src/main/java/cn/qihangerp/module/service/ISysDictTypeService.java index 98f220db..0989d516 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/service/ISysDictTypeService.java +++ b/module/sys/src/main/java/cn/qihangerp/module/service/ISysDictTypeService.java @@ -1,7 +1,6 @@ package cn.qihangerp.module.service; - -import cn.qihangerp.domain.SysDictData; +import cn.qihangerp.model.entity.SysDictData; import cn.qihangerp.module.domain.SysDictType; diff --git a/module/sys/src/main/java/cn/qihangerp/module/service/ISysMenuService.java b/module/sys/src/main/java/cn/qihangerp/module/service/ISysMenuService.java index 379432da..d4c1734b 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/service/ISysMenuService.java +++ b/module/sys/src/main/java/cn/qihangerp/module/service/ISysMenuService.java @@ -1,8 +1,6 @@ package cn.qihangerp.module.service; - - -import cn.qihangerp.domain.vo.RouterVo; +import cn.qihangerp.model.vo.RouterVo; import cn.qihangerp.module.domain.SysMenu; import cn.qihangerp.module.domain.vo.TreeSelect; diff --git a/module/sys/src/main/java/cn/qihangerp/module/service/ISysRoleService.java b/module/sys/src/main/java/cn/qihangerp/module/service/ISysRoleService.java index c630a426..7b6c8d2a 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/service/ISysRoleService.java +++ b/module/sys/src/main/java/cn/qihangerp/module/service/ISysRoleService.java @@ -1,10 +1,6 @@ package cn.qihangerp.module.service; - - - - -import cn.qihangerp.domain.SysRole; +import cn.qihangerp.model.entity.SysRole; import cn.qihangerp.module.domain.SysUserRole; import java.util.List; diff --git a/module/sys/src/main/java/cn/qihangerp/module/service/SysPermissionService.java b/module/sys/src/main/java/cn/qihangerp/module/service/SysPermissionService.java index d94fae53..32885439 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/service/SysPermissionService.java +++ b/module/sys/src/main/java/cn/qihangerp/module/service/SysPermissionService.java @@ -1,8 +1,6 @@ package cn.qihangerp.module.service; - - -import cn.qihangerp.domain.SysUser; +import cn.qihangerp.model.entity.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDeptServiceImpl.java b/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDeptServiceImpl.java index eb54cd4b..044d93ce 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDeptServiceImpl.java +++ b/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDeptServiceImpl.java @@ -1,23 +1,19 @@ package cn.qihangerp.module.service.impl; - import cn.qihangerp.common.ServiceException; import cn.qihangerp.common.constant.Convert; import cn.qihangerp.common.constant.UserConstants; import cn.qihangerp.common.utils.SpringUtils; import cn.qihangerp.common.utils.StringUtils; -import cn.qihangerp.domain.SysRole; -import cn.qihangerp.domain.SysUser; +import cn.qihangerp.model.entity.SysRole; +import cn.qihangerp.model.entity.SysUser; import cn.qihangerp.module.domain.SysDept; import cn.qihangerp.module.domain.vo.TreeSelect; import cn.qihangerp.module.mapper.SysDeptMapper; import cn.qihangerp.module.mapper.SysRoleMapper; -//import cn.qihangerp.security.common.SecurityUtils; - import cn.qihangerp.module.service.ISysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDictDataServiceImpl.java b/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDictDataServiceImpl.java index 1167d540..53e4370d 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDictDataServiceImpl.java +++ b/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDictDataServiceImpl.java @@ -1,8 +1,7 @@ package cn.qihangerp.module.service.impl; - -import cn.qihangerp.common.DictUtils; -import cn.qihangerp.domain.SysDictData; +import cn.qihangerp.model.DictUtils; +import cn.qihangerp.model.entity.SysDictData; import cn.qihangerp.module.mapper.SysDictDataMapper; import cn.qihangerp.module.service.ISysDictDataService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDictTypeServiceImpl.java b/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDictTypeServiceImpl.java index 1040a044..f675fe88 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDictTypeServiceImpl.java +++ b/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDictTypeServiceImpl.java @@ -1,13 +1,10 @@ package cn.qihangerp.module.service.impl; - - -import cn.qihangerp.common.DictUtils; import cn.qihangerp.common.ServiceException; import cn.qihangerp.common.constant.UserConstants; import cn.qihangerp.common.utils.StringUtils; - -import cn.qihangerp.domain.SysDictData; +import cn.qihangerp.model.DictUtils; +import cn.qihangerp.model.entity.SysDictData; import cn.qihangerp.module.domain.SysDictType; import cn.qihangerp.module.mapper.SysDictDataMapper; import cn.qihangerp.module.mapper.SysDictTypeMapper; diff --git a/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysMenuServiceImpl.java b/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysMenuServiceImpl.java index 0a3e73da..895fff96 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysMenuServiceImpl.java +++ b/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysMenuServiceImpl.java @@ -1,14 +1,12 @@ package cn.qihangerp.module.service.impl; - import cn.qihangerp.common.constant.Constants; import cn.qihangerp.common.constant.UserConstants; import cn.qihangerp.common.utils.StringUtils; - -import cn.qihangerp.domain.SysRole; -import cn.qihangerp.domain.SysUser; -import cn.qihangerp.domain.vo.MetaVo; -import cn.qihangerp.domain.vo.RouterVo; +import cn.qihangerp.model.entity.SysRole; +import cn.qihangerp.model.entity.SysUser; +import cn.qihangerp.model.vo.MetaVo; +import cn.qihangerp.model.vo.RouterVo; import cn.qihangerp.module.domain.SysMenu; import cn.qihangerp.module.domain.vo.TreeSelect; import cn.qihangerp.module.mapper.SysMenuMapper; diff --git a/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysRoleServiceImpl.java b/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysRoleServiceImpl.java index fc28f36c..7623f34f 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysRoleServiceImpl.java +++ b/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysRoleServiceImpl.java @@ -1,15 +1,11 @@ package cn.qihangerp.module.service.impl; - - import cn.qihangerp.common.ServiceException; import cn.qihangerp.common.constant.UserConstants; import cn.qihangerp.common.utils.SpringUtils; import cn.qihangerp.common.utils.StringUtils; - - -import cn.qihangerp.domain.SysRole; -import cn.qihangerp.domain.SysUser; +import cn.qihangerp.model.entity.SysRole; +import cn.qihangerp.model.entity.SysUser; import cn.qihangerp.module.domain.SysRoleMenu; import cn.qihangerp.module.domain.SysUserRole; import cn.qihangerp.module.mapper.SysRoleMapper; diff --git a/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysUserServiceImpl.java b/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysUserServiceImpl.java index fc52ad66..cd4f3a16 100644 --- a/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysUserServiceImpl.java +++ b/module/sys/src/main/java/cn/qihangerp/module/service/impl/SysUserServiceImpl.java @@ -4,10 +4,8 @@ package cn.qihangerp.module.service.impl; import cn.qihangerp.common.ServiceException; import cn.qihangerp.common.constant.UserConstants; import cn.qihangerp.common.utils.StringUtils; - - -import cn.qihangerp.domain.SysRole; -import cn.qihangerp.domain.SysUser; +import cn.qihangerp.model.entity.SysRole; +import cn.qihangerp.model.entity.SysUser; import cn.qihangerp.module.domain.SysUserRole; import cn.qihangerp.module.mapper.SysRoleMapper; import cn.qihangerp.module.mapper.SysUserMapper; diff --git a/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java index ece7ea45..c96bef79 100644 --- a/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java @@ -3,7 +3,7 @@ package cn.qihangerp.module.open.tao.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java index bf1e018e..91b1ed8b 100644 --- a/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java @@ -3,7 +3,7 @@ package cn.qihangerp.module.open.tao.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.open.tao.domain.TaoGoods; diff --git a/module/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsSkuService.java b/module/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsSkuService.java index 410f0d25..6df47260 100644 --- a/module/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsSkuService.java +++ b/module/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsSkuService.java @@ -3,7 +3,7 @@ package cn.qihangerp.module.open.wei.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.open.wei.domain.WeiGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/module/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java b/module/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java index 999e4b33..1352f683 100644 --- a/module/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java +++ b/module/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java @@ -3,7 +3,7 @@ package cn.qihangerp.module.open.wei.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.service.OGoodsService;