分类tao-api

api/open-api/pom.xml

@@ -109,6 +109,17 @@
             <artifactId>dou-api</artifactId>
             <version>1.0.6</version>
         </dependency>
+        <dependency>
+            <groupId>cn.qihangerp.services</groupId>
+            <artifactId>tao-api</artifactId>
+            <version>1.0.6</version>
+        </dependency>
+
+
+
+
+
+
 
         <dependency>
             <groupId>cn.qihangerp.module</groupId>

microservices/pom.xml

@@ -20,6 +20,7 @@
         <module>order-api</module>
         <module>jd-api</module>
         <module>dou-api</module>
+        <module>tao-api</module>
     </modules>
 
     <properties>

microservices/tao-api/pom.xml

@@ -0,0 +1,39 @@
+<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.services</groupId>
+        <artifactId>microservices</artifactId>
+        <version>1.0.6</version>
+    </parent>
+
+    <artifactId>tao-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>tao-api</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.qihangerp.open</groupId>
+            <artifactId>open-sdk</artifactId>
+            <version>1.0.2</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/libs/open-sdk-1.4.20.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>cn.qihangerp.module</groupId>
+            <artifactId>tao</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.qihangerp.module</groupId>
+            <artifactId>shop</artifactId>
+            <version>1.0</version>
+        </dependency>
+    </dependencies>
+</project>

microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.tao;
+package cn.qihangerp.api.tao;
 
 
 import cn.qihangerp.module.open.tao.domain.TaoOrder;

microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiAutoConfiguration.java

@@ -0,0 +1,18 @@
+package cn.qihangerp.api.tao;
+
+//import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+
+
+//@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class ,MybatisAutoConfiguration.class})
+//@ComponentScan
+//@Configuration
+//@EnableAutoConfiguration
+@Configuration
+//@EnableAutoConfiguration(exclude = MybatisAutoConfiguration.class)
+@ComponentScan(basePackages = "cn.qihangerp.api.tao",
+        excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = TaoApiAutoConfiguration.class))
+public class TaoApiAutoConfiguration {
+}

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

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.tao;
+package cn.qihangerp.api.tao;
 
 import cn.qihangerp.common.ResultVo;
 import cn.qihangerp.common.ResultVoEnum;

microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoRequest.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.tao;
+package cn.qihangerp.api.tao;
 
 public class TaoRequest {
     private Long shopId;//店铺Id

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

@@ -1,6 +1,8 @@
-package cn.qihangerp.open.tao.controller;
+package cn.qihangerp.api.tao.controller;
 
 
+import cn.qihangerp.api.tao.TaoApiCommon;
+import cn.qihangerp.api.tao.TaoRequest;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.api.ShopApiParams;
@@ -13,12 +15,13 @@ import cn.qihangerp.domain.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;
+
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
 import cn.qihangerp.open.common.ApiResultVo;
-import cn.qihangerp.open.tao.TaoApiCommon;
+
 import cn.qihangerp.open.tao.TaoGoodsApiHelper;
-import cn.qihangerp.open.tao.TaoRequest;
+
 import cn.qihangerp.open.tao.response.TaoGoodsResponse;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,12 +1,10 @@
-package cn.qihangerp.open.tao.controller;
+package cn.qihangerp.api.tao.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.bo.LinkErpGoodsSkuBo;
 import cn.qihangerp.module.goods.domain.OGoodsSku;
 import cn.qihangerp.module.goods.service.OGoodsSkuService;
@@ -16,7 +14,6 @@ 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;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;

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

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.tao.controller;
+package cn.qihangerp.api.tao.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.utils.StringUtils;

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

@@ -1,6 +1,9 @@
-package cn.qihangerp.open.tao.controller;
+package cn.qihangerp.api.tao.controller;
 
 
+import cn.qihangerp.api.tao.OrderAssembleHelper;
+import cn.qihangerp.api.tao.TaoApiCommon;
+import cn.qihangerp.api.tao.TaoRequest;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.EnumShopType;
@@ -15,10 +18,9 @@ import cn.qihangerp.module.open.tao.service.TaoOrderService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
 import cn.qihangerp.open.common.ApiResultVo;
-import cn.qihangerp.open.tao.OrderAssembleHelper;
+
-import cn.qihangerp.open.tao.TaoApiCommon;
 import cn.qihangerp.open.tao.TaoOrderApiHelper;
-import cn.qihangerp.open.tao.TaoRequest;
+
 import cn.qihangerp.open.tao.response.TaoOrderDetailResponse;
 import cn.qihangerp.open.tao.response.TaoOrderListResponse;
 import lombok.AllArgsConstructor;

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

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.tao.controller;
+package cn.qihangerp.api.tao.controller;
 
 
 import cn.qihangerp.common.AjaxResult;

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

@@ -1,6 +1,8 @@
-package cn.qihangerp.open.tao.controller;
+package cn.qihangerp.api.tao.controller;
 
 
+import cn.qihangerp.api.tao.TaoApiCommon;
+import cn.qihangerp.api.tao.TaoRequest;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.EnumShopType;
@@ -15,9 +17,9 @@ import cn.qihangerp.module.open.tao.service.TaoRefundService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
 import cn.qihangerp.open.common.ApiResultVo;
-import cn.qihangerp.open.tao.TaoApiCommon;
+
 import cn.qihangerp.open.tao.TaoRefundApiHelper;
-import cn.qihangerp.open.tao.TaoRequest;
+
 import cn.qihangerp.open.tao.response.TaoRefundResponse;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;

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

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.tao.controller;
+package cn.qihangerp.api.tao.controller;
 
 
 import cn.qihangerp.common.AjaxResult;

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

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.tao.controller;
+package cn.qihangerp.api.tao.controller;
 
 
 import cn.qihangerp.common.AjaxResult;

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

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.tao.controller.feign;
+package cn.qihangerp.api.tao.controller.feign;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.module.open.tao.domain.TaoOrder;

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

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.tao.controller.feign;
+package cn.qihangerp.api.tao.controller.feign;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.module.open.tao.domain.TaoRefund;

microservices/tao-api/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.jd.JdApiAutoConfiguration

microservices/tao-api/src/main/resources/application.yml

@@ -0,0 +1,4 @@
+qihangerp:
+  name: 启航电商ERP
+  goods:
+    version: 2.4.21

microservices/tao-api/src/main/resources/banner.txt

@@ -0,0 +1,10 @@
+Application Version: 2.4.21
+Spring Boot Version: ${spring-boot.version}
+ _______ _________          _______  _        _______  _______  _______  _______
+(  ___  )\__   __/|\     /|(  ___  )( (    /|(  ____ \(  ____ \(  ____ )(  ____ )
+| (   ) |   ) (   | )   ( || (   ) ||  \  ( || (    \/| (    \/| (    )|| (    )|
+| |   | |   | |   | (___) || (___) ||   \ | || |      | (__    | (____)|| (____)|
+| |   | |   | |   |  ___  ||  ___  || (\ \) || | ____ |  __)   |     __)|  _____)
+| | /\| |   | |   | (   ) || (   ) || | \   || | \_  )| (      | (\ (   | (
+| (_\ \ |___) (___| )   ( || )   ( || )  \  || (___) || (____/\| ) \ \__| )
+(____\/_)\_______/|/     \||/     \||/    )_)(_______)(_______/|/   \__/|/

module/pom.xml

@@ -23,6 +23,7 @@
         <module>stock</module>
         <module>jd</module>
         <module>dou</module>
+        <module>tao</module>
 
     </modules>
     <properties>

module/tao/pom.xml

@@ -0,0 +1,39 @@
+<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.module</groupId>
+        <artifactId>module</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>tao</artifactId>
+    <packaging>jar</packaging>
+
+    <name>tao</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.qihangerp.core</groupId>
+            <artifactId>common</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.qihangerp.module</groupId>
+            <artifactId>goods</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>
+</project>

module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderPromotion.java

@@ -1,10 +1,10 @@
 package cn.qihangerp.module.open.tao.domain;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 订单优惠信息
  * @TableName tao_order_promotion

module/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsSkuMapper.java

@@ -2,11 +2,9 @@ package cn.qihangerp.module.open.tao.mapper;
 
 import cn.qihangerp.module.open.tao.domain.TaoGoodsSku;
 import cn.qihangerp.module.open.tao.domain.vo.TaoGoodsSkuListVo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import org.apache.ibatis.annotations.Param;
 
 /**

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

@@ -2,7 +2,6 @@ package cn.qihangerp.module.open.tao.service;
 
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
-
 import cn.qihangerp.module.open.tao.domain.TaoGoods;
 import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo;
 import com.baomidou.mybatisplus.extension.service.IService;

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

@@ -2,7 +2,6 @@ package cn.qihangerp.module.open.tao.service;
 
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
-
 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;

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

@@ -3,9 +3,8 @@ 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.module.open.tao.domain.bo.TaoOrderBo;
 import cn.qihangerp.module.open.tao.domain.TaoOrder;
+import cn.qihangerp.module.open.tao.domain.bo.TaoOrderBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 

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

@@ -2,7 +2,6 @@ package cn.qihangerp.module.open.tao.service;
 
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
-
 import cn.qihangerp.module.open.tao.domain.TaoRefund;
 import cn.qihangerp.module.open.tao.domain.bo.TaoRefundBo;
 import com.baomidou.mybatisplus.extension.service.IService;

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

@@ -1,23 +1,21 @@
 package cn.qihangerp.module.open.tao.service.impl;
 
 
+import cn.qihangerp.common.PageQuery;
+import cn.qihangerp.common.PageResult;
+import cn.qihangerp.common.ResultVoEnum;
+import cn.qihangerp.common.utils.StringUtils;
 import cn.qihangerp.module.goods.domain.OGoodsSku;
 import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
+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.mapper.TaoGoodsMapper;
 import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper;
 import cn.qihangerp.module.open.tao.service.TaoGoodsService;
-import cn.qihangerp.module.open.tao.domain.TaoGoods;
-import cn.qihangerp.module.open.tao.domain.TaoGoodsSku;
 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.ResultVoEnum;
-import cn.qihangerp.common.utils.StringUtils;
-import cn.qihangerp.common.PageQuery;
-import cn.qihangerp.common.PageResult;
-
-
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -1,15 +1,14 @@
 package cn.qihangerp.module.open.tao.service.impl;
 
+import cn.qihangerp.common.PageQuery;
+import cn.qihangerp.common.PageResult;
+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.TaoGoodsSkuMapper;
 import cn.qihangerp.module.open.tao.service.TaoGoodsSkuService;
-import cn.qihangerp.module.open.tao.domain.TaoGoodsSku;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.qihangerp.common.PageQuery;
-import cn.qihangerp.common.PageResult;
-
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 

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

@@ -1,10 +1,9 @@
 package cn.qihangerp.module.open.tao.service.impl;
 
+import cn.qihangerp.module.open.tao.domain.TaoOrderItem;
 import cn.qihangerp.module.open.tao.mapper.TaoOrderItemMapper;
 import cn.qihangerp.module.open.tao.service.TaoOrderItemService;
-import cn.qihangerp.module.open.tao.domain.TaoOrderItem;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,10 +1,9 @@
 package cn.qihangerp.module.open.tao.service.impl;
 
+import cn.qihangerp.module.open.tao.domain.TaoOrderPromotion;
 import cn.qihangerp.module.open.tao.mapper.TaoOrderPromotionMapper;
 import cn.qihangerp.module.open.tao.service.TaoOrderPromotionService;
-import cn.qihangerp.module.open.tao.domain.TaoOrderPromotion;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,24 +1,23 @@
 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.common.ResultVoEnum;
+import cn.qihangerp.module.open.tao.domain.TaoGoodsSku;
+import cn.qihangerp.module.open.tao.domain.TaoOrder;
+import cn.qihangerp.module.open.tao.domain.TaoOrderItem;
+import cn.qihangerp.module.open.tao.domain.TaoOrderPromotion;
 import cn.qihangerp.module.open.tao.domain.bo.TaoOrderBo;
 import cn.qihangerp.module.open.tao.mapper.TaoOrderItemMapper;
 import cn.qihangerp.module.open.tao.mapper.TaoOrderMapper;
 import cn.qihangerp.module.open.tao.mapper.TaoOrderPromotionMapper;
 import cn.qihangerp.module.open.tao.service.TaoGoodsSkuService;
 import cn.qihangerp.module.open.tao.service.TaoOrderService;
-import cn.qihangerp.module.open.tao.domain.TaoGoodsSku;
-import cn.qihangerp.module.open.tao.domain.TaoOrder;
-import cn.qihangerp.module.open.tao.domain.TaoOrderItem;
-import cn.qihangerp.module.open.tao.domain.TaoOrderPromotion;
 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.common.ResultVoEnum;
-import cn.qihangerp.common.ResultVo;
-
 import lombok.AllArgsConstructor;
 import lombok.extern.java.Log;
 import org.springframework.stereotype.Service;
@@ -50,14 +49,14 @@ public class TaoOrderServiceImpl extends ServiceImpl<TaoOrderMapper, TaoOrder>
     private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN);
     @Override
     public PageResult<TaoOrder> queryPageList(TaoOrderBo bo, PageQuery pageQuery) {
-        if(org.springframework.util.StringUtils.hasText(bo.getStartTime())){
+        if(StringUtils.hasText(bo.getStartTime())){
             Matcher matcher = DATE_FORMAT.matcher(bo.getStartTime());
             boolean b = matcher.find();
             if(b){
                 bo.setStartTime(bo.getStartTime()+" 00:00:00");
             }
         }
-        if(org.springframework.util.StringUtils.hasText(bo.getEndTime())){
+        if(StringUtils.hasText(bo.getEndTime())){
             Matcher matcher = DATE_FORMAT.matcher(bo.getEndTime());
             boolean b = matcher.find();
             if(b){
@@ -69,8 +68,8 @@ public class TaoOrderServiceImpl extends ServiceImpl<TaoOrderMapper, TaoOrder>
                 .eq(bo.getShopId()!=null,TaoOrder::getShopId,bo.getShopId())
                 .eq(StringUtils.hasText(bo.getTid()),TaoOrder::getTid,bo.getTid())
                 .eq(StringUtils.hasText(bo.getStatus()),TaoOrder::getStatus,bo.getStatus())
-                .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),TaoOrder::getCreated,bo.getStartTime()+" 00:00:00")
+                .ge(StringUtils.hasText(bo.getStartTime()),TaoOrder::getCreated,bo.getStartTime()+" 00:00:00")
-                .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),TaoOrder::getCreated,bo.getEndTime()+" 23:59:59")
+                .le(StringUtils.hasText(bo.getEndTime()),TaoOrder::getCreated,bo.getEndTime()+" 23:59:59")
                 ;
         pageQuery.setOrderByColumn("created");
         pageQuery.setIsAsc("desc");

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

@@ -1,19 +1,18 @@
 package cn.qihangerp.module.open.tao.service.impl;
 
 
-import cn.qihangerp.module.open.tao.domain.TaoRefund;
-import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper;
-import cn.qihangerp.module.open.tao.mapper.TaoRefundMapper;
-import cn.qihangerp.module.open.tao.service.TaoRefundService;
-import cn.qihangerp.module.open.tao.domain.TaoGoodsSku;
-import cn.qihangerp.module.open.tao.domain.bo.TaoRefundBo;
-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.common.ResultVoEnum;
-
+import cn.qihangerp.module.open.tao.domain.TaoGoodsSku;
+import cn.qihangerp.module.open.tao.domain.TaoRefund;
+import cn.qihangerp.module.open.tao.domain.bo.TaoRefundBo;
+import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper;
+import cn.qihangerp.module.open.tao.mapper.TaoRefundMapper;
+import cn.qihangerp.module.open.tao.service.TaoRefundService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

pom.xml

@@ -14,6 +14,7 @@
     <module>core</module>
     <module>module</module>
     <module>microservices</module>
+
   </modules>
 
   <properties>