huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

升级新架构

This commit is contained in:
启航老齐 2025-09-18 08:31:07 +08:00
parent ea73196a79
commit c0efb63c24
99 changed files with 152 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java
View File

@ -4,9 +4,7 @@ import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.domain.OLogisticsCompany; import cn.qihangerp.model.entity.OLogisticsCompany;
import cn.qihangerp.domain.OShop;
import cn.qihangerp.domain.OShopPlatform;
import cn.qihangerp.module.service.OLogisticsCompanyService; import cn.qihangerp.module.service.OLogisticsCompanyService;
import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopPlatformService;
import cn.qihangerp.module.service.OShopService; import cn.qihangerp.module.service.OShopService;

5
api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java
View File

@ -1,10 +1,9 @@
package cn.qihangerp.oms.controller; package cn.qihangerp.oms.controller;
import cn.qihangerp.domain.OLogisticsCompany; import cn.qihangerp.model.entity.OShop;
import cn.qihangerp.domain.OShopPlatform; import cn.qihangerp.model.entity.OShopPlatform;
import cn.qihangerp.module.service.OLogisticsCompanyService; import cn.qihangerp.module.service.OLogisticsCompanyService;
import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopPlatformService;
import cn.qihangerp.domain.OShop;
import cn.qihangerp.module.service.OShopService; import cn.qihangerp.module.service.OShopService;
import cn.qihangerp.oms.request.ShopBo; import cn.qihangerp.oms.request.ShopBo;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

5
api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopPullLogsController.java
View File

@ -2,10 +2,7 @@ package cn.qihangerp.oms.controller;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.domain.OShopPullLogs;
import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.module.service.OShopPullLogsService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

5
api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictDataController.java
View File

@ -1,15 +1,12 @@
package cn.qihangerp.sys.controller; package cn.qihangerp.sys.controller;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.common.utils.StringUtils; 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.ISysDictDataService;
import cn.qihangerp.module.service.ISysDictTypeService; import cn.qihangerp.module.service.ISysDictTypeService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;

8
api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysLoginController.java
View File

@ -1,25 +1,19 @@
package cn.qihangerp.sys.controller; package cn.qihangerp.sys.controller;
import cn.qihangerp.model.entity.SysUser;
import cn.qihangerp.domain.SysUser;
import cn.qihangerp.module.domain.LoginBody; import cn.qihangerp.module.domain.LoginBody;
import cn.qihangerp.module.domain.SysMenu; import cn.qihangerp.module.domain.SysMenu;
import cn.qihangerp.module.service.ISysMenuService; import cn.qihangerp.module.service.ISysMenuService;
import cn.qihangerp.module.service.SysPermissionService; import cn.qihangerp.module.service.SysPermissionService;
import cn.qihangerp.security.common.Constants; import cn.qihangerp.security.common.Constants;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.security.common.SecurityUtils; import cn.qihangerp.security.common.SecurityUtils;
import cn.qihangerp.security.service.SysLoginService; import cn.qihangerp.security.service.SysLoginService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;

5
api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysRoleController.java
View File

@ -1,9 +1,10 @@
package cn.qihangerp.sys.controller; package cn.qihangerp.sys.controller;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.domain.SysRole; import cn.qihangerp.model.entity.SysRole;
import cn.qihangerp.domain.SysUser; import cn.qihangerp.model.entity.SysUser;
import cn.qihangerp.module.domain.SysDept; import cn.qihangerp.module.domain.SysDept;
import cn.qihangerp.module.domain.SysUserRole; import cn.qihangerp.module.domain.SysUserRole;
import cn.qihangerp.module.service.ISysDeptService; import cn.qihangerp.module.service.ISysDeptService;

3
api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysTaskController.java
View File

@ -1,11 +1,10 @@
package cn.qihangerp.sys.controller; package cn.qihangerp.sys.controller;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.TableDataInfo; 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.SysTaskService;
import cn.qihangerp.module.service.SysTaskLogsService; import cn.qihangerp.module.service.SysTaskLogsService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;

5
api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysUserController.java
View File

@ -1,13 +1,10 @@
package cn.qihangerp.sys.controller; package cn.qihangerp.sys.controller;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.utils.StringUtils; 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.BaseController;
import cn.qihangerp.security.common.SecurityUtils; import cn.qihangerp.security.common.SecurityUtils;
import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.service.ISysUserService; import cn.qihangerp.service.ISysUserService;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;

5
core/model/pom.xml
View File

@ -18,6 +18,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>cn.qihangerp.core</groupId>
<artifactId>common</artifactId>
<version>1.0</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>

5
core/common/src/main/java/cn/qihangerp/common/DictUtils.java → core/model/src/main/java/cn/qihangerp/model/DictUtils.java
View File

@ -1,7 +1,6 @@
package cn.qihangerp.common; package cn.qihangerp.model;
import cn.qihangerp.model.entity.SysDictData;
import cn.qihangerp.domain.SysDictData;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
import cn.qihangerp.common.config.RedisCache; import cn.qihangerp.common.config.RedisCache;
import cn.qihangerp.common.constant.CacheConstants; import cn.qihangerp.common.constant.CacheConstants;

2
core/security/src/main/java/cn/qihangerp/security/LoginUser.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.security; package cn.qihangerp.security;
import cn.qihangerp.domain.SysUser; import cn.qihangerp.model.entity.SysUser;
import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;

5
core/security/src/main/java/cn/qihangerp/security/UserDetailsServiceImpl.java
View File

@ -1,14 +1,11 @@
package cn.qihangerp.security; package cn.qihangerp.security;
import cn.qihangerp.common.ServiceException; import cn.qihangerp.common.ServiceException;
import cn.qihangerp.common.enums.UserStatus; import cn.qihangerp.common.enums.UserStatus;
import cn.qihangerp.common.utils.MessageUtils; import cn.qihangerp.common.utils.MessageUtils;
import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.model.entity.SysUser;
import cn.qihangerp.service.ISysUserService; import cn.qihangerp.service.ISysUserService;
import cn.qihangerp.domain.SysUser;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

2
core/security/src/main/java/cn/qihangerp/security/service/SysLoginService.java
View File

@ -11,12 +11,12 @@ import cn.qihangerp.common.exception.CaptchaExpireException;
import cn.qihangerp.common.exception.UserNotExistsException; import cn.qihangerp.common.exception.UserNotExistsException;
import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.common.utils.DateUtils;
import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.model.entity.SysUser;
import cn.qihangerp.module.service.SysConfigService; import cn.qihangerp.module.service.SysConfigService;
import cn.qihangerp.security.AuthenticationContextHolder; import cn.qihangerp.security.AuthenticationContextHolder;
import cn.qihangerp.security.LoginUser; import cn.qihangerp.security.LoginUser;
import cn.qihangerp.security.TokenService; import cn.qihangerp.security.TokenService;
import cn.qihangerp.security.UserPasswordNotMatchException; import cn.qihangerp.security.UserPasswordNotMatchException;
import cn.qihangerp.domain.SysUser;
import cn.qihangerp.security.utils.IpUtils; import cn.qihangerp.security.utils.IpUtils;
import cn.qihangerp.service.ISysUserService; import cn.qihangerp.service.ISysUserService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;

2
microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java
View File

@ -5,7 +5,7 @@ import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.api.ShopApiParams;
import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.HttpStatus; 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.module.service.OShopService;
import cn.qihangerp.open.common.ApiResultVo; import cn.qihangerp.open.common.ApiResultVo;
import cn.qihangerp.sdk.dou.DouTokenApiHelper; import cn.qihangerp.sdk.dou.DouTokenApiHelper;

4
microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java
View File

@ -5,8 +5,8 @@ import cn.qihangerp.api.dou.DouApiCommon;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.dou.domain.DouGoods; import cn.qihangerp.module.open.dou.domain.DouGoods;
import cn.qihangerp.module.open.dou.domain.DouGoodsSku; import cn.qihangerp.module.open.dou.domain.DouGoodsSku;
import cn.qihangerp.module.open.dou.service.DouGoodsService; import cn.qihangerp.module.open.dou.service.DouGoodsService;

2
microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java
View File

@ -2,7 +2,7 @@ package cn.qihangerp.api.dou.controller;
import cn.qihangerp.common.*; 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.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.dou.domain.DouGoods; import cn.qihangerp.module.open.dou.domain.DouGoods;
import cn.qihangerp.module.open.dou.domain.DouGoodsSku; import cn.qihangerp.module.open.dou.domain.DouGoodsSku;

4
microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java
View File

@ -9,8 +9,8 @@ import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqMessage;
import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.dou.domain.DouOrder; import cn.qihangerp.module.open.dou.domain.DouOrder;
import cn.qihangerp.module.open.dou.domain.DouOrderItem; import cn.qihangerp.module.open.dou.domain.DouOrderItem;
import cn.qihangerp.module.open.dou.service.DouOrderService; import cn.qihangerp.module.open.dou.service.DouOrderService;

4
microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java
View File

@ -8,8 +8,8 @@ import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqMessage;
import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.dou.domain.DouRefund; import cn.qihangerp.module.open.dou.domain.DouRefund;
import cn.qihangerp.module.open.dou.service.DouRefundService; import cn.qihangerp.module.open.dou.service.DouRefundService;
import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLasttimeService;

2
microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java
View File

@ -5,7 +5,7 @@ import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.api.ShopApiParams;
import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.HttpStatus; 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.module.service.OShopService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

4
microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java
View File

@ -5,8 +5,8 @@ import cn.qihangerp.api.jd.JdApiCommon;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.jd.domain.JdGoodsSku; import cn.qihangerp.module.open.jd.domain.JdGoodsSku;
import cn.qihangerp.module.open.jd.service.JdGoodsService; import cn.qihangerp.module.open.jd.service.JdGoodsService;
import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLasttimeService;

2
microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java
View File

@ -2,7 +2,7 @@ package cn.qihangerp.api.jd.controller;
import cn.qihangerp.common.*; 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.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.jd.domain.JdGoods; import cn.qihangerp.module.open.jd.domain.JdGoods;
import cn.qihangerp.module.open.jd.domain.JdGoodsSku; import cn.qihangerp.module.open.jd.domain.JdGoodsSku;

2
microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.api.jd.controller; package cn.qihangerp.api.jd.controller;
import cn.qihangerp.common.AjaxResult; 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.open.jd.domain.bo.JdTokenCreateBo;
import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopPlatformService;
import cn.qihangerp.module.service.OShopService; import cn.qihangerp.module.service.OShopService;

4
microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java
View File

@ -11,8 +11,8 @@ import cn.qihangerp.common.mq.MqMessage;
import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.common.utils.DateUtils;
import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.jd.domain.JdRefund; import cn.qihangerp.module.open.jd.domain.JdRefund;
import cn.qihangerp.module.open.jd.service.JdRefundService; import cn.qihangerp.module.open.jd.service.JdRefundService;
import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLasttimeService;

4
microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java
View File

@ -9,8 +9,8 @@ import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqMessage;
import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.jd.domain.JdOrder; import cn.qihangerp.module.open.jd.domain.JdOrder;
import cn.qihangerp.module.open.jd.domain.JdOrderItem; import cn.qihangerp.module.open.jd.domain.JdOrderItem;
import cn.qihangerp.module.open.jd.service.JdOrderService; import cn.qihangerp.module.open.jd.service.JdOrderService;

3
microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineOrderController.java
View File

@ -1,6 +1,5 @@
package cn.qihangerp.api.order.controller; package cn.qihangerp.api.order.controller;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.TableDataInfo; 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.MqMessage;
import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.mq.MqUtils; 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.OfflineOrderCreateBo;
import cn.qihangerp.module.order.domain.bo.OfflineOrderPushBo; import cn.qihangerp.module.order.domain.bo.OfflineOrderPushBo;
import cn.qihangerp.module.order.service.OfflineOrderService; import cn.qihangerp.module.order.service.OfflineOrderService;
import cn.qihangerp.request.OrderSearchRequest;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

3
microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineRefundController.java
View File

@ -1,10 +1,9 @@
package cn.qihangerp.api.order.controller; package cn.qihangerp.api.order.controller;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.request.RefundSearchRequest;
import cn.qihangerp.module.order.service.OfflineRefundService; import cn.qihangerp.module.order.service.OfflineRefundService;
import cn.qihangerp.request.RefundSearchRequest;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

3
microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java
View File

@ -1,14 +1,13 @@
package cn.qihangerp.api.order.controller; package cn.qihangerp.api.order.controller;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.TableDataInfo; 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.OrderAllocateShipRequest;
import cn.qihangerp.module.order.domain.bo.OrderShipRequest; import cn.qihangerp.module.order.domain.bo.OrderShipRequest;
import cn.qihangerp.module.order.service.OOrderItemService; import cn.qihangerp.module.order.service.OOrderItemService;
import cn.qihangerp.module.order.service.OOrderService; import cn.qihangerp.module.order.service.OOrderService;
import cn.qihangerp.request.OrderSearchRequest;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;

2
microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java
View File

@ -5,7 +5,7 @@ import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.api.ShopApiParams;
import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.HttpStatus; 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.module.service.OShopService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

4
microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java
View File

@ -5,8 +5,8 @@ import cn.qihangerp.api.pdd.PddApiCommon;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.pdd.domain.PddGoods; import cn.qihangerp.module.open.pdd.domain.PddGoods;
import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; import cn.qihangerp.module.open.pdd.domain.PddGoodsSku;
import cn.qihangerp.module.open.pdd.service.PddGoodsService; import cn.qihangerp.module.open.pdd.service.PddGoodsService;

2
microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java
View File

@ -2,7 +2,7 @@ package cn.qihangerp.api.pdd.controller;
import cn.qihangerp.common.*; 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.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.pdd.domain.PddGoods; import cn.qihangerp.module.open.pdd.domain.PddGoods;
import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; import cn.qihangerp.module.open.pdd.domain.PddGoodsSku;

2
microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOAuthController.java
View File

@ -5,7 +5,7 @@ package cn.qihangerp.api.pdd.controller;
import cn.qihangerp.api.pdd.PddTokenCreateBo; import cn.qihangerp.api.pdd.PddTokenCreateBo;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.enums.EnumShopType; 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.OShopPlatformService;
import cn.qihangerp.module.service.OShopService; import cn.qihangerp.module.service.OShopService;
import cn.qihangerp.open.common.ApiResultVo; import cn.qihangerp.open.common.ApiResultVo;

4
microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java
View File

@ -9,8 +9,8 @@ import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqMessage;
import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.pdd.domain.PddOrder; import cn.qihangerp.module.open.pdd.domain.PddOrder;
import cn.qihangerp.module.open.pdd.domain.PddOrderItem; import cn.qihangerp.module.open.pdd.domain.PddOrderItem;
import cn.qihangerp.module.open.pdd.service.PddOrderService; import cn.qihangerp.module.open.pdd.service.PddOrderService;

4
microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java
View File

@ -9,8 +9,8 @@ import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqMessage;
import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.pdd.domain.PddRefund; import cn.qihangerp.module.open.pdd.domain.PddRefund;
import cn.qihangerp.module.open.pdd.service.PddRefundService; import cn.qihangerp.module.open.pdd.service.PddRefundService;
import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLasttimeService;

2
microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java
View File

@ -5,7 +5,7 @@ import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.api.ShopApiParams;
import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.HttpStatus; 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.module.service.OShopService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

4
microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java
View File

@ -10,8 +10,8 @@ import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.common.utils.DateUtils;
import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.tao.domain.TaoGoods; import cn.qihangerp.module.open.tao.domain.TaoGoods;
import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; import cn.qihangerp.module.open.tao.domain.TaoGoodsSku;
import cn.qihangerp.module.open.tao.service.TaoGoodsService; import cn.qihangerp.module.open.tao.service.TaoGoodsService;

2
microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java
View File

@ -2,7 +2,7 @@ package cn.qihangerp.api.tao.controller;
import cn.qihangerp.common.*; 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.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.tao.domain.TaoGoods; import cn.qihangerp.module.open.tao.domain.TaoGoods;
import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; import cn.qihangerp.module.open.tao.domain.TaoGoodsSku;

2
microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java
View File

@ -2,7 +2,7 @@ package cn.qihangerp.api.tao.controller;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.utils.StringUtils; 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.open.tao.domain.bo.TaoTokenSaveBo;
import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopPlatformService;
import cn.qihangerp.module.service.OShopService; import cn.qihangerp.module.service.OShopService;

4
microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java
View File

@ -11,8 +11,8 @@ import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqMessage;
import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.tao.domain.TaoOrder; import cn.qihangerp.module.open.tao.domain.TaoOrder;
import cn.qihangerp.module.open.tao.service.TaoOrderService; import cn.qihangerp.module.open.tao.service.TaoOrderService;
import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLasttimeService;

4
microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java
View File

@ -10,8 +10,8 @@ import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqMessage;
import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.tao.domain.TaoRefund; import cn.qihangerp.module.open.tao.domain.TaoRefund;
import cn.qihangerp.module.open.tao.service.TaoRefundService; import cn.qihangerp.module.open.tao.service.TaoRefundService;
import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLasttimeService;

2
microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java
View File

@ -5,7 +5,7 @@ import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.api.ShopApiParams;
import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.HttpStatus; 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.module.service.OShopService;
import cn.qihangerp.open.common.ApiResultVo; import cn.qihangerp.open.common.ApiResultVo;
import cn.qihangerp.open.wei.WeiTokenApiHelper; import cn.qihangerp.open.wei.WeiTokenApiHelper;

2
microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiGoodsController.java
View File

@ -2,7 +2,7 @@ package cn.qihangerp.api.wei.controller;
import cn.qihangerp.common.*; 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.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.wei.domain.WeiGoods; import cn.qihangerp.module.open.wei.domain.WeiGoods;
import cn.qihangerp.module.open.wei.domain.WeiGoodsSku; import cn.qihangerp.module.open.wei.domain.WeiGoodsSku;

2
module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.module.open.dou.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; 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.DouGoodsSku;
import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo; import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;

2
module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.module.open.dou.service.impl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; 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.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsService;

2
module/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java
View File

@ -1,7 +1,5 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.goods.service;
import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.domain.OGoodsSku;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;

2
module/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java
View File

@ -1,7 +1,5 @@
package cn.qihangerp.module.goods.service.impl; 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.domain.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.goods.service.OGoodsSkuService;

2
module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.module.open.jd.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; 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.JdGoodsSku;
import cn.qihangerp.module.open.jd.domain.bo.JdGoodsBo; import cn.qihangerp.module.open.jd.domain.bo.JdGoodsBo;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;

2
module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.open.jd.service.impl; package cn.qihangerp.module.open.jd.service.impl;
import cn.qihangerp.common.ResultVo; 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.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsService;

3
module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java
View File

@ -1,12 +1,11 @@
package cn.qihangerp.module.order.service; 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.OOrder;
import cn.qihangerp.module.order.domain.OOrderItem; import cn.qihangerp.module.order.domain.OOrderItem;
import cn.qihangerp.module.order.domain.bo.OrderAllocateShipRequest; import cn.qihangerp.module.order.domain.bo.OrderAllocateShipRequest;
import cn.qihangerp.module.order.domain.bo.OrderShipRequest; import cn.qihangerp.module.order.domain.bo.OrderShipRequest;
import cn.qihangerp.module.order.domain.vo.SalesDailyVo; import cn.qihangerp.module.order.domain.vo.SalesDailyVo;
import cn.qihangerp.request.OrderSearchRequest;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;

4
module/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderService.java
View File

@ -2,14 +2,12 @@ package cn.qihangerp.module.order.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.model.request.OrderSearchRequest;
import cn.qihangerp.module.order.domain.OfflineOrder; import cn.qihangerp.module.order.domain.OfflineOrder;
import cn.qihangerp.module.order.domain.bo.OfflineOrderCreateBo; import cn.qihangerp.module.order.domain.bo.OfflineOrderCreateBo;
import cn.qihangerp.module.order.domain.bo.OfflineOrderShipBo; import cn.qihangerp.module.order.domain.bo.OfflineOrderShipBo;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import cn.qihangerp.request.OrderSearchRequest;
/** /**
* @author qilip * @author qilip

3
module/order/src/main/java/cn/qihangerp/module/order/service/OfflineRefundService.java
View File

@ -2,9 +2,8 @@ package cn.qihangerp.module.order.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.model.request.RefundSearchRequest;
import cn.qihangerp.module.order.domain.OfflineRefund; import cn.qihangerp.module.order.domain.OfflineRefund;
import cn.qihangerp.request.RefundSearchRequest;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

5
module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.order.service.impl; package cn.qihangerp.module.order.service.impl;
import cn.qihangerp.model.entity.OLogisticsCompany;
import cn.qihangerp.domain.OLogisticsCompany; import cn.qihangerp.model.request.OrderSearchRequest;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.module.goods.domain.OGoodsSupplier; 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.domain.vo.SalesDailyVo;
import cn.qihangerp.module.order.mapper.*; import cn.qihangerp.module.order.mapper.*;
import cn.qihangerp.module.order.service.OOrderService; import cn.qihangerp.module.order.service.OOrderService;
import cn.qihangerp.request.OrderSearchRequest;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

4
module/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderServiceImpl.java
View File

@ -1,5 +1,6 @@
package cn.qihangerp.module.order.service.impl; 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.OfflineOrder;
import cn.qihangerp.module.order.domain.OfflineOrderItem; import cn.qihangerp.module.order.domain.OfflineOrderItem;
import cn.qihangerp.module.order.domain.bo.OfflineOrderCreateBo; 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.MqMessage;
import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.request.OrderSearchRequest;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;

2
module/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineRefundServiceImpl.java
View File

@ -2,10 +2,10 @@ package cn.qihangerp.module.order.service.impl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.model.request.RefundSearchRequest;
import cn.qihangerp.module.order.domain.OfflineRefund; import cn.qihangerp.module.order.domain.OfflineRefund;
import cn.qihangerp.module.order.mapper.OfflineRefundMapper; import cn.qihangerp.module.order.mapper.OfflineRefundMapper;
import cn.qihangerp.module.order.service.OfflineRefundService; import cn.qihangerp.module.order.service.OfflineRefundService;
import cn.qihangerp.request.RefundSearchRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

2
module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.module.open.pdd.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; 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 cn.qihangerp.module.open.pdd.domain.PddGoodsSku;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;

2
module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.module.open.pdd.service.impl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; 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.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsService;

23
module/shop/pom.xml
View File

@ -20,15 +20,20 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cn.qihangerp.core</groupId> <groupId>cn.qihangerp.service</groupId>
<artifactId>common</artifactId> <artifactId>interfaces</artifactId>
<version>1.0</version> <version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<version>3.5.5</version>
<scope>compile</scope>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>cn.qihangerp.core</groupId>-->
<!-- <artifactId>common</artifactId>-->
<!-- <version>1.0</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-spring-boot3-starter</artifactId>-->
<!-- <version>3.5.5</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
</dependencies> </dependencies>
</project> </project>

2
module/shop/src/main/java/cn/qihangerp/module/mapper/OLogisticsCompanyMapper.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.mapper; package cn.qihangerp.module.mapper;
import cn.qihangerp.domain.OLogisticsCompany; import cn.qihangerp.model.entity.OLogisticsCompany;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

2
module/shop/src/main/java/cn/qihangerp/module/mapper/OShopMapper.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.mapper; package cn.qihangerp.module.mapper;
import cn.qihangerp.domain.OShop; import cn.qihangerp.model.entity.OShop;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

2
module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPlatformMapper.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.mapper; package cn.qihangerp.module.mapper;
import cn.qihangerp.domain.OShopPlatform; import cn.qihangerp.model.entity.OShopPlatform;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

2
module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPullLasttimeMapper.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.mapper; package cn.qihangerp.module.mapper;
import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

2
module/shop/src/main/java/cn/qihangerp/module/mapper/OShopPullLogsMapper.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.mapper; package cn.qihangerp.module.mapper;
import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

3
module/shop/src/main/java/cn/qihangerp/module/mapper/SysTaskLogsMapper.java
View File

@ -1,7 +1,6 @@
package cn.qihangerp.module.mapper; package cn.qihangerp.module.mapper;
import cn.qihangerp.model.entity.SysTaskLogs;
import cn.qihangerp.domain.SysTaskLogs;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

3
module/shop/src/main/java/cn/qihangerp/module/mapper/SysTaskMapper.java
View File

@ -1,7 +1,6 @@
package cn.qihangerp.module.mapper; package cn.qihangerp.module.mapper;
import cn.qihangerp.model.entity.SysTask;
import cn.qihangerp.domain.SysTask;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

2
module/shop/src/main/java/cn/qihangerp/module/service/OLogisticsCompanyService.java
View File

@ -2,7 +2,7 @@ package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.domain.OLogisticsCompany; import cn.qihangerp.model.entity.OLogisticsCompany;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;

2
module/shop/src/main/java/cn/qihangerp/module/service/OShopPlatformService.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.service; package cn.qihangerp.module.service;
import cn.qihangerp.domain.OShopPlatform; import cn.qihangerp.model.entity.OShopPlatform;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

2
module/shop/src/main/java/cn/qihangerp/module/service/OShopPullLasttimeService.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.service; package cn.qihangerp.module.service;
import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

2
module/shop/src/main/java/cn/qihangerp/module/service/OShopPullLogsService.java
View File

@ -2,7 +2,7 @@ package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

2
module/shop/src/main/java/cn/qihangerp/module/service/OShopService.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.service; package cn.qihangerp.module.service;
import cn.qihangerp.common.enums.EnumShopType; 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 com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;

3
module/shop/src/main/java/cn/qihangerp/module/service/SysTaskLogsService.java
View File

@ -1,9 +1,8 @@
package cn.qihangerp.module.service; package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.domain.SysTaskLogs; import cn.qihangerp.model.entity.SysTaskLogs;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

3
module/shop/src/main/java/cn/qihangerp/module/service/SysTaskService.java
View File

@ -1,9 +1,8 @@
package cn.qihangerp.module.service; package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.domain.SysTask; import cn.qihangerp.model.entity.SysTask;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

3
module/shop/src/main/java/cn/qihangerp/module/service/impl/OLogisticsCompanyServiceImpl.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.entity.OLogisticsCompany;
import cn.qihangerp.module.mapper.OLogisticsCompanyMapper; import cn.qihangerp.module.mapper.OLogisticsCompanyMapper;
import cn.qihangerp.module.service.OLogisticsCompanyService; import cn.qihangerp.module.service.OLogisticsCompanyService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.domain.OLogisticsCompany;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPlatformServiceImpl.java
View File

@ -1,8 +1,8 @@
package cn.qihangerp.module.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.entity.OShopPlatform;
import cn.qihangerp.module.mapper.OShopPlatformMapper; import cn.qihangerp.module.mapper.OShopPlatformMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.domain.OShopPlatform;
import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopPlatformService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

3
module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPullLasttimeServiceImpl.java
View File

@ -1,11 +1,10 @@
package cn.qihangerp.module.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.module.mapper.OShopPullLasttimeMapper; import cn.qihangerp.module.mapper.OShopPullLasttimeMapper;
import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLasttimeService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.domain.OShopPullLasttime;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

3
module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopPullLogsServiceImpl.java
View File

@ -1,13 +1,12 @@
package cn.qihangerp.module.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.mapper.OShopPullLogsMapper; import cn.qihangerp.module.mapper.OShopPullLogsMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.domain.OShopPullLogs;
import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.module.service.OShopPullLogsService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopServiceImpl.java
View File

@ -1,10 +1,10 @@
package cn.qihangerp.module.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.model.entity.OShop;
import cn.qihangerp.module.mapper.OShopMapper; import cn.qihangerp.module.mapper.OShopMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.domain.OShop;
import cn.qihangerp.module.service.OShopService; import cn.qihangerp.module.service.OShopService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

4
module/shop/src/main/java/cn/qihangerp/module/service/impl/SysTaskLogsServiceImpl.java
View File

@ -1,8 +1,6 @@
package cn.qihangerp.module.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.entity.SysTaskLogs;
import cn.qihangerp.domain.SysTaskLogs;
import cn.qihangerp.module.mapper.SysTaskLogsMapper; import cn.qihangerp.module.mapper.SysTaskLogsMapper;
import cn.qihangerp.module.service.SysTaskLogsService; import cn.qihangerp.module.service.SysTaskLogsService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

4
module/shop/src/main/java/cn/qihangerp/module/service/impl/SysTaskServiceImpl.java
View File

@ -1,8 +1,6 @@
package cn.qihangerp.module.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.entity.SysTask;
import cn.qihangerp.domain.SysTask;
import cn.qihangerp.module.mapper.SysTaskMapper; import cn.qihangerp.module.mapper.SysTaskMapper;
import cn.qihangerp.module.service.SysTaskService; import cn.qihangerp.module.service.SysTaskService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

23
module/sys/pom.xml
View File

@ -20,15 +20,20 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cn.qihangerp.core</groupId> <groupId>cn.qihangerp.service</groupId>
<artifactId>common</artifactId> <artifactId>interfaces</artifactId>
<version>1.0</version> <version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<version>3.5.5</version>
<scope>compile</scope>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>cn.qihangerp.core</groupId>-->
<!-- <artifactId>common</artifactId>-->
<!-- <version>1.0</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-spring-boot3-starter</artifactId>-->
<!-- <version>3.5.5</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
</dependencies> </dependencies>
</project> </project>

2
module/sys/src/main/java/cn/qihangerp/module/domain/SysDept.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.domain; 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.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.ArrayList; import java.util.ArrayList;

2
module/sys/src/main/java/cn/qihangerp/module/domain/SysDictType.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.domain; 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.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;

2
module/sys/src/main/java/cn/qihangerp/module/domain/SysMenu.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.domain; package cn.qihangerp.module.domain;
import cn.qihangerp.domain.BaseEntity; import cn.qihangerp.model.entity.BaseEntity;
import cn.qihangerp.module.domain.vo.MenusDetailVo; import cn.qihangerp.module.domain.vo.MenusDetailVo;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;

4
module/sys/src/main/java/cn/qihangerp/module/mapper/SysDictDataMapper.java
View File

@ -1,8 +1,6 @@
package cn.qihangerp.module.mapper; package cn.qihangerp.module.mapper;
import cn.qihangerp.model.entity.SysDictData;
import cn.qihangerp.domain.SysDictData;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;

5
module/sys/src/main/java/cn/qihangerp/module/mapper/SysRoleMapper.java
View File

@ -1,9 +1,6 @@
package cn.qihangerp.module.mapper; package cn.qihangerp.module.mapper;
import cn.qihangerp.model.entity.SysRole;
import cn.qihangerp.domain.SysRole;
import java.util.List; import java.util.List;

3
module/sys/src/main/java/cn/qihangerp/module/mapper/SysUserMapper.java
View File

@ -1,7 +1,6 @@
package cn.qihangerp.module.mapper; package cn.qihangerp.module.mapper;
import cn.qihangerp.model.entity.SysUser;
import cn.qihangerp.domain.SysUser;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

3
module/sys/src/main/java/cn/qihangerp/module/service/ISysDictDataService.java
View File

@ -1,7 +1,6 @@
package cn.qihangerp.module.service; package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.SysDictData;
import cn.qihangerp.domain.SysDictData;
import java.util.List; import java.util.List;

3
module/sys/src/main/java/cn/qihangerp/module/service/ISysDictTypeService.java
View File

@ -1,7 +1,6 @@
package cn.qihangerp.module.service; package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.SysDictData;
import cn.qihangerp.domain.SysDictData;
import cn.qihangerp.module.domain.SysDictType; import cn.qihangerp.module.domain.SysDictType;

4
module/sys/src/main/java/cn/qihangerp/module/service/ISysMenuService.java
View File

@ -1,8 +1,6 @@
package cn.qihangerp.module.service; package cn.qihangerp.module.service;
import cn.qihangerp.model.vo.RouterVo;
import cn.qihangerp.domain.vo.RouterVo;
import cn.qihangerp.module.domain.SysMenu; import cn.qihangerp.module.domain.SysMenu;
import cn.qihangerp.module.domain.vo.TreeSelect; import cn.qihangerp.module.domain.vo.TreeSelect;

6
module/sys/src/main/java/cn/qihangerp/module/service/ISysRoleService.java
View File

@ -1,10 +1,6 @@
package cn.qihangerp.module.service; package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.SysRole;
import cn.qihangerp.domain.SysRole;
import cn.qihangerp.module.domain.SysUserRole; import cn.qihangerp.module.domain.SysUserRole;
import java.util.List; import java.util.List;

4
module/sys/src/main/java/cn/qihangerp/module/service/SysPermissionService.java
View File

@ -1,8 +1,6 @@
package cn.qihangerp.module.service; package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.SysUser;
import cn.qihangerp.domain.SysUser;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

8
module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDeptServiceImpl.java
View File

@ -1,23 +1,19 @@
package cn.qihangerp.module.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.ServiceException; import cn.qihangerp.common.ServiceException;
import cn.qihangerp.common.constant.Convert; import cn.qihangerp.common.constant.Convert;
import cn.qihangerp.common.constant.UserConstants; import cn.qihangerp.common.constant.UserConstants;
import cn.qihangerp.common.utils.SpringUtils; import cn.qihangerp.common.utils.SpringUtils;
import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.domain.SysRole; import cn.qihangerp.model.entity.SysRole;
import cn.qihangerp.domain.SysUser; import cn.qihangerp.model.entity.SysUser;
import cn.qihangerp.module.domain.SysDept; import cn.qihangerp.module.domain.SysDept;
import cn.qihangerp.module.domain.vo.TreeSelect; import cn.qihangerp.module.domain.vo.TreeSelect;
import cn.qihangerp.module.mapper.SysDeptMapper; import cn.qihangerp.module.mapper.SysDeptMapper;
import cn.qihangerp.module.mapper.SysRoleMapper; import cn.qihangerp.module.mapper.SysRoleMapper;
//import cn.qihangerp.security.common.SecurityUtils;
import cn.qihangerp.module.service.ISysDeptService; import cn.qihangerp.module.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;

5
module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDictDataServiceImpl.java
View File

@ -1,8 +1,7 @@
package cn.qihangerp.module.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.DictUtils;
import cn.qihangerp.common.DictUtils; import cn.qihangerp.model.entity.SysDictData;
import cn.qihangerp.domain.SysDictData;
import cn.qihangerp.module.mapper.SysDictDataMapper; import cn.qihangerp.module.mapper.SysDictDataMapper;
import cn.qihangerp.module.service.ISysDictDataService; import cn.qihangerp.module.service.ISysDictDataService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

7
module/sys/src/main/java/cn/qihangerp/module/service/impl/SysDictTypeServiceImpl.java
View File

@ -1,13 +1,10 @@
package cn.qihangerp.module.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.DictUtils;
import cn.qihangerp.common.ServiceException; import cn.qihangerp.common.ServiceException;
import cn.qihangerp.common.constant.UserConstants; import cn.qihangerp.common.constant.UserConstants;
import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.model.DictUtils;
import cn.qihangerp.domain.SysDictData; import cn.qihangerp.model.entity.SysDictData;
import cn.qihangerp.module.domain.SysDictType; import cn.qihangerp.module.domain.SysDictType;
import cn.qihangerp.module.mapper.SysDictDataMapper; import cn.qihangerp.module.mapper.SysDictDataMapper;
import cn.qihangerp.module.mapper.SysDictTypeMapper; import cn.qihangerp.module.mapper.SysDictTypeMapper;

10
module/sys/src/main/java/cn/qihangerp/module/service/impl/SysMenuServiceImpl.java
View File

@ -1,14 +1,12 @@
package cn.qihangerp.module.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.constant.Constants; import cn.qihangerp.common.constant.Constants;
import cn.qihangerp.common.constant.UserConstants; import cn.qihangerp.common.constant.UserConstants;
import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.model.entity.SysRole;
import cn.qihangerp.domain.SysRole; import cn.qihangerp.model.entity.SysUser;
import cn.qihangerp.domain.SysUser; import cn.qihangerp.model.vo.MetaVo;
import cn.qihangerp.domain.vo.MetaVo; import cn.qihangerp.model.vo.RouterVo;
import cn.qihangerp.domain.vo.RouterVo;
import cn.qihangerp.module.domain.SysMenu; import cn.qihangerp.module.domain.SysMenu;
import cn.qihangerp.module.domain.vo.TreeSelect; import cn.qihangerp.module.domain.vo.TreeSelect;
import cn.qihangerp.module.mapper.SysMenuMapper; import cn.qihangerp.module.mapper.SysMenuMapper;

8
module/sys/src/main/java/cn/qihangerp/module/service/impl/SysRoleServiceImpl.java
View File

@ -1,15 +1,11 @@
package cn.qihangerp.module.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.ServiceException; import cn.qihangerp.common.ServiceException;
import cn.qihangerp.common.constant.UserConstants; import cn.qihangerp.common.constant.UserConstants;
import cn.qihangerp.common.utils.SpringUtils; import cn.qihangerp.common.utils.SpringUtils;
import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.model.entity.SysRole;
import cn.qihangerp.model.entity.SysUser;
import cn.qihangerp.domain.SysRole;
import cn.qihangerp.domain.SysUser;
import cn.qihangerp.module.domain.SysRoleMenu; import cn.qihangerp.module.domain.SysRoleMenu;
import cn.qihangerp.module.domain.SysUserRole; import cn.qihangerp.module.domain.SysUserRole;
import cn.qihangerp.module.mapper.SysRoleMapper; import cn.qihangerp.module.mapper.SysRoleMapper;

6
module/sys/src/main/java/cn/qihangerp/module/service/impl/SysUserServiceImpl.java
View File

@ -4,10 +4,8 @@ package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.ServiceException; import cn.qihangerp.common.ServiceException;
import cn.qihangerp.common.constant.UserConstants; import cn.qihangerp.common.constant.UserConstants;
import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.model.entity.SysRole;
import cn.qihangerp.model.entity.SysUser;
import cn.qihangerp.domain.SysRole;
import cn.qihangerp.domain.SysUser;
import cn.qihangerp.module.domain.SysUserRole; import cn.qihangerp.module.domain.SysUserRole;
import cn.qihangerp.module.mapper.SysRoleMapper; import cn.qihangerp.module.mapper.SysRoleMapper;
import cn.qihangerp.module.mapper.SysUserMapper; import cn.qihangerp.module.mapper.SysUserMapper;

2
module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.module.open.tao.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; 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.TaoGoodsSku;
import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo; import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;

2
module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.module.open.tao.service.impl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; 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.domain.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.tao.domain.TaoGoods; import cn.qihangerp.module.open.tao.domain.TaoGoods;

2
module/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsSkuService.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.module.open.wei.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; 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 cn.qihangerp.module.open.wei.domain.WeiGoodsSku;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;

2
module/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.module.open.wei.service.impl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; 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.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.domain.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsService;