升级新机构

core/interfaces/pom.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.qihangerp.core</groupId>
+        <artifactId>core</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <groupId>cn.qihangerp.service</groupId>
+    <artifactId>interfaces</artifactId>
+    <version>1.0.0</version>
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>cn.qihangerp.core</groupId>
+            <artifactId>common</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.qihangerp.model</groupId>
+            <artifactId>model</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+    </dependencies>
+</project>

core/interfaces/src/main/java/cn/qihangerp/service/ISysUserService.java

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

core/model/pom.xml

@@ -4,15 +4,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>cn.qihangerp</groupId>
+        <groupId>cn.qihangerp.core</groupId>
-        <artifactId>qihangerp-cloud</artifactId>
+        <artifactId>core</artifactId>
-        <version>2.0.6</version>
+        <version>1.0</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <groupId>cn.qihangerp.model</groupId>
     <artifactId>model</artifactId>
-
+    <version>1.0.0</version>
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>

core/model/src/main/java/cn/qihangerp/model/bo/LinkErpGoodsSkuBo.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.domain.bo;
+package cn.qihangerp.model.bo;
 
 import lombok.Data;
 

core/model/src/main/java/cn/qihangerp/model/request/OrderSearchRequest.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.request;
+package cn.qihangerp.model.request;
 
 import lombok.Data;
 

core/model/src/main/java/cn/qihangerp/model/request/RefundSearchRequest.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.request;
+package cn.qihangerp.model.request;
 
 import lombok.Data;
 

core/model/src/main/java/cn/qihangerp/model/vo/MetaVo.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.domain.vo;
+package cn.qihangerp.model.vo;
 
 
 import cn.qihangerp.common.utils.StringUtils;

core/model/src/main/java/cn/qihangerp/model/vo/RouterVo.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.domain.vo;
+package cn.qihangerp.model.vo;
 
 import java.util.List;
 

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

@@ -3,12 +3,10 @@ package cn.qihangerp.api.dou.controller;
 
 import cn.qihangerp.common.*;
 import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo;
-import cn.qihangerp.module.goods.domain.OGoodsSku;
 import cn.qihangerp.module.goods.service.OGoodsSkuService;
 import cn.qihangerp.module.open.dou.domain.DouGoods;
 import cn.qihangerp.module.open.dou.domain.DouGoodsSku;
 import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo;
-import cn.qihangerp.module.open.dou.domain.vo.DouGoodsSkuListVo;
 import cn.qihangerp.module.open.dou.service.DouGoodsService;
 import cn.qihangerp.module.open.dou.service.DouGoodsSkuService;
 import cn.qihangerp.security.common.BaseController;

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

@@ -3,12 +3,10 @@ package cn.qihangerp.api.jd.controller;
 
 import cn.qihangerp.common.*;
 import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo;
-import cn.qihangerp.module.goods.domain.OGoodsSku;
 import cn.qihangerp.module.goods.service.OGoodsSkuService;
 import cn.qihangerp.module.open.jd.domain.JdGoods;
 import cn.qihangerp.module.open.jd.domain.JdGoodsSku;
 import cn.qihangerp.module.open.jd.domain.bo.JdGoodsBo;
-import cn.qihangerp.module.open.jd.domain.vo.JdGoodsSkuListVo;
 import cn.qihangerp.module.open.jd.service.JdGoodsService;
 import cn.qihangerp.module.open.jd.service.JdGoodsSkuService;
 import cn.qihangerp.security.common.BaseController;

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

@@ -4,8 +4,6 @@ package cn.qihangerp.api.order.controller;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.TableDataInfo;
-import cn.qihangerp.common.bo.ShipOrderAllocateShipBo;
-import cn.qihangerp.common.bo.ShopOrderShipBo;
 import cn.qihangerp.module.order.domain.bo.OrderAllocateShipRequest;
 import cn.qihangerp.module.order.domain.bo.OrderShipRequest;
 import cn.qihangerp.module.order.service.OOrderItemService;

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

@@ -3,12 +3,10 @@ package cn.qihangerp.api.pdd.controller;
 
 import cn.qihangerp.common.*;
 import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo;
-import cn.qihangerp.module.goods.domain.OGoodsSku;
 import cn.qihangerp.module.goods.service.OGoodsSkuService;
 import cn.qihangerp.module.open.pdd.domain.PddGoods;
 import cn.qihangerp.module.open.pdd.domain.PddGoodsSku;
 import cn.qihangerp.module.open.pdd.domain.bo.PddGoodsBo;
-import cn.qihangerp.module.open.pdd.domain.vo.PddGoodsSkuListVo;
 import cn.qihangerp.module.open.pdd.service.PddGoodsService;
 import cn.qihangerp.module.open.pdd.service.PddGoodsSkuService;
 import cn.qihangerp.security.common.BaseController;

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

@@ -3,12 +3,10 @@ package cn.qihangerp.api.tao.controller;
 
 import cn.qihangerp.common.*;
 import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo;
-import cn.qihangerp.module.goods.domain.OGoodsSku;
 import cn.qihangerp.module.goods.service.OGoodsSkuService;
 import cn.qihangerp.module.open.tao.domain.TaoGoods;
 import cn.qihangerp.module.open.tao.domain.TaoGoodsSku;
 import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo;
-import cn.qihangerp.module.open.tao.domain.vo.TaoGoodsSkuListVo;
 import cn.qihangerp.module.open.tao.service.TaoGoodsService;
 import cn.qihangerp.module.open.tao.service.TaoGoodsSkuService;
 import cn.qihangerp.security.common.BaseController;

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

@@ -3,7 +3,6 @@ package cn.qihangerp.api.wei.controller;
 
 import cn.qihangerp.common.*;
 import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo;
-import cn.qihangerp.module.goods.domain.OGoodsSku;
 import cn.qihangerp.module.goods.service.OGoodsSkuService;
 import cn.qihangerp.module.open.wei.domain.WeiGoods;
 import cn.qihangerp.module.open.wei.domain.WeiGoodsSku;

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

@@ -6,7 +6,6 @@ import cn.qihangerp.common.ResultVo;
 import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo;
 import cn.qihangerp.module.open.dou.domain.DouGoodsSku;
 import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo;
-import cn.qihangerp.module.open.dou.domain.vo.DouGoodsSkuListVo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 

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

@@ -11,12 +11,10 @@ import cn.qihangerp.module.goods.service.OGoodsSkuService;
 import cn.qihangerp.module.open.dou.domain.DouGoods;
 import cn.qihangerp.module.open.dou.domain.DouGoodsSku;
 import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo;
-import cn.qihangerp.module.open.dou.domain.vo.DouGoodsSkuListVo;
 import cn.qihangerp.module.open.dou.mapper.DouGoodsMapper;
 import cn.qihangerp.module.open.dou.mapper.DouGoodsSkuMapper;
 import cn.qihangerp.module.open.dou.service.DouGoodsSkuService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;

module/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java

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

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

@@ -1,7 +1,6 @@
 package cn.qihangerp.module.goods.service.impl;
 
 
-import cn.qihangerp.common.ResultVo;
 import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo;
 import cn.qihangerp.module.goods.domain.OGoodsSku;
 import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;

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

@@ -6,7 +6,6 @@ import cn.qihangerp.common.ResultVo;
 import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo;
 import cn.qihangerp.module.open.jd.domain.JdGoodsSku;
 import cn.qihangerp.module.open.jd.domain.bo.JdGoodsBo;
-import cn.qihangerp.module.open.jd.domain.vo.JdGoodsSkuListVo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

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

@@ -9,15 +9,12 @@ import cn.qihangerp.module.goods.service.OGoodsSkuService;
 import cn.qihangerp.module.open.jd.domain.JdGoods;
 import cn.qihangerp.module.open.jd.mapper.JdGoodsMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 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.module.open.jd.domain.JdGoodsSku;
 import cn.qihangerp.module.open.jd.domain.bo.JdGoodsBo;
-import cn.qihangerp.module.open.jd.domain.vo.JdGoodsSkuListVo;
 import cn.qihangerp.module.open.jd.service.JdGoodsSkuService;
 import cn.qihangerp.module.open.jd.mapper.JdGoodsSkuMapper;
 import lombok.AllArgsConstructor;

module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java

@@ -1,8 +1,6 @@
 package cn.qihangerp.module.order.service;
 
 
-import cn.qihangerp.common.bo.ShipOrderAllocateShipBo;
-import cn.qihangerp.common.bo.ShopOrderShipBo;
 import cn.qihangerp.module.order.domain.OOrder;
 import cn.qihangerp.module.order.domain.OOrderItem;
 import cn.qihangerp.module.order.domain.bo.OrderAllocateShipRequest;

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

@@ -5,8 +5,6 @@ import cn.qihangerp.common.PageResult;
 import cn.qihangerp.common.ResultVo;
 import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo;
 import cn.qihangerp.module.open.pdd.domain.PddGoodsSku;
-import cn.qihangerp.module.open.pdd.domain.bo.PddGoodsBo;
-import cn.qihangerp.module.open.pdd.domain.vo.PddGoodsSkuListVo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 

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

@@ -10,8 +10,6 @@ import cn.qihangerp.module.goods.service.OGoodsService;
 import cn.qihangerp.module.goods.service.OGoodsSkuService;
 import cn.qihangerp.module.open.pdd.domain.PddGoods;
 import cn.qihangerp.module.open.pdd.domain.PddGoodsSku;
-import cn.qihangerp.module.open.pdd.domain.bo.PddGoodsBo;
-import cn.qihangerp.module.open.pdd.domain.vo.PddGoodsSkuListVo;
 import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper;
 import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper;
 import cn.qihangerp.module.open.pdd.service.PddGoodsSkuService;

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

@@ -6,7 +6,6 @@ import cn.qihangerp.common.ResultVo;
 import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo;
 import cn.qihangerp.module.open.tao.domain.TaoGoodsSku;
 import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo;
-import cn.qihangerp.module.open.tao.domain.vo.TaoGoodsSkuListVo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 

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

@@ -1,6 +1,5 @@
 package cn.qihangerp.module.open.tao.service.impl;
 
-import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 import cn.qihangerp.common.ResultVo;
@@ -10,7 +9,6 @@ import cn.qihangerp.module.goods.service.OGoodsSkuService;
 import cn.qihangerp.module.open.tao.domain.TaoGoods;
 import cn.qihangerp.module.open.tao.domain.TaoGoodsSku;
 import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo;
-import cn.qihangerp.module.open.tao.domain.vo.TaoGoodsSkuListVo;
 import cn.qihangerp.module.open.tao.mapper.TaoGoodsMapper;
 import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper;
 import cn.qihangerp.module.open.tao.service.TaoGoodsSkuService;

pom.xml

@@ -15,6 +15,7 @@
     <module>module</module>
     <module>microservices</module>
       <module>core/model</module>
+    <module>core/interfaces</module>
 
   </modules>