优化项目结构

yshop-api/src/main/java/co/yixiang/modules/notify/AliyunSmsSender.java

@@ -1,6 +1,6 @@
 package co.yixiang.modules.notify;
 
-import co.yixiang.utils.JacksonUtil;
+import co.yixiang.tools.utils.JacksonUtil;
 import com.aliyuncs.CommonRequest;
 import com.aliyuncs.CommonResponse;
 import com.aliyuncs.DefaultAcsClient;

yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java

@@ -16,8 +16,8 @@ import cn.hutool.core.util.StrUtil;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import co.yixiang.common.web.vo.Paging;
 import co.yixiang.constant.ShopConstants;
-import co.yixiang.domain.AlipayConfig;
+import co.yixiang.tools.domain.AlipayConfig;
-import co.yixiang.domain.vo.TradeVo;
+import co.yixiang.tools.domain.vo.TradeVo;
 import co.yixiang.enums.*;
 import co.yixiang.exception.ErrorRequestException;
 import co.yixiang.modules.activity.service.*;
@@ -59,7 +59,7 @@ import co.yixiang.modules.user.web.vo.YxWechatUserQueryVo;
 import co.yixiang.mp.service.YxPayService;
 import co.yixiang.mp.service.YxTemplateService;
 import co.yixiang.mp.service.YxMiniPayService;
-import co.yixiang.service.AlipayConfigService;
+import co.yixiang.tools.service.AlipayConfigService;
 import co.yixiang.utils.OrderUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;

yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java

@@ -16,14 +16,12 @@ import co.yixiang.annotation.AnonymousAccess;
 import co.yixiang.aop.log.Log;
 import co.yixiang.common.api.ApiResult;
 import co.yixiang.common.web.controller.BaseController;
-import co.yixiang.enums.AppFromEnum;
 import co.yixiang.enums.OrderInfoEnum;
 import co.yixiang.enums.PayTypeEnum;
 import co.yixiang.enums.RedisKeyEnum;
-import co.yixiang.exception.BadRequestException;
 import co.yixiang.exception.ErrorRequestException;
-import co.yixiang.express.ExpressService;
+import co.yixiang.tools.express.ExpressService;
-import co.yixiang.express.dao.ExpressInfo;
+import co.yixiang.tools.express.dao.ExpressInfo;
 import co.yixiang.modules.activity.entity.YxStoreBargainUser;
 import co.yixiang.modules.activity.service.YxStoreBargainUserService;
 import co.yixiang.modules.activity.service.YxStorePinkService;

yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java

@@ -1,8 +1,6 @@
 package co.yixiang.mp.domain;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import javax.persistence.*;
@@ -19,7 +17,7 @@ import java.io.Serializable;
 public class YxWechatMenu implements Serializable {
 
     @Id
-    @TableField(value = "`key`")
+    @TableId(value = "`key`")
     private String key;
 
 

yshop-mp/src/main/java/co/yixiang/mp/repository/YxArticleRepository.java

@@ -1,13 +0,0 @@
-package co.yixiang.mp.repository;
-
-
-import co.yixiang.mp.domain.YxArticle;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
-* @author hupeng
-* @date 2019-10-07
-*/
-public interface YxArticleRepository extends JpaRepository<YxArticle, Integer>, JpaSpecificationExecutor {
-}

yshop-mp/src/main/java/co/yixiang/mp/repository/YxWechatMenuRepository.java

@@ -1,13 +0,0 @@
-package co.yixiang.mp.repository;
-
-
-import co.yixiang.mp.domain.YxWechatMenu;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
-* @author hupeng
-* @date 2019-10-06
-*/
-public interface YxWechatMenuRepository extends JpaRepository<YxWechatMenu, String>, JpaSpecificationExecutor {
-}

yshop-mp/src/main/java/co/yixiang/mp/repository/YxWechatReplyRepository.java

@@ -1,19 +0,0 @@
-package co.yixiang.mp.repository;
-
-import co.yixiang.mp.domain.YxWechatReply;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
-* @author hupeng
-* @date 2019-10-10
-*/
-public interface YxWechatReplyRepository extends JpaRepository<YxWechatReply, Integer>, JpaSpecificationExecutor {
-
-    /**
-     * findByKey
-     * @param key
-     * @return
-     */
-    YxWechatReply findByKey(String key);
-}

yshop-mp/src/main/java/co/yixiang/mp/repository/YxWechatTemplateRepository.java

@@ -1,13 +0,0 @@
-package co.yixiang.mp.repository;
-
-import co.yixiang.mp.domain.YxWechatTemplate;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
-* @author xuwenbo
-* @date 2019-12-10
-*/
-public interface YxWechatTemplateRepository extends JpaRepository<YxWechatTemplate, Integer>, JpaSpecificationExecutor {
-    YxWechatTemplate findByTempkey(String key);
-}

yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java

@@ -15,7 +15,7 @@ import co.yixiang.utils.FileUtil;
 import co.yixiang.mp.service.YxArticleService;
 import co.yixiang.mp.service.dto.YxArticleDto;
 import co.yixiang.mp.service.dto.YxArticleQueryCriteria;
-import co.yixiang.mp.service.mapper.YxArticleMapper;
+import co.yixiang.mp.service.mapper.ArticleMapper;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -53,7 +53,7 @@ import java.util.LinkedHashMap;
 @Service
 //@CacheConfig(cacheNames = "yxArticle")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxArticleServiceImpl extends BaseServiceImpl<YxArticleMapper, YxArticle> implements YxArticleService {
+public class YxArticleServiceImpl extends BaseServiceImpl<ArticleMapper, YxArticle> implements YxArticleService {
 
     private final IGenerator generator;
     @Value("${file.path}")

yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java

@@ -5,27 +5,21 @@ import co.yixiang.common.service.impl.BaseServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.mp.service.YxWechatMenuService;
 import co.yixiang.mp.service.dto.YxWechatMenuDto;
 import co.yixiang.mp.service.dto.YxWechatMenuQueryCriteria;
-import co.yixiang.mp.service.mapper.YxWechatMenuMapper;
+import co.yixiang.mp.service.mapper.WechatMenuMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import cn.hutool.core.util.IdUtil;
 // 默认不使用缓存
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
-import co.yixiang.utils.QueryHelp;
 
 import java.util.*;
 import java.io.IOException;
@@ -39,7 +33,7 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxWechatMenu")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxWechatMenuServiceImpl extends BaseServiceImpl<YxWechatMenuMapper, YxWechatMenu> implements YxWechatMenuService {
+public class YxWechatMenuServiceImpl extends BaseServiceImpl<WechatMenuMapper, YxWechatMenu> implements YxWechatMenuService {
 
     private final IGenerator generator;
 

yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java

@@ -6,15 +6,13 @@ import co.yixiang.common.service.impl.BaseServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.mp.service.YxWechatReplyService;
 import co.yixiang.mp.service.dto.YxWechatReplyDto;
 import co.yixiang.mp.service.dto.YxWechatReplyQueryCriteria;
-import co.yixiang.mp.service.mapper.YxWechatReplyMapper;
+import co.yixiang.mp.service.mapper.WechatReplyMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,10 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
-import co.yixiang.utils.QueryHelp;
 
 import java.util.*;
 import java.io.IOException;
@@ -39,7 +34,7 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxWechatReply")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxWechatReplyServiceImpl extends BaseServiceImpl<YxWechatReplyMapper, YxWechatReply> implements YxWechatReplyService {
+public class YxWechatReplyServiceImpl extends BaseServiceImpl<WechatReplyMapper, YxWechatReply> implements YxWechatReplyService {
 
     private final IGenerator generator;
 

yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatTemplateServiceImpl.java

@@ -5,15 +5,13 @@ import co.yixiang.common.service.impl.BaseServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.mp.service.YxWechatTemplateService;
 import co.yixiang.mp.service.dto.YxWechatTemplateDto;
 import co.yixiang.mp.service.dto.YxWechatTemplateQueryCriteria;
-import co.yixiang.mp.service.mapper.YxWechatTemplateMapper;
+import co.yixiang.mp.service.mapper.WechatTemplateMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,10 +19,8 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -40,7 +36,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxWechatTemplate")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxWechatTemplateServiceImpl extends BaseServiceImpl<YxWechatTemplateMapper, YxWechatTemplate> implements YxWechatTemplateService {
+public class YxWechatTemplateServiceImpl extends BaseServiceImpl<WechatTemplateMapper, YxWechatTemplate> implements YxWechatTemplateService {
 
     private final IGenerator generator;
 

yshop-mp/src/main/java/co/yixiang/mp/service/mapper/ArticleMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxArticleMapper extends CoreMapper<YxArticle> {
+public interface ArticleMapper extends CoreMapper<YxArticle> {
 
-}
+}

yshop-mp/src/main/java/co/yixiang/mp/service/mapper/WechatMenuMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxWechatMenuMapper extends CoreMapper<YxWechatMenu> {
+public interface WechatMenuMapper extends CoreMapper<YxWechatMenu> {
 
-}
+}

yshop-mp/src/main/java/co/yixiang/mp/service/mapper/WechatReplyMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxWechatReplyMapper extends CoreMapper<YxWechatReply> {
+public interface WechatReplyMapper extends CoreMapper<YxWechatReply> {
 
-}
+}

yshop-mp/src/main/java/co/yixiang/mp/service/mapper/WechatTemplateMapper.java

@@ -1,16 +1,16 @@
-package co.yixiang.mp.service.mapper;
+package co.yixiang.mp.service.mapper;
-
+
-import co.yixiang.common.mapper.CoreMapper;
+import co.yixiang.common.mapper.CoreMapper;
-import co.yixiang.mp.domain.YxWechatTemplate;
+import co.yixiang.mp.domain.YxWechatTemplate;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Repository;
-
+
-/**
+/**
-* @author xuwenbo
+* @author xuwenbo
-* @date 2020-05-12
+* @date 2020-05-12
-*/
+*/
-@Repository
+@Repository
-@Mapper
+@Mapper
-public interface YxWechatTemplateMapper extends CoreMapper<YxWechatTemplate> {
+public interface WechatTemplateMapper extends CoreMapper<YxWechatTemplate> {
-
+
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCombinationRepository.java

@@ -10,9 +10,9 @@ import org.springframework.data.jpa.repository.Query;
 * @author hupeng
 * @date 2019-11-18
 */
-public interface YxStoreCombinationRepository extends JpaRepository<YxStoreCombination, Integer>, JpaSpecificationExecutor {
+public interface StoreCombinationRepository extends JpaRepository<YxStoreCombination, Integer>, JpaSpecificationExecutor {
     @Modifying
     @Query(value = "update yx_store_combination set is_show = ?1 where id = ?2",nativeQuery = true)
     void updateOnsale(int status, int id);
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponIssueRepository.java

@@ -8,5 +8,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 * @author hupeng
 * @date 2019-11-09
 */
-public interface YxStoreCouponIssueRepository extends JpaRepository<YxStoreCouponIssue, Integer>, JpaSpecificationExecutor {
+public interface StoreCouponIssueRepository extends JpaRepository<YxStoreCouponIssue, Integer>, JpaSpecificationExecutor {
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponIssueUserRepository.java

@@ -8,5 +8,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 * @author hupeng
 * @date 2019-11-09
 */
-public interface YxStoreCouponIssueUserRepository extends JpaRepository<YxStoreCouponIssueUser, Integer>, JpaSpecificationExecutor {
+public interface StoreCouponIssueUserRepository extends JpaRepository<YxStoreCouponIssueUser, Integer>, JpaSpecificationExecutor {
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponRepository.java

@@ -8,5 +8,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 * @author hupeng
 * @date 2019-11-09
 */
-public interface YxStoreCouponRepository extends JpaRepository<YxStoreCoupon, Integer>, JpaSpecificationExecutor {
+public interface StoreCouponRepository extends JpaRepository<YxStoreCoupon, Integer>, JpaSpecificationExecutor {
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponUserRepository.java

@@ -8,5 +8,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 * @author hupeng
 * @date 2019-11-10
 */
-public interface YxStoreCouponUserRepository extends JpaRepository<YxStoreCouponUser, Integer>, JpaSpecificationExecutor {
+public interface StoreCouponUserRepository extends JpaRepository<YxStoreCouponUser, Integer>, JpaSpecificationExecutor {
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StorePinkRepository.java

@@ -8,7 +8,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 * @author hupeng
 * @date 2019-11-18
 */
-public interface YxStorePinkRepository extends JpaRepository<YxStorePink, Integer>, JpaSpecificationExecutor {
+public interface StorePinkRepository extends JpaRepository<YxStorePink, Integer>, JpaSpecificationExecutor {
      int countByCid(int cid);
 
      int countByCidAndKId(int cid, int kid);
@@ -17,4 +17,4 @@ public interface YxStorePinkRepository extends JpaRepository<YxStorePink, Intege
 
      YxStorePink findByOrderIdKey(int id);
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreSeckillRepository.java

@@ -8,5 +8,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 * @author xuwenbo
 * @date 2019-12-14
 */
-public interface YxStoreSeckillRepository extends JpaRepository<YxStoreSeckill, Integer>, JpaSpecificationExecutor {
+public interface StoreSeckillRepository extends JpaRepository<YxStoreSeckill, Integer>, JpaSpecificationExecutor {
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreVisitRepository.java

@@ -8,6 +8,6 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 * @author hupeng
 * @date 2019-11-18
 */
-public interface YxStoreVisitRepository extends JpaRepository<YxStoreVisit, Integer>, JpaSpecificationExecutor {
+public interface StoreVisitRepository extends JpaRepository<YxStoreVisit, Integer>, JpaSpecificationExecutor {
         int countByProductIdAndProductType(int productId, String productType);
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/activity/repository/UserExtractRepository.java

@@ -8,5 +8,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 * @author hupeng
 * @date 2019-11-14
 */
-public interface YxUserExtractRepository extends JpaRepository<YxUserExtract, Integer>, JpaSpecificationExecutor {
+public interface UserExtractRepository extends JpaRepository<YxUserExtract, Integer>, JpaSpecificationExecutor {
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java

@@ -1,8 +1,6 @@
 package co.yixiang.modules.shop.domain;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import javax.persistence.*;
@@ -14,15 +12,11 @@ import java.io.Serializable;
 * @author hupeng
 * @date 2020-05-12
 */
-@Entity
 @Data
-@Table(name="yx_user")
 public class YxUser implements Serializable {
 
     /** 用户id */
-    @Id
+    @TableId(value = "uid", type = IdType.AUTO)
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "uid")
     private Integer uid;
 
 
@@ -210,4 +204,4 @@ public class YxUser implements Serializable {
     public void copy(YxUser source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java

@@ -1,12 +1,13 @@
 package co.yixiang.modules.shop.domain;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
+
-import javax.validation.constraints.*;
+import javax.persistence.Column;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.io.Serializable;
 
@@ -14,15 +15,11 @@ import java.io.Serializable;
 * @author hupeng
 * @date 2020-05-12
 */
-@Entity
 @Data
-@Table(name="yx_wechat_user")
 public class YxWechatUser implements Serializable {
 
     /** 微信用户id */
-    @Id
+    @TableId
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "uid")
     private Integer uid;
 
 
@@ -151,4 +148,4 @@ public class YxWechatUser implements Serializable {
     public void copy(YxWechatUser source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java

@@ -10,8 +10,8 @@ import co.yixiang.constant.ShopConstants;
 import co.yixiang.dozer.service.IGenerator;
 import co.yixiang.enums.OrderInfoEnum;
 import co.yixiang.exception.BadRequestException;
-import co.yixiang.express.ExpressService;
+import co.yixiang.tools.express.ExpressService;
-import co.yixiang.express.dao.ExpressInfo;
+import co.yixiang.tools.express.dao.ExpressInfo;
 import co.yixiang.modules.activity.service.YxStorePinkService;
 import co.yixiang.modules.shop.domain.YxStoreOrder;
 import co.yixiang.modules.shop.domain.YxStoreOrderStatus;

yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java

@@ -3,7 +3,6 @@ import co.yixiang.common.service.BaseService;
 import co.yixiang.modules.shop.domain.YxSystemConfig;
 import co.yixiang.modules.shop.service.dto.YxSystemConfigDto;
 import co.yixiang.modules.shop.service.dto.YxSystemConfigQueryCriteria;
-import co.yixiang.utils.AliPayStatusEnum;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
 import java.util.List;

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java

@@ -1,19 +1,16 @@
 package co.yixiang.modules.shop.service.impl;
 
 import co.yixiang.modules.shop.domain.YxExpress;
-import co.yixiang.exception.EntityExistException;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxExpressService;
 import co.yixiang.modules.shop.service.dto.YxExpressDto;
 import co.yixiang.modules.shop.service.dto.YxExpressQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxExpressMapper;
+import co.yixiang.modules.shop.service.mapper.ExpressMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -40,7 +35,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxExpress")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxExpressServiceImpl extends BaseServiceImpl<YxExpressMapper, YxExpress> implements YxExpressService {
+public class YxExpressServiceImpl extends BaseServiceImpl<ExpressMapper, YxExpress> implements YxExpressService {
 
     private final IGenerator generator;
 
@@ -76,4 +71,4 @@ public class YxExpressServiceImpl extends BaseServiceImpl<YxExpressMapper, YxExp
         }
         FileUtil.downloadExcel(list, response);
     }
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialGroupServiceImpl.java

@@ -4,27 +4,22 @@ import co.yixiang.modules.shop.domain.YxMaterialGroup;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxMaterialGroupService;
 import co.yixiang.modules.shop.service.dto.YxMaterialGroupDto;
 import co.yixiang.modules.shop.service.dto.YxMaterialGroupQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxMaterialGroupMapper;
+import co.yixiang.modules.shop.service.mapper.MaterialGroupMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import cn.hutool.core.util.IdUtil;
 // 默认不使用缓存
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -40,7 +35,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxMaterialGroup")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxMaterialGroupServiceImpl extends BaseServiceImpl<YxMaterialGroupMapper, YxMaterialGroup> implements YxMaterialGroupService {
+public class YxMaterialGroupServiceImpl extends BaseServiceImpl<MaterialGroupMapper, YxMaterialGroup> implements YxMaterialGroupService {
 
     private final IGenerator generator;
 

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java

@@ -4,27 +4,22 @@ import co.yixiang.modules.shop.domain.YxMaterial;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxMaterialService;
 import co.yixiang.modules.shop.service.dto.YxMaterialDto;
 import co.yixiang.modules.shop.service.dto.YxMaterialQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxMaterialMapper;
+import co.yixiang.modules.shop.service.mapper.MaterialMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import cn.hutool.core.util.IdUtil;
 // 默认不使用缓存
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -40,7 +35,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxMaterial")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxMaterialServiceImpl extends BaseServiceImpl<YxMaterialMapper, YxMaterial> implements YxMaterialService {
+public class YxMaterialServiceImpl extends BaseServiceImpl<MaterialMapper, YxMaterial> implements YxMaterialService {
 
     private final IGenerator generator;
 

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java

@@ -5,15 +5,13 @@ import co.yixiang.common.service.impl.BaseServiceImpl;
 import co.yixiang.modules.shop.service.dto.CountDto;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxStoreCartService;
 import co.yixiang.modules.shop.service.dto.YxStoreCartDto;
 import co.yixiang.modules.shop.service.dto.YxStoreCartQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxStoreCartMapper;
+import co.yixiang.modules.shop.service.mapper.StoreCartMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,10 +19,8 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -40,11 +36,11 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxStoreCart")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxStoreCartServiceImpl extends BaseServiceImpl<YxStoreCartMapper, YxStoreCart> implements YxStoreCartService {
+public class YxStoreCartServiceImpl extends BaseServiceImpl<StoreCartMapper, YxStoreCart> implements YxStoreCartService {
 
     private final IGenerator generator;
 
-    private final YxStoreCartMapper storeCartMapper;
+    private final StoreCartMapper storeCartMapper;
     @Override
     //@Cacheable
     public Map<String, Object> queryAll(YxStoreCartQueryCriteria criteria, Pageable pageable) {

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java

@@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxStoreCategory;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxStoreCategoryService;
 import co.yixiang.modules.shop.service.dto.YxStoreCategoryDto;
 import co.yixiang.modules.shop.service.dto.YxStoreCategoryQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxStoreCategoryMapper;
+import co.yixiang.modules.shop.service.mapper.StoreCategoryMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,10 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
-import co.yixiang.utils.QueryHelp;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
@@ -39,7 +34,7 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxStoreCategory")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxStoreCategoryServiceImpl extends BaseServiceImpl<YxStoreCategoryMapper, YxStoreCategory> implements YxStoreCategoryService {
+public class YxStoreCategoryServiceImpl extends BaseServiceImpl<StoreCategoryMapper, YxStoreCategory> implements YxStoreCategoryService {
 
     private final IGenerator generator;
 

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderCartInfoServiceImpl.java

@@ -10,7 +10,7 @@ import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxStoreOrderCartInfoService;
 import co.yixiang.modules.shop.service.dto.YxStoreOrderCartInfoDto;
 import co.yixiang.modules.shop.service.dto.YxStoreOrderCartInfoQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxStoreOrderCartInfoMapper;
+import co.yixiang.modules.shop.service.mapper.StoreOrderCartInfoMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,7 +35,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxStoreOrderCartInfo")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxStoreOrderCartInfoServiceImpl extends BaseServiceImpl<YxStoreOrderCartInfoMapper, YxStoreOrderCartInfo> implements YxStoreOrderCartInfoService {
+public class YxStoreOrderCartInfoServiceImpl extends BaseServiceImpl<StoreOrderCartInfoMapper, YxStoreOrderCartInfo> implements YxStoreOrderCartInfoService {
 
     private final IGenerator generator;
 

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java

@@ -7,13 +7,13 @@ import co.yixiang.enums.OrderInfoEnum;
 import co.yixiang.exception.BadRequestException;
 import co.yixiang.exception.EntityExistException;
 import co.yixiang.modules.activity.domain.YxStorePink;
-import co.yixiang.modules.activity.repository.YxStorePinkRepository;
+import co.yixiang.modules.activity.repository.StorePinkRepository;
 import co.yixiang.modules.shop.domain.*;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import co.yixiang.modules.shop.service.*;
 import co.yixiang.modules.shop.service.dto.*;
-import co.yixiang.modules.shop.service.mapper.YxStoreProductMapper;
+import co.yixiang.modules.shop.service.mapper.StoreProductMapper;
-import co.yixiang.modules.shop.service.mapper.YxUserMapper;
+import co.yixiang.modules.shop.service.mapper.UserMapper;
 import co.yixiang.mp.service.YxMiniPayService;
 import co.yixiang.mp.service.YxPayService;
 import co.yixiang.utils.*;
@@ -24,7 +24,7 @@ import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.modules.shop.service.mapper.YxStoreOrderMapper;
+import co.yixiang.modules.shop.service.mapper.StoreOrderMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -49,12 +49,12 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxStoreOrder")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper, YxStoreOrder> implements YxStoreOrderService {
+public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, YxStoreOrder> implements YxStoreOrderService {
 
     private final IGenerator generator;
     private YxUserService userService;
-    private YxUserMapper userMapper;
+    private UserMapper userMapper;
-    private YxStorePinkRepository storePinkRepository;
+    private StorePinkRepository storePinkRepository;
     private YxStoreOrderCartInfoService storeOrderCartInfoService;
     private final YxUserBillService yxUserBillService;
     private final YxStoreOrderStatusService yxStoreOrderStatusService;
@@ -62,8 +62,8 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
     private final YxMiniPayService miniPayService;
     private final YxSystemStoreService systemStoreService;
     private final YxStoreCartService storeCartService;
-    private final YxStoreOrderMapper yxStoreOrderMapper;
+    private final StoreOrderMapper yxStoreOrderMapper;
-    private final YxStoreProductMapper yxStoreProductMapper;
+    private final StoreProductMapper yxStoreProductMapper;
 
     @Override
     public OrderCountDto getOrderCount() {

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java

@@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxStoreOrderStatus;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxStoreOrderStatusService;
 import co.yixiang.modules.shop.service.dto.YxStoreOrderStatusDto;
 import co.yixiang.modules.shop.service.dto.YxStoreOrderStatusQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxStoreOrderStatusMapper;
+import co.yixiang.modules.shop.service.mapper.StoreOrderStatusMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -39,7 +35,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxStoreOrderStatus")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxStoreOrderStatusServiceImpl extends BaseServiceImpl<YxStoreOrderStatusMapper, YxStoreOrderStatus> implements YxStoreOrderStatusService {
+public class YxStoreOrderStatusServiceImpl extends BaseServiceImpl<StoreOrderStatusMapper, YxStoreOrderStatus> implements YxStoreOrderStatusService {
 
     private final IGenerator generator;
 
@@ -75,4 +71,4 @@ public class YxStoreOrderStatusServiceImpl extends BaseServiceImpl<YxStoreOrderS
         }
         FileUtil.downloadExcel(list, response);
     }
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java

@@ -3,12 +3,8 @@ package co.yixiang.modules.shop.service.impl;
 import co.yixiang.modules.shop.domain.YxStoreProductAttrResult;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
-import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageInfo;
-import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxStoreProductAttrResultService;
-import co.yixiang.modules.shop.service.mapper.YxStoreProductAttrResultMapper;
+import co.yixiang.modules.shop.service.mapper.StoreProductAttrResultMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -16,14 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Pageable;
 
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 
 /**
 * @author hupeng
@@ -33,7 +22,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxStoreProductAttrResult")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxStoreProductAttrResultServiceImpl extends BaseServiceImpl<YxStoreProductAttrResultMapper, YxStoreProductAttrResult> implements YxStoreProductAttrResultService {
+public class YxStoreProductAttrResultServiceImpl extends BaseServiceImpl<StoreProductAttrResultMapper, YxStoreProductAttrResult> implements YxStoreProductAttrResultService {
 
 
 

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java

@@ -3,12 +3,8 @@ package co.yixiang.modules.shop.service.impl;
 import co.yixiang.modules.shop.domain.YxStoreProductAttr;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
-import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageInfo;
-import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxStoreProductAttrService;
-import co.yixiang.modules.shop.service.mapper.YxStoreProductAttrMapper;
+import co.yixiang.modules.shop.service.mapper.StoreProductAttrMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -16,14 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Pageable;
 
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 
 /**
 * @author hupeng
@@ -33,7 +22,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxStoreProductAttr")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxStoreProductAttrServiceImpl extends BaseServiceImpl<YxStoreProductAttrMapper, YxStoreProductAttr> implements YxStoreProductAttrService {
+public class YxStoreProductAttrServiceImpl extends BaseServiceImpl<StoreProductAttrMapper, YxStoreProductAttr> implements YxStoreProductAttrService {
 
 
 }

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java

@@ -2,14 +2,9 @@ package co.yixiang.modules.shop.service.impl;
 
 import co.yixiang.modules.shop.domain.YxStoreProductAttrValue;
 import co.yixiang.common.service.impl.BaseServiceImpl;
-import co.yixiang.modules.shop.service.dto.YxStoreProductAttrValueQueryCriteria;
 import lombok.AllArgsConstructor;
-import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageInfo;
-import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxStoreProductAttrValueService;
-import co.yixiang.modules.shop.service.mapper.YxStoreProductAttrValueMapper;
+import co.yixiang.modules.shop.service.mapper.StoreProductAttrValueMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,14 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Pageable;
 
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 
 /**
 * @author hupeng
@@ -34,7 +22,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxStoreProductAttrValue")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxStoreProductAttrValueServiceImpl extends BaseServiceImpl<YxStoreProductAttrValueMapper, YxStoreProductAttrValue> implements YxStoreProductAttrValueService {
+public class YxStoreProductAttrValueServiceImpl extends BaseServiceImpl<StoreProductAttrValueMapper, YxStoreProductAttrValue> implements YxStoreProductAttrValueService {
 
 
 }

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java

@@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxStoreProductReply;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxStoreProductReplyService;
 import co.yixiang.modules.shop.service.dto.YxStoreProductReplyDto;
 import co.yixiang.modules.shop.service.dto.YxStoreProductReplyQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxStoreProductReplyMapper;
+import co.yixiang.modules.shop.service.mapper.StoreProductReplyMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -39,7 +35,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxStoreProductReply")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxStoreProductReplyServiceImpl extends BaseServiceImpl<YxStoreProductReplyMapper, YxStoreProductReply> implements YxStoreProductReplyService {
+public class YxStoreProductReplyServiceImpl extends BaseServiceImpl<StoreProductReplyMapper, YxStoreProductReply> implements YxStoreProductReplyService {
 
     private final IGenerator generator;
 
@@ -85,4 +81,4 @@ public class YxStoreProductReplyServiceImpl extends BaseServiceImpl<YxStoreProdu
         }
         FileUtil.downloadExcel(list, response);
     }
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java

@@ -13,19 +13,16 @@ import co.yixiang.modules.shop.service.YxStoreProductAttrResultService;
 import co.yixiang.modules.shop.service.YxStoreProductAttrService;
 import co.yixiang.modules.shop.service.YxStoreProductAttrValueService;
 import co.yixiang.modules.shop.service.dto.*;
-import co.yixiang.modules.shop.service.mapper.YxStoreProductAttrMapper;
-import co.yixiang.modules.shop.service.mapper.YxStoreProductAttrValueMapper;
 import co.yixiang.utils.*;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
 import co.yixiang.modules.shop.service.YxStoreProductService;
-import co.yixiang.modules.shop.service.mapper.YxStoreProductMapper;
+import co.yixiang.modules.shop.service.mapper.StoreProductMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,7 +30,6 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
 import java.math.BigDecimal;
@@ -50,11 +46,11 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxStoreProduct")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxStoreProductServiceImpl extends BaseServiceImpl<YxStoreProductMapper, YxStoreProduct> implements YxStoreProductService {
+public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMapper, YxStoreProduct> implements YxStoreProductService {
 
     private final IGenerator generator;
 
-    private final YxStoreProductMapper storeProductMapper;
+    private final StoreProductMapper storeProductMapper;
 
     private final YxStoreProductAttrService yxStoreProductAttrService;
 

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java

@@ -6,13 +6,12 @@ import co.yixiang.utils.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
 import co.yixiang.modules.shop.service.YxSystemConfigService;
 import co.yixiang.modules.shop.service.dto.YxSystemConfigDto;
 import co.yixiang.modules.shop.service.dto.YxSystemConfigQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxSystemConfigMapper;
+import co.yixiang.modules.shop.service.mapper.SystemConfigMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,7 +19,6 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
@@ -38,7 +36,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxSystemConfig")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxSystemConfigServiceImpl extends BaseServiceImpl<YxSystemConfigMapper, YxSystemConfig> implements YxSystemConfigService {
+public class YxSystemConfigServiceImpl extends BaseServiceImpl<SystemConfigMapper, YxSystemConfig> implements YxSystemConfigService {
 
     private final IGenerator generator;
 

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java

@@ -5,15 +5,13 @@ import co.yixiang.common.service.impl.BaseServiceImpl;
 import com.alibaba.fastjson.JSON;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxSystemGroupDataService;
 import co.yixiang.modules.shop.service.dto.YxSystemGroupDataDto;
 import co.yixiang.modules.shop.service.dto.YxSystemGroupDataQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxSystemGroupDataMapper;
+import co.yixiang.modules.shop.service.mapper.SystemGroupDataMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,10 +19,8 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -40,7 +36,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxSystemGroupData")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxSystemGroupDataServiceImpl extends BaseServiceImpl<YxSystemGroupDataMapper, YxSystemGroupData> implements YxSystemGroupDataService {
+public class YxSystemGroupDataServiceImpl extends BaseServiceImpl<SystemGroupDataMapper, YxSystemGroupData> implements YxSystemGroupDataService {
 
     private final IGenerator generator;
 

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java

@@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxSystemStore;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxSystemStoreService;
 import co.yixiang.modules.shop.service.dto.YxSystemStoreDto;
 import co.yixiang.modules.shop.service.dto.YxSystemStoreQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxSystemStoreMapper;
+import co.yixiang.modules.shop.service.mapper.SystemStoreMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -39,7 +35,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxSystemStore")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxSystemStoreServiceImpl extends BaseServiceImpl<YxSystemStoreMapper, YxSystemStore> implements YxSystemStoreService {
+public class YxSystemStoreServiceImpl extends BaseServiceImpl<SystemStoreMapper, YxSystemStore> implements YxSystemStoreService {
 
     private final IGenerator generator;
 
@@ -84,4 +80,4 @@ public class YxSystemStoreServiceImpl extends BaseServiceImpl<YxSystemStoreMappe
         }
         FileUtil.downloadExcel(list, response);
     }
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreStaffServiceImpl.java

@@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxSystemStoreStaff;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxSystemStoreStaffService;
 import co.yixiang.modules.shop.service.dto.YxSystemStoreStaffDto;
 import co.yixiang.modules.shop.service.dto.YxSystemStoreStaffQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxSystemStoreStaffMapper;
+import co.yixiang.modules.shop.service.mapper.SystemStoreStaffMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -39,7 +35,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxSystemStoreStaff")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxSystemStoreStaffServiceImpl extends BaseServiceImpl<YxSystemStoreStaffMapper, YxSystemStoreStaff> implements YxSystemStoreStaffService {
+public class YxSystemStoreStaffServiceImpl extends BaseServiceImpl<SystemStoreStaffMapper, YxSystemStoreStaff> implements YxSystemStoreStaffService {
 
     private final IGenerator generator;
 
@@ -81,4 +77,4 @@ public class YxSystemStoreStaffServiceImpl extends BaseServiceImpl<YxSystemStore
         }
         FileUtil.downloadExcel(list, response);
     }
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java

@@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxSystemUserLevel;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxSystemUserLevelService;
 import co.yixiang.modules.shop.service.dto.YxSystemUserLevelDto;
 import co.yixiang.modules.shop.service.dto.YxSystemUserLevelQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxSystemUserLevelMapper;
+import co.yixiang.modules.shop.service.mapper.SystemUserLevelMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -39,7 +35,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxSystemUserLevel")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxSystemUserLevelServiceImpl extends BaseServiceImpl<YxSystemUserLevelMapper, YxSystemUserLevel> implements YxSystemUserLevelService {
+public class YxSystemUserLevelServiceImpl extends BaseServiceImpl<SystemUserLevelMapper, YxSystemUserLevel> implements YxSystemUserLevelService {
 
     private final IGenerator generator;
 

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java

@@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxSystemUserTask;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxSystemUserTaskService;
 import co.yixiang.modules.shop.service.dto.YxSystemUserTaskDto;
 import co.yixiang.modules.shop.service.dto.YxSystemUserTaskQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxSystemUserTaskMapper;
+import co.yixiang.modules.shop.service.mapper.SystemUserTaskMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -39,7 +35,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxSystemUserTask")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxSystemUserTaskServiceImpl extends BaseServiceImpl<YxSystemUserTaskMapper, YxSystemUserTask> implements YxSystemUserTaskService {
+public class YxSystemUserTaskServiceImpl extends BaseServiceImpl<SystemUserTaskMapper, YxSystemUserTask> implements YxSystemUserTaskService {
 
     private final IGenerator generator;
 
@@ -81,4 +77,4 @@ public class YxSystemUserTaskServiceImpl extends BaseServiceImpl<YxSystemUserTas
         }
         FileUtil.downloadExcel(list, response);
     }
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java

@@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxUserBill;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxUserBillService;
 import co.yixiang.modules.shop.service.dto.YxUserBillDto;
 import co.yixiang.modules.shop.service.dto.YxUserBillQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxUserBillMapper;
+import co.yixiang.modules.shop.service.mapper.UserBillMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -39,7 +35,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxUserBill")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxUserBillServiceImpl extends BaseServiceImpl<YxUserBillMapper, YxUserBill> implements YxUserBillService {
+public class YxUserBillServiceImpl extends BaseServiceImpl<UserBillMapper, YxUserBill> implements YxUserBillService {
 
     private final IGenerator generator;
 
@@ -82,4 +78,4 @@ public class YxUserBillServiceImpl extends BaseServiceImpl<YxUserBillMapper, YxU
         }
         FileUtil.downloadExcel(list, response);
     }
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserRechargeServiceImpl.java

@@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxUserRecharge;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxUserRechargeService;
 import co.yixiang.modules.shop.service.dto.YxUserRechargeDto;
 import co.yixiang.modules.shop.service.dto.YxUserRechargeQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxUserRechargeMapper;
+import co.yixiang.modules.shop.service.mapper.UserRechargeMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -39,7 +35,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxUserRecharge")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxUserRechargeServiceImpl extends BaseServiceImpl<YxUserRechargeMapper, YxUserRecharge> implements YxUserRechargeService {
+public class YxUserRechargeServiceImpl extends BaseServiceImpl<UserRechargeMapper, YxUserRecharge> implements YxUserRechargeService {
 
     private final IGenerator generator;
 
@@ -80,4 +76,4 @@ public class YxUserRechargeServiceImpl extends BaseServiceImpl<YxUserRechargeMap
         }
         FileUtil.downloadExcel(list, response);
     }
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java

@@ -5,15 +5,13 @@ import co.yixiang.common.service.impl.BaseServiceImpl;
 import co.yixiang.modules.shop.service.dto.UserMoneyDTO;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxUserService;
 import co.yixiang.modules.shop.service.dto.YxUserDto;
 import co.yixiang.modules.shop.service.dto.YxUserQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxUserMapper;
+import co.yixiang.modules.shop.service.mapper.UserMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,10 +19,8 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -40,11 +36,11 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxUser")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxUserServiceImpl extends BaseServiceImpl<YxUserMapper, YxUser> implements YxUserService {
+public class YxUserServiceImpl extends BaseServiceImpl<UserMapper, YxUser> implements YxUserService {
 
     private final IGenerator generator;
 
-    private final YxUserMapper yxUserMapper;
+    private final UserMapper yxUserMapper;
 
     @Override
     //@Cacheable

yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java

@@ -4,15 +4,13 @@ import co.yixiang.modules.shop.domain.YxWechatUser;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.modules.shop.service.YxWechatUserService;
 import co.yixiang.modules.shop.service.dto.YxWechatUserDto;
 import co.yixiang.modules.shop.service.dto.YxWechatUserQueryCriteria;
-import co.yixiang.modules.shop.service.mapper.YxWechatUserMapper;
+import co.yixiang.modules.shop.service.mapper.WechatUserMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
+
-import co.yixiang.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -39,7 +35,7 @@ import java.util.LinkedHashMap;
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxWechatUser")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class YxWechatUserServiceImpl extends BaseServiceImpl<YxWechatUserMapper, YxWechatUser> implements YxWechatUserService {
+public class YxWechatUserServiceImpl extends BaseServiceImpl<WechatUserMapper, YxWechatUser> implements YxWechatUserService {
 
     private final IGenerator generator;
 
@@ -94,4 +90,4 @@ public class YxWechatUserServiceImpl extends BaseServiceImpl<YxWechatUserMapper,
         }
         FileUtil.downloadExcel(list, response);
     }
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/ExpressMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxExpressMapper extends CoreMapper<YxExpress> {
+public interface ExpressMapper extends CoreMapper<YxExpress> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/MaterialGroupMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxMaterialGroupMapper extends CoreMapper<YxMaterialGroup> {
+public interface MaterialGroupMapper extends CoreMapper<YxMaterialGroup> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/MaterialMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxMaterialMapper extends CoreMapper<YxMaterial> {
+public interface MaterialMapper extends CoreMapper<YxMaterial> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreCartMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
 */
 @Repository
 @Mapper
-public interface YxStoreCartMapper extends CoreMapper<YxStoreCart> {
+public interface StoreCartMapper extends CoreMapper<YxStoreCart> {
     @Select("SELECT t.cate_name as catename from yx_store_cart c  " +
             "LEFT JOIN yx_store_product p on c.product_id = p.id  " +
             "LEFT JOIN yx_store_category t on p.cate_id = t.id " +

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreCategoryMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxStoreCategoryMapper extends CoreMapper<YxStoreCategory> {
+public interface StoreCategoryMapper extends CoreMapper<YxStoreCategory> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreOrderCartInfoMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxStoreOrderCartInfoMapper extends CoreMapper<YxStoreOrderCartInfo> {
+public interface StoreOrderCartInfoMapper extends CoreMapper<YxStoreOrderCartInfo> {
 
 }

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreOrderMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
 */
 @Repository
 @Mapper
-public interface YxStoreOrderMapper extends CoreMapper<YxStoreOrder> {
+public interface StoreOrderMapper extends CoreMapper<YxStoreOrder> {
 
 // todo   Integer countByPayTimeGreaterThanEqual(int today);
 //

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreOrderStatusMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxStoreOrderStatusMapper extends CoreMapper<YxStoreOrderStatus> {
+public interface StoreOrderStatusMapper extends CoreMapper<YxStoreOrderStatus> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductAttrMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxStoreProductAttrMapper extends CoreMapper<YxStoreProductAttr> {
+public interface StoreProductAttrMapper extends CoreMapper<YxStoreProductAttr> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductAttrResultMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxStoreProductAttrResultMapper extends CoreMapper<YxStoreProductAttrResult> {
+public interface StoreProductAttrResultMapper extends CoreMapper<YxStoreProductAttrResult> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductAttrValueMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxStoreProductAttrValueMapper extends CoreMapper<YxStoreProductAttrValue> {
+public interface StoreProductAttrValueMapper extends CoreMapper<YxStoreProductAttrValue> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductMapper.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxStoreProductMapper extends CoreMapper<YxStoreProduct> {
+public interface StoreProductMapper extends CoreMapper<YxStoreProduct> {
 
     @Update("update yx_store_product set is_show = #{i} where id = #{id}")
     void updateDel(@Param("i")int i,@Param("id") Integer id);

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/StoreProductReplyMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxStoreProductReplyMapper extends CoreMapper<YxStoreProductReply> {
+public interface StoreProductReplyMapper extends CoreMapper<YxStoreProductReply> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemConfigMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxSystemConfigMapper extends CoreMapper<YxSystemConfig> {
+public interface SystemConfigMapper extends CoreMapper<YxSystemConfig> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemGroupDataMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxSystemGroupDataMapper extends CoreMapper<YxSystemGroupData> {
+public interface SystemGroupDataMapper extends CoreMapper<YxSystemGroupData> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemStoreMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxSystemStoreMapper extends CoreMapper<YxSystemStore> {
+public interface SystemStoreMapper extends CoreMapper<YxSystemStore> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemStoreStaffMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxSystemStoreStaffMapper extends CoreMapper<YxSystemStoreStaff> {
+public interface SystemStoreStaffMapper extends CoreMapper<YxSystemStoreStaff> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemUserLevelMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxSystemUserLevelMapper extends CoreMapper<YxSystemUserLevel> {
+public interface SystemUserLevelMapper extends CoreMapper<YxSystemUserLevel> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/SystemUserTaskMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxSystemUserTaskMapper extends CoreMapper<YxSystemUserTask> {
+public interface SystemUserTaskMapper extends CoreMapper<YxSystemUserTask> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxUserBillMapper extends CoreMapper<YxUserBill> {
+public interface UserBillMapper extends CoreMapper<YxUserBill> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserMapper.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxUserMapper extends CoreMapper<YxUser> {
+public interface UserMapper extends CoreMapper<YxUser> {
 
     @Update( "update yx_user set status = #{status} where uid = #{id}")
     void updateOnstatus(@Param("status") int status, @Param("id") int id);

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserRechargeMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxUserRechargeMapper extends CoreMapper<YxUserRecharge> {
+public interface UserRechargeMapper extends CoreMapper<YxUserRecharge> {
 
-}
+}

yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/WechatUserMapper.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 @Mapper
-public interface YxWechatUserMapper extends CoreMapper<YxWechatUser> {
+public interface WechatUserMapper extends CoreMapper<YxWechatUser> {
 
-}
+}

yshop-system/src/main/java/co/yixiang/AppRun.java

@@ -2,6 +2,7 @@ package co.yixiang;
 import co.yixiang.modules.activity.service.YxStoreCouponUserService;
 import co.yixiang.annotation.AnonymousAccess;
 import co.yixiang.utils.SpringContextHolder;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @SpringBootApplication
 @EnableTransactionManagement
+@MapperScan(basePackages = "co.yixiang.*.mapper")
 public class AppRun {
 
     public static void main(String[] args) {

yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java

@@ -1,11 +1,10 @@
 package co.yixiang.modules.system.rest;
 
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
 import co.yixiang.aop.log.Log;
 import co.yixiang.config.DataScope;
-import co.yixiang.domain.VerificationCode;
+import co.yixiang.tools.domain.VerificationCode;
 import co.yixiang.exception.BadRequestException;
 import co.yixiang.modules.system.domain.User;
 import co.yixiang.modules.system.domain.vo.UserPassVo;
@@ -15,7 +14,7 @@ import co.yixiang.modules.system.service.UserService;
 import co.yixiang.modules.system.service.dto.RoleSmallDTO;
 import co.yixiang.modules.system.service.dto.UserDTO;
 import co.yixiang.modules.system.service.dto.UserQueryCriteria;
-import co.yixiang.service.VerificationCodeService;
+import co.yixiang.tools.service.VerificationCodeService;
 import co.yixiang.utils.PageUtil;
 import co.yixiang.utils.SecurityUtils;
 import co.yixiang.utils.YshopConstant;

yshop-system/src/main/resources/config/application-dev.yml

@@ -100,4 +100,3 @@ mybatis-plus:
       id-type: auto
       logic-delete-value: 1
       logic-not-delete-value: 0
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

yshop-system/src/main/resources/logback.xml

@@ -93,4 +93,4 @@
     <logger name="jdbc.audit" level="OFF" additivity="false">
         <appender-ref ref="console" />
     </logger>
-</configuration>
+</configuration>

yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java

@@ -1,4 +1,4 @@
-package co.yixiang.config;
+package co.yixiang.tools.config;
 
 import org.springframework.boot.web.servlet.MultipartConfigFactory;
 import org.springframework.context.annotation.Bean;
@@ -27,4 +27,4 @@ public class MultipartConfig {
         factory.setLocation(location);
         return factory.createMultipartConfig();
     }
-}
+}

yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java

@@ -1,12 +1,8 @@
-package co.yixiang.domain;
+package co.yixiang.tools.domain;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
@@ -78,4 +74,4 @@ public class AlipayConfig implements Serializable {
     public void copy(AlipayConfig source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
-}
+}

yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java

@@ -1,12 +1,8 @@
-package co.yixiang.domain;
+package co.yixiang.tools.domain;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
@@ -53,4 +49,4 @@ public class EmailConfig implements Serializable {
     public void copy(EmailConfig source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
-}
+}

yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java

@@ -1,12 +1,10 @@
-package co.yixiang.domain;
+package co.yixiang.tools.domain;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.sql.Timestamp;
 import java.io.Serializable;
 

yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java

@@ -1,12 +1,10 @@
-package co.yixiang.domain;
+package co.yixiang.tools.domain;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.sql.Timestamp;
 import java.io.Serializable;
 

yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java

@@ -1,8 +1,5 @@
-package co.yixiang.domain;
+package co.yixiang.tools.domain;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import javax.persistence.*;
@@ -59,4 +56,4 @@ public class QiniuConfig implements Serializable {
     public void copy(QiniuConfig source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
-}
+}

yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java

@@ -1,12 +1,10 @@
-package co.yixiang.domain;
+package co.yixiang.tools.domain;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.sql.Timestamp;
 import java.io.Serializable;
 
@@ -64,4 +62,4 @@ public class QiniuContent implements Serializable {
     public void copy(QiniuContent source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
-}
+}

yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java

@@ -1,4 +1,4 @@
-package co.yixiang.domain;
+package co.yixiang.tools.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

yshop-tools/src/main/java/co/yixiang/tools/domain/vo/EmailVo.java

@@ -1,4 +1,4 @@
-package co.yixiang.domain.vo;
+package co.yixiang.tools.domain.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

yshop-tools/src/main/java/co/yixiang/tools/domain/vo/TradeVo.java

@@ -1,4 +1,4 @@
-package co.yixiang.domain.vo;
+package co.yixiang.tools.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

yshop-tools/src/main/java/co/yixiang/tools/express/ExpressService.java

@@ -1,8 +1,8 @@
-package co.yixiang.express;
+package co.yixiang.tools.express;
 
 import cn.hutool.http.HttpUtil;
-import co.yixiang.express.config.ExpressProperties;
+import co.yixiang.tools.express.config.ExpressProperties;
-import co.yixiang.express.dao.ExpressInfo;
+import co.yixiang.tools.express.dao.ExpressInfo;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java

@@ -1,6 +1,6 @@
-package co.yixiang.express.config;
+package co.yixiang.tools.express.config;
 
-import co.yixiang.express.ExpressService;
+import co.yixiang.tools.express.ExpressService;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressProperties.java

@@ -1,4 +1,4 @@
-package co.yixiang.express.config;
+package co.yixiang.tools.express.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

yshop-tools/src/main/java/co/yixiang/tools/express/dao/ExpressInfo.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2018 bejson.com
  */
-package co.yixiang.express.dao;
+package co.yixiang.tools.express.dao;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
@@ -38,4 +38,4 @@ public class ExpressInfo {
     private String OrderCode;
 
 
-}
+}

yshop-tools/src/main/java/co/yixiang/tools/express/dao/Traces.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2018 bejson.com
  */
-package co.yixiang.express.dao;
+package co.yixiang.tools.express.dao;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -34,4 +34,4 @@ public class Traces {
         this.AcceptTime = AcceptTime;
     }
 
-}
+}

yshop-tools/src/main/java/co/yixiang/tools/repository/VerificationCodeRepository.java

@@ -1,6 +1,6 @@
-package co.yixiang.repository;
+package co.yixiang.tools.repository;
 
-import co.yixiang.domain.VerificationCode;
+import co.yixiang.tools.domain.VerificationCode;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**

yshop-tools/src/main/java/co/yixiang/tools/rest/AliPayController.java

@@ -1,15 +1,15 @@
-package co.yixiang.rest;
+package co.yixiang.tools.rest;
 
 import co.yixiang.aop.log.Log;
-import co.yixiang.service.AlipayConfigService;
+import co.yixiang.tools.service.AlipayConfigService;
-import co.yixiang.utils.AliPayStatusEnum;
+import co.yixiang.tools.utils.AliPayStatusEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import co.yixiang.annotation.AnonymousAccess;
-import co.yixiang.domain.vo.TradeVo;
+import co.yixiang.tools.domain.vo.TradeVo;
-import co.yixiang.domain.AlipayConfig;
+import co.yixiang.tools.domain.AlipayConfig;
-import co.yixiang.utils.AlipayUtils;
+import co.yixiang.tools.utils.AlipayUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;

yshop-tools/src/main/java/co/yixiang/tools/rest/EmailController.java

@@ -1,11 +1,11 @@
-package co.yixiang.rest;
+package co.yixiang.tools.rest;
 
 import co.yixiang.aop.log.Log;
-import co.yixiang.service.EmailConfigService;
+import co.yixiang.tools.service.EmailConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import co.yixiang.domain.vo.EmailVo;
+import co.yixiang.tools.domain.vo.EmailVo;
-import co.yixiang.domain.EmailConfig;
+import co.yixiang.tools.domain.EmailConfig;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;

yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java

@@ -1,12 +1,12 @@
-package co.yixiang.rest;
+package co.yixiang.tools.rest;
 import java.util.Arrays;
 import co.yixiang.dozer.service.IGenerator;
 import lombok.AllArgsConstructor;
 import co.yixiang.aop.log.Log;
-import co.yixiang.domain.LocalStorage;
+import co.yixiang.tools.domain.LocalStorage;
-import co.yixiang.service.LocalStorageService;
+import co.yixiang.tools.service.LocalStorageService;
-import co.yixiang.service.dto.LocalStorageQueryCriteria;
+import co.yixiang.tools.service.dto.LocalStorageQueryCriteria;
-import co.yixiang.service.dto.LocalStorageDto;
+import co.yixiang.tools.service.dto.LocalStorageDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -74,4 +74,4 @@ public class LocalStorageController {
         });
         return new ResponseEntity<>(HttpStatus.OK);
     }
-}
+}

yshop-tools/src/main/java/co/yixiang/tools/rest/PictureController.java

@@ -1,13 +1,13 @@
-package co.yixiang.rest;
+package co.yixiang.tools.rest;
 
+import co.yixiang.tools.service.dto.PictureDto;
 import co.yixiang.aop.log.Log;
 import co.yixiang.dozer.service.IGenerator;
-import co.yixiang.service.dto.PictureDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import co.yixiang.domain.Picture;
+import co.yixiang.tools.domain.Picture;
-import co.yixiang.service.PictureService;
+import co.yixiang.tools.service.PictureService;
-import co.yixiang.service.dto.PictureQueryCriteria;
+import co.yixiang.tools.service.dto.PictureQueryCriteria;
 import co.yixiang.utils.SecurityUtils;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;

yshop-tools/src/main/java/co/yixiang/tools/rest/QiniuController.java

@@ -1,12 +1,10 @@
-package co.yixiang.rest;
+package co.yixiang.tools.rest;
 
-import cn.hutool.core.util.StrUtil;
 import co.yixiang.aop.log.Log;
-import co.yixiang.domain.QiniuConfig;
+import co.yixiang.tools.domain.QiniuConfig;
-import co.yixiang.domain.QiniuContent;
+import co.yixiang.tools.domain.QiniuContent;
-import co.yixiang.exception.BadRequestException;
+import co.yixiang.tools.service.QiNiuService;
-import co.yixiang.service.QiNiuService;
+import co.yixiang.tools.service.dto.QiniuQueryCriteria;
-import co.yixiang.service.dto.QiniuQueryCriteria;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;