1

src/main/java/com/peanut/common/utils/ReadProvinceUtil.java

@@ -3,9 +3,9 @@ package com.peanut.common.utils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.peanut.modules.book.entity.City;
-import com.peanut.modules.book.entity.County;
-import com.peanut.modules.book.entity.Province;
+import com.peanut.modules.common.entity.City;
+import com.peanut.modules.common.entity.County;
+import com.peanut.modules.common.entity.Province;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

src/main/java/com/peanut/common/utils/ShiroUtils.java

@@ -9,7 +9,7 @@
 package com.peanut.common.utils;
 
 import com.peanut.common.exception.RRException;
-import com.peanut.modules.book.entity.MyUserEntity;
+import com.peanut.modules.common.entity.MyUserEntity;
 import com.peanut.modules.sys.entity.SysUserEntity;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.session.Session;

src/main/java/com/peanut/modules/app/controller/AppTestController.java

@@ -12,7 +12,7 @@ package com.peanut.modules.app.controller;
 import com.peanut.common.utils.R;
 import com.peanut.modules.app.annotation.Login;
 import com.peanut.modules.app.annotation.LoginUser;
-import com.peanut.modules.book.entity.MyUserEntity;
+import com.peanut.modules.common.entity.MyUserEntity;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/peanut/modules/app/resolver/LoginUserHandlerMethodArgumentResolver.java

@@ -10,7 +10,7 @@ package com.peanut.modules.app.resolver;
 
 import com.peanut.modules.app.annotation.LoginUser;
 import com.peanut.modules.app.interceptor.AuthorizationInterceptor;
-import com.peanut.modules.book.entity.MyUserEntity;
+import com.peanut.modules.common.entity.MyUserEntity;
 import com.peanut.modules.book.service.MyUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;

src/main/java/com/peanut/modules/book/controller/ActivityController.java

@@ -2,8 +2,8 @@ package com.peanut.modules.book.controller;
 
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.*;
 import com.peanut.modules.book.service.*;
+import com.peanut.modules.common.entity.ActivityEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/peanut/modules/book/controller/AuthorController.java

@@ -5,7 +5,6 @@ import java.util.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.modules.book.service.BookService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.AuthorEntity;
+import com.peanut.modules.common.entity.AuthorEntity;
 import com.peanut.modules.book.service.AuthorService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;

src/main/java/com/peanut/modules/book/controller/BaseAreaController.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.BaseAreaEntity;
+import com.peanut.modules.common.entity.BaseAreaEntity;
 import com.peanut.modules.book.service.BaseAreaService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/peanut/modules/book/controller/BookBrowseRecordsController.java

@@ -4,10 +4,9 @@ import java.util.Arrays;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.peanut.modules.book.entity.BookShelfEntity;
+import com.peanut.modules.common.entity.BookShelfEntity;
 import com.peanut.modules.book.service.BookShelfService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.BookBrowseRecordsEntity;
+import com.peanut.modules.common.entity.BookBrowseRecordsEntity;
 import com.peanut.modules.book.service.BookBrowseRecordsService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;

src/main/java/com/peanut/modules/book/controller/BookBuyConfigController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.BookBuyConfigEntity;
+import com.peanut.modules.common.entity.BookBuyConfigEntity;
 import com.peanut.modules.book.service.BookBuyConfigService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;

src/main/java/com/peanut/modules/book/controller/BookCategoryController.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.*;
 import com.peanut.modules.book.service.BookCategoryService;
+import com.peanut.modules.common.entity.BookCategoryEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/controller/BookChapterContentController.java

@@ -10,8 +10,8 @@ import com.alibaba.druid.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.BaiduVoicesUtils;
-import com.peanut.modules.book.entity.*;
 import com.peanut.modules.book.service.*;
+import com.peanut.modules.common.entity.*;
 import com.peanut.modules.oss.service.OssService;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/peanut/modules/book/controller/BookChapterController.java

@@ -1,12 +1,10 @@
 package com.peanut.modules.book.controller;
 
-import java.io.IOException;
 import java.text.Collator;
 import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,11 +12,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.BookChapterEntity;
+import com.peanut.modules.common.entity.BookChapterEntity;
 import com.peanut.modules.book.service.BookChapterService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import org.springframework.web.multipart.MultipartFile;
 
 
 /**

src/main/java/com/peanut/modules/book/controller/BookClockForumController.java

@@ -5,11 +5,10 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.BookClockEntryEntity;
-import com.peanut.modules.book.entity.BookClockEntryChat;
-import com.peanut.modules.book.entity.MyUserEntity;
+import com.peanut.modules.common.entity.BookClockEntryEntity;
+import com.peanut.modules.common.entity.BookClockEntryChat;
+import com.peanut.modules.common.entity.MyUserEntity;
 import com.peanut.modules.book.service.BookClockEntryChatService;
 import com.peanut.modules.book.service.BookClockEntryService;
 import com.peanut.modules.book.service.MyUserService;

src/main/java/com/peanut/modules/book/controller/BookClockinPunchController.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.BookEntity;
+import com.peanut.modules.common.entity.BookEntity;
 import com.peanut.modules.book.service.BookService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/peanut/modules/book/controller/BookController.java

@@ -11,11 +11,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.Query;
 import com.peanut.common.utils.ReadProvinceUtil;
-import com.peanut.modules.book.dao.BookDao;
-import com.peanut.modules.book.dao.BookForumArticlesDao;
-import com.peanut.modules.book.entity.*;
+import com.peanut.modules.common.dao.BookDao;
+import com.peanut.modules.common.dao.BookForumArticlesDao;
 import com.peanut.modules.book.service.*;
 import com.peanut.modules.book.vo.BookIndexVo;
+import com.peanut.modules.common.entity.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/peanut/modules/book/controller/BookForumArticlesServiceController.java

@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.dao.BookForumArticlesDao;
-import com.peanut.modules.book.entity.*;
+import com.peanut.modules.common.dao.BookForumArticlesDao;
 import com.peanut.modules.book.service.*;
 import com.peanut.modules.book.vo.BookForumArticlesVO;
+import com.peanut.modules.common.entity.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/peanut/modules/book/controller/BookForumCommentController.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.controller;
 
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.BookForumCommentEntity;
+import com.peanut.modules.common.entity.BookForumCommentEntity;
 import com.peanut.modules.book.service.BookForumArticlesService;
 import com.peanut.modules.book.service.BookForumCommenService;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/peanut/modules/book/controller/BookListeningController.java

@@ -3,7 +3,7 @@ package com.peanut.modules.book.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.BookListeningEntity;
+import com.peanut.modules.common.entity.BookListeningEntity;
 import com.peanut.modules.book.service.BookListeningService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/peanut/modules/book/controller/BookListeningShelfController.java

@@ -1,24 +1,15 @@
 package com.peanut.modules.book.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.BookBrowseRecordsEntity;
-import com.peanut.modules.book.entity.BookListeningEntity;
-import com.peanut.modules.book.entity.BookListeningShelfEntity;
-import com.peanut.modules.book.entity.BookShelfEntity;
+import com.peanut.modules.common.entity.BookListeningShelfEntity;
 import com.peanut.modules.book.service.BookBrowseRecordsService;
-import com.peanut.modules.book.service.BookListeningService;
 import com.peanut.modules.book.service.BookListeningShelfService;
-import com.peanut.modules.book.service.BookShelfService;
-import com.peanut.modules.book.vo.BookShelfVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 @Slf4j

src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.Query;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.BookEntity;
-import com.peanut.modules.book.entity.BookMedicalRecordsEntity;
-import com.peanut.modules.book.entity.UserEbookBuyEntity;
+import com.peanut.modules.common.entity.BookEntity;
+import com.peanut.modules.common.entity.BookMedicalRecordsEntity;
+import com.peanut.modules.common.entity.UserEbookBuyEntity;
 import com.peanut.modules.book.service.BookMedicalRecordsService;
 import com.peanut.modules.book.service.BookService;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/peanut/modules/book/controller/BookReadRateController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.BookReadRateEntity;
+import com.peanut.modules.common.entity.BookReadRateEntity;
 import com.peanut.modules.book.service.BookReadRateService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;

src/main/java/com/peanut/modules/book/controller/BookShelfController.java

@@ -5,11 +5,10 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.peanut.modules.book.entity.BookBrowseRecordsEntity;
+import com.peanut.modules.common.entity.BookBrowseRecordsEntity;
 import com.peanut.modules.book.service.BookBrowseRecordsService;
 import com.peanut.modules.book.vo.BookShelfVo;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -17,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.BookShelfEntity;
+import com.peanut.modules.common.entity.BookShelfEntity;
 import com.peanut.modules.book.service.BookShelfService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;

src/main/java/com/peanut/modules/book/controller/BookTeachController.java

@@ -3,8 +3,8 @@ package com.peanut.modules.book.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.BookEntity;
-import com.peanut.modules.book.entity.BookTeachEntity;
+import com.peanut.modules.common.entity.BookEntity;
+import com.peanut.modules.common.entity.BookTeachEntity;
 import com.peanut.modules.book.service.BookService;
 import com.peanut.modules.book.service.BookTeachService;
 import com.peanut.modules.book.service.ShopProductBookService;

src/main/java/com/peanut/modules/book/controller/BookTeachLikeAndCommentController.java

@@ -1,29 +1,24 @@
 package com.peanut.modules.book.controller;
 
-import com.alibaba.druid.sql.visitor.functions.Instr;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.Query;
 import com.peanut.common.utils.R;
 import com.peanut.common.utils.ShiroUtils;
-import com.peanut.modules.book.entity.BookTeachCommentEntity;
-import com.peanut.modules.book.entity.BookTeachLikeEntity;
-import com.peanut.modules.book.entity.MyUserEntity;
+import com.peanut.modules.common.entity.BookTeachCommentEntity;
+import com.peanut.modules.common.entity.BookTeachLikeEntity;
 import com.peanut.modules.book.service.BookTeachCommentService;
 import com.peanut.modules.book.service.BookTeachLikeService;
 import com.peanut.modules.book.service.MyUserService;
 import com.peanut.modules.sys.entity.SysSensitiveWords;
 import com.peanut.modules.sys.service.SysSensitiveWordsService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/controller/BuyOrderController.java

@@ -8,7 +8,6 @@ import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
 import com.peanut.config.Constants;
 import com.peanut.config.DelayQueueConfig;
-import com.peanut.modules.book.entity.*;
 import com.peanut.modules.book.service.*;
 import com.peanut.modules.book.to.UserOrderDto;
 import com.peanut.modules.book.vo.UserAddressVo;
@@ -17,8 +16,8 @@ import com.peanut.modules.book.vo.request.ModifyOrderAddressRequestVo;
 import com.peanut.modules.book.vo.request.ProductRequestVo;
 import com.peanut.modules.book.vo.request.ProductTransportVo;
 import com.peanut.modules.book.vo.response.BuyOrderResponseVo;
-import com.peanut.modules.book.vo.response.ExpressQueryResponseVo;
 import com.peanut.modules.book.vo.response.OrderAddressResponseVo;
+import com.peanut.modules.common.entity.*;
 import com.peanut.modules.pay.weChatPay.dto.WechatPaymentInfo;
 import com.peanut.modules.pay.weChatPay.service.WxpayService;
 import com.peanut.modules.sys.entity.SysConfigEntity;
@@ -32,7 +31,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.math.MathContext;
 import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;

src/main/java/com/peanut/modules/book/controller/CouponController.java

@@ -2,15 +2,8 @@ package com.peanut.modules.book.controller;
 
 import java.util.*;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.peanut.modules.book.entity.CouponHistoryEntity;
-import com.peanut.modules.book.service.CouponHistoryService;
 import com.peanut.modules.book.service.CouponProductCategoryRelationService;
-import com.peanut.modules.book.vo.UserCouponVo;
-import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.CouponEntity;
+import com.peanut.modules.common.entity.CouponEntity;
 import com.peanut.modules.book.service.CouponService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;

src/main/java/com/peanut/modules/book/controller/CouponHistoryController.java

@@ -6,12 +6,10 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.peanut.common.utils.Query;
-import com.peanut.modules.book.entity.CouponEntity;
+import com.peanut.modules.common.entity.CouponEntity;
 import com.peanut.modules.book.service.CouponService;
 import com.peanut.modules.book.vo.UserCouponVo;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -20,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.CouponHistoryEntity;
+import com.peanut.modules.common.entity.CouponHistoryEntity;
 import com.peanut.modules.book.service.CouponHistoryService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;

src/main/java/com/peanut/modules/book/controller/CouponProductCategoryRelationController.java

@@ -5,7 +5,6 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.CouponProductCategoryRelationEntity;
+import com.peanut.modules.common.entity.CouponProductCategoryRelationEntity;
 import com.peanut.modules.book.service.CouponProductCategoryRelationService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;

src/main/java/com/peanut/modules/book/controller/CouponProductRelationController.java

@@ -5,7 +5,6 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.CouponProductRelationEntity;
+import com.peanut.modules.common.entity.CouponProductRelationEntity;
 import com.peanut.modules.book.service.CouponProductRelationService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;

src/main/java/com/peanut/modules/book/controller/ExpressController.java

@@ -7,14 +7,13 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.common.utils.HttpsUtil;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.ExpressCompany;
-import com.peanut.modules.book.entity.ExpressOrder;
+import com.peanut.modules.common.entity.ExpressCompany;
+import com.peanut.modules.common.entity.ExpressOrder;
 import com.peanut.modules.book.service.ExpressCompanyService;
 import com.peanut.modules.book.service.ExpressOrderService;
 import com.peanut.modules.book.to.ExpressPrintDto;
 import com.peanut.modules.book.vo.ExpressCompanyVo;
 import com.peanut.modules.book.vo.response.PrintTemplateVo;
-import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/peanut/modules/book/controller/MedicaldesController.java

@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.*;
 import com.peanut.modules.book.entity.SysDictDataEntity;
 import com.peanut.modules.book.service.*;
+import com.peanut.modules.common.entity.*;
 import com.peanut.modules.sys.service.SysDictDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;

src/main/java/com/peanut/modules/book/controller/MedicinalMaterialsController.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.MedicinalDrug;
-import com.peanut.modules.book.entity.MedicinalMaterials;
+import com.peanut.modules.common.entity.MedicinalDrug;
+import com.peanut.modules.common.entity.MedicinalMaterials;
 import com.peanut.modules.book.entity.SysDictDataEntity;
 import com.peanut.modules.book.service.MedicinalDrugService;
 import com.peanut.modules.book.service.MedicinalMaterialsService;

src/main/java/com/peanut/modules/book/controller/MeridiansController.java

@@ -3,10 +3,9 @@ package com.peanut.modules.book.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.Meridians;
+import com.peanut.modules.common.entity.Meridians;
 import com.peanut.modules.book.service.MeridiansService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/peanut/modules/book/controller/MyUserController.java

@@ -13,9 +13,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.common.utils.MD5Utils;
 import com.peanut.common.utils.MailUtil;
-import com.peanut.modules.book.entity.*;
 import com.peanut.modules.book.service.*;
 import com.peanut.modules.book.to.PageIdDto;
+import com.peanut.modules.common.entity.BookBuyConfigEntity;
+import com.peanut.modules.common.entity.BookEntity;
+import com.peanut.modules.common.entity.MyUserEntity;
+import com.peanut.modules.common.entity.TransactionDetailsEntity;
 import com.peanut.modules.sys.service.SysUserTokenService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/peanut/modules/book/controller/OrderCartController.java

@@ -6,7 +6,6 @@ import java.util.Map;
 
 import com.peanut.modules.book.vo.ShopCartVo;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.OrderCartEntity;
+import com.peanut.modules.common.entity.OrderCartEntity;
 import com.peanut.modules.book.service.OrderCartService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;

src/main/java/com/peanut/modules/book/controller/PayPaymentOrderController.java

@@ -4,7 +4,6 @@ import java.util.Arrays;
 import java.util.Map;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -12,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.PayPaymentOrderEntity;
+import com.peanut.modules.common.entity.PayPaymentOrderEntity;
 import com.peanut.modules.book.service.PayPaymentOrderService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;

src/main/java/com/peanut/modules/book/controller/PayZfbOrderController.java

@@ -4,7 +4,6 @@ import java.util.Arrays;
 import java.util.Map;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -12,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.PayZfbOrderEntity;
+import com.peanut.modules.common.entity.PayZfbOrderEntity;
 import com.peanut.modules.book.service.PayZfbOrderService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;

src/main/java/com/peanut/modules/book/controller/PointController.java

@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.PointCategoryEntity;
-import com.peanut.modules.book.entity.PointEntity;
+import com.peanut.modules.common.entity.PointCategoryEntity;
+import com.peanut.modules.common.entity.PointEntity;
 import com.peanut.modules.book.service.PointCategoryService;
 import com.peanut.modules.book.service.PointService;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/peanut/modules/book/controller/PrescriptController.java

@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.PrescriptCategoryEntity;
-import com.peanut.modules.book.entity.PrescriptEntity;
+import com.peanut.modules.common.entity.PrescriptCategoryEntity;
+import com.peanut.modules.common.entity.PrescriptEntity;
 import com.peanut.modules.book.service.PrescriptCategoryService;
 import com.peanut.modules.book.service.PrescriptService;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/peanut/modules/book/controller/ProvinceController.java

@@ -4,9 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.City;
-import com.peanut.modules.book.entity.County;
-import com.peanut.modules.book.entity.Province;
+import com.peanut.modules.common.entity.City;
+import com.peanut.modules.common.entity.County;
+import com.peanut.modules.common.entity.Province;
 import com.peanut.modules.book.service.CityService;
 import com.peanut.modules.book.service.CountyService;
 import com.peanut.modules.book.service.ProvinceService;

src/main/java/com/peanut/modules/book/controller/PublisherController.java

@@ -3,7 +3,7 @@ package com.peanut.modules.book.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.Publisher;
+import com.peanut.modules.common.entity.Publisher;
 import com.peanut.modules.book.service.BookService;
 import com.peanut.modules.book.service.PublisherService;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/peanut/modules/book/controller/SeckillProdRelationController.java

@@ -3,7 +3,7 @@ package com.peanut.modules.book.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.SeckillProdRelationEntity;
+import com.peanut.modules.common.entity.SeckillProdRelationEntity;
 import com.peanut.modules.book.service.SeckillProdRelationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/peanut/modules/book/controller/ShopCategoryController.java

@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Map;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.ShopCategoryEntity;
+import com.peanut.modules.common.entity.ShopCategoryEntity;
 import com.peanut.modules.book.service.ShopCategoryService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;

src/main/java/com/peanut/modules/book/controller/ShopProductBookController.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.controller;
 
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.ShopProductBookEntity;
+import com.peanut.modules.common.entity.ShopProductBookEntity;
 import com.peanut.modules.book.service.ShopProductBookService;
 import com.peanut.modules.book.vo.ProductBookQueryVO;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/peanut/modules/book/controller/ShopProductController.java

@@ -4,9 +4,9 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.peanut.modules.book.entity.*;
 import com.peanut.modules.book.service.*;
 import com.peanut.modules.book.vo.ShopProductVo;
+import com.peanut.modules.common.entity.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;

src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java

@@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.dao.ShopProductLabelDao;
-import com.peanut.modules.book.dao.ShopProductToLabelDao;
-import com.peanut.modules.book.entity.MedicaldesBook;
-import com.peanut.modules.book.entity.ShopProduct;
-import com.peanut.modules.book.entity.ShopProductLabelEntity;
-import com.peanut.modules.book.entity.ShopProductToLabelEntity;
+import com.peanut.modules.common.dao.ShopProductLabelDao;
+import com.peanut.modules.common.dao.ShopProductToLabelDao;
+import com.peanut.modules.common.entity.MedicaldesBook;
+import com.peanut.modules.common.entity.ShopProduct;
+import com.peanut.modules.common.entity.ShopProductLabelEntity;
+import com.peanut.modules.common.entity.ShopProductToLabelEntity;
 import com.peanut.modules.book.service.ShopProductLabelService;
 import com.peanut.modules.book.service.ShopProductToLabelService;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/peanut/modules/book/controller/TransactionDetailsController.java

@@ -5,7 +5,6 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.peanut.modules.book.entity.TransactionDetailsEntity;
+import com.peanut.modules.common.entity.TransactionDetailsEntity;
 import com.peanut.modules.book.service.TransactionDetailsService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;

src/main/java/com/peanut/modules/book/controller/UserAddressController.java

@@ -3,7 +3,7 @@ package com.peanut.modules.book.controller;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.UserAddress;
+import com.peanut.modules.common.entity.UserAddress;
 import com.peanut.modules.book.service.UserAddressService;
 import com.peanut.modules.book.vo.UserAddressVo;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/peanut/modules/book/controller/UserBookClockInController.java

@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.UserBookClockEntity;
+import com.peanut.modules.common.entity.UserBookClockEntity;
 import com.peanut.modules.book.service.UserBookClockService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**

src/main/java/com/peanut/modules/book/controller/UserClockController.java

@@ -3,8 +3,8 @@ package com.peanut.modules.book.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.BookClockEntryEntity;
-import com.peanut.modules.book.entity.BookEntity;
+import com.peanut.modules.common.entity.BookClockEntryEntity;
+import com.peanut.modules.common.entity.BookEntity;
 import com.peanut.modules.book.service.BookClockEntryService;
 import com.peanut.modules.book.service.BookService;
 import com.peanut.modules.book.to.PageIdDto;

src/main/java/com/peanut/modules/book/controller/UserEbookBuyController.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.dao.BookDao;
-import com.peanut.modules.book.entity.BookEntity;
-import com.peanut.modules.book.entity.UserEbookBuyEntity;
+import com.peanut.modules.common.dao.BookDao;
+import com.peanut.modules.common.entity.BookEntity;
+import com.peanut.modules.common.entity.UserEbookBuyEntity;
 import com.peanut.modules.book.service.BookService;
 import com.peanut.modules.book.service.UserEbookBuyService;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/peanut/modules/book/controller/UserFeedbackController.java

@@ -2,8 +2,8 @@ package com.peanut.modules.book.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.MyUserEntity;
-import com.peanut.modules.book.entity.UserFeedbackEntity;
+import com.peanut.modules.common.entity.MyUserEntity;
+import com.peanut.modules.common.entity.UserFeedbackEntity;
 import com.peanut.modules.book.service.MyUserService;
 import com.peanut.modules.book.service.UserFeedbackSerivce;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/peanut/modules/book/controller/UserFollowUpController.java

@@ -3,10 +3,10 @@ package com.peanut.modules.book.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.BuyOrder;
-import com.peanut.modules.book.entity.MyUserEntity;
-import com.peanut.modules.book.entity.UserFollowUpEntity;
-import com.peanut.modules.book.entity.UserRecord;
+import com.peanut.modules.common.entity.BuyOrder;
+import com.peanut.modules.common.entity.MyUserEntity;
+import com.peanut.modules.common.entity.UserFollowUpEntity;
+import com.peanut.modules.common.entity.UserRecord;
 import com.peanut.modules.book.service.BuyOrderService;
 import com.peanut.modules.book.service.MyUserService;
 import com.peanut.modules.book.service.UserFollowUpService;

src/main/java/com/peanut/modules/book/controller/UserRecordController.java

@@ -4,8 +4,8 @@ import cn.com.marsoft.tool.ToolObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.*;
 import com.peanut.modules.book.service.*;
+import com.peanut.modules.common.entity.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/peanut/modules/book/service/ActivityService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.ActivityEntity;
+import com.peanut.modules.common.entity.ActivityEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/AuthorService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.AuthorEntity;
+import com.peanut.modules.common.entity.AuthorEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/BaseAreaService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.BaseAreaEntity;
+import com.peanut.modules.common.entity.BaseAreaEntity;
 
 
 public interface BaseAreaService extends IService<BaseAreaEntity> {

src/main/java/com/peanut/modules/book/service/BookBrowseRecordsService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.BookBrowseRecordsEntity;
+import com.peanut.modules.common.entity.BookBrowseRecordsEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/BookBuyConfigService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.BookBuyConfigEntity;
+import com.peanut.modules.common.entity.BookBuyConfigEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/BookCategoryService.java

@@ -1,12 +1,10 @@
 package com.peanut.modules.book.service;
 
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.BookCategoryEntity;
-import com.peanut.modules.book.entity.ShopCategoryEntity;
+import com.peanut.modules.common.entity.BookCategoryEntity;
 
 
 import java.util.List;

src/main/java/com/peanut/modules/book/service/BookChapterContentService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.BookChapterContentEntity;
+import com.peanut.modules.common.entity.BookChapterContentEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/BookChapterService.java

@@ -2,10 +2,8 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.BookChapterEntity;
-import org.springframework.web.multipart.MultipartFile;
+import com.peanut.modules.common.entity.BookChapterEntity;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/BookClockEntryChatService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.BookClockEntryChat;
+import com.peanut.modules.common.entity.BookClockEntryChat;
 
 public interface BookClockEntryChatService extends IService<BookClockEntryChat> {
 }

src/main/java/com/peanut/modules/book/service/BookClockEntryService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.BookClockEntryEntity;
+import com.peanut.modules.common.entity.BookClockEntryEntity;
 
 public interface BookClockEntryService extends IService<BookClockEntryEntity> {
 }

src/main/java/com/peanut/modules/book/service/BookForumArticlesService.java

@@ -2,9 +2,8 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.BookForumArticlesEntity;
+import com.peanut.modules.common.entity.BookForumArticlesEntity;
 
-import java.util.List;
 import java.util.Map;
 
 public interface BookForumArticlesService   extends IService<BookForumArticlesEntity> {

src/main/java/com/peanut/modules/book/service/BookForumCommenService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.BookForumCommentEntity;
+import com.peanut.modules.common.entity.BookForumCommentEntity;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/peanut/modules/book/service/BookListeningService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.BookListeningEntity;
+import com.peanut.modules.common.entity.BookListeningEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/BookListeningShelfService.java

@@ -3,7 +3,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.BookListeningShelfEntity;
+import com.peanut.modules.common.entity.BookListeningShelfEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/BookMedicalRecordsService.java

@@ -1,9 +1,8 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.BookEntity;
-import com.peanut.modules.book.entity.BookMedicalRecordsEntity;
+import com.peanut.modules.common.entity.BookEntity;
+import com.peanut.modules.common.entity.BookMedicalRecordsEntity;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/peanut/modules/book/service/BookReadRateService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.BookReadRateEntity;
+import com.peanut.modules.common.entity.BookReadRateEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/BookService.java

@@ -3,9 +3,8 @@ package com.peanut.modules.book.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.peanut.modules.book.entity.BookEntity;
+import com.peanut.modules.common.entity.BookEntity;
 
-import java.awt.print.Book;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/BookShelfService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.BookShelfEntity;
+import com.peanut.modules.common.entity.BookShelfEntity;
 import com.peanut.modules.book.vo.BookShelfVo;
 
 import java.util.List;

src/main/java/com/peanut/modules/book/service/BookTeachCommentService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.BookTeachCommentEntity;
+import com.peanut.modules.common.entity.BookTeachCommentEntity;
 
 public interface BookTeachCommentService extends IService<BookTeachCommentEntity> {
 }

src/main/java/com/peanut/modules/book/service/BookTeachLikeService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.BookTeachLikeEntity;
+import com.peanut.modules.common.entity.BookTeachLikeEntity;
 
 public interface BookTeachLikeService extends IService<BookTeachLikeEntity> {
 }

src/main/java/com/peanut/modules/book/service/BookTeachService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.BookTeachEntity;
+import com.peanut.modules.common.entity.BookTeachEntity;
 
 public interface BookTeachService extends IService<BookTeachEntity> {
 }

src/main/java/com/peanut/modules/book/service/BuyOrderDetailService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.BuyOrderDetail;
+import com.peanut.modules.common.entity.BuyOrderDetail;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/BuyOrderProductService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.BuyOrderProduct;
+import com.peanut.modules.common.entity.BuyOrderProduct;
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/com/peanut/modules/book/service/BuyOrderService.java

@@ -1,16 +1,14 @@
 package com.peanut.modules.book.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.BuyOrder;
+import com.peanut.modules.common.entity.BuyOrder;
 import com.peanut.modules.book.to.UserOrderDto;
 import com.peanut.modules.book.vo.UserOrderVo;
 import com.peanut.modules.book.vo.request.BuyOrderListRequestVo;
 import com.peanut.modules.book.vo.response.BuyOrderResponseVo;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;

src/main/java/com/peanut/modules/book/service/CityService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.City;
+import com.peanut.modules.common.entity.City;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/CountyService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.County;
+import com.peanut.modules.common.entity.County;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/CouponHistoryService.java

@@ -2,8 +2,8 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.CouponEntity;
-import com.peanut.modules.book.entity.CouponHistoryEntity;
+import com.peanut.modules.common.entity.CouponEntity;
+import com.peanut.modules.common.entity.CouponHistoryEntity;
 import com.peanut.modules.book.vo.UserCouponVo;
 
 import java.util.List;

src/main/java/com/peanut/modules/book/service/CouponProductCategoryRelationService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.CouponProductCategoryRelationEntity;
+import com.peanut.modules.common.entity.CouponProductCategoryRelationEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/CouponProductRelationService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.CouponProductRelationEntity;
+import com.peanut.modules.common.entity.CouponProductRelationEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/CouponService.java

@@ -2,10 +2,8 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.CouponEntity;
-import com.peanut.modules.book.vo.UserCouponVo;
+import com.peanut.modules.common.entity.CouponEntity;
 
-import java.util.List;
 import java.util.Map;
 
 /**

src/main/java/com/peanut/modules/book/service/ExpressCompanyService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.ExpressCompany;
+import com.peanut.modules.common.entity.ExpressCompany;
 import com.peanut.modules.book.vo.ExpressCompanyVo;
 import org.springframework.stereotype.Service;
 

src/main/java/com/peanut/modules/book/service/ExpressFeeService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.ExpressFee;
+import com.peanut.modules.common.entity.ExpressFee;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;

src/main/java/com/peanut/modules/book/service/ExpressOrderService.java

@@ -1,9 +1,9 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.ExpressOrder;
+import com.peanut.modules.common.entity.ExpressOrder;
 import com.peanut.modules.book.vo.ExpressOrderResponseVo;
-import com.peanut.modules.book.entity.ExpressQueryResponse;
+import com.peanut.modules.common.entity.ExpressQueryResponse;
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/com/peanut/modules/book/service/MedicaldesBookService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.MedicaldesBook;
+import com.peanut.modules.common.entity.MedicaldesBook;
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/com/peanut/modules/book/service/MedicaldesInheritRelationService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.MedicaldesInheritRelation;
+import com.peanut.modules.common.entity.MedicaldesInheritRelation;
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/com/peanut/modules/book/service/MedicaldesInheritService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.MedicaldesInherit;
+import com.peanut.modules.common.entity.MedicaldesInherit;
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/com/peanut/modules/book/service/MedicaldesLightService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.MedicaldesLight;
+import com.peanut.modules.common.entity.MedicaldesLight;
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/com/peanut/modules/book/service/MedicinalDrugService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.MedicinalDrug;
+import com.peanut.modules.common.entity.MedicinalDrug;
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/com/peanut/modules/book/service/MedicinalMaterialsService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.MedicinalMaterials;
+import com.peanut.modules.common.entity.MedicinalMaterials;
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/com/peanut/modules/book/service/MeridiansService.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.Meridians;
+import com.peanut.modules.common.entity.Meridians;
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/com/peanut/modules/book/service/MyUserService.java

@@ -3,12 +3,10 @@ package com.peanut.modules.book.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.BookForumArticlesEntity;
-import com.peanut.modules.book.entity.MyUserEntity;
-import com.peanut.modules.book.entity.UserAppAuthorEntity;
-import org.springframework.context.annotation.Lazy;
+import com.peanut.modules.common.entity.BookForumArticlesEntity;
+import com.peanut.modules.common.entity.MyUserEntity;
+import com.peanut.modules.common.entity.UserAppAuthorEntity;
 
-import javax.persistence.Entity;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/OrderCartService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.OrderCartEntity;
+import com.peanut.modules.common.entity.OrderCartEntity;
 import com.peanut.modules.book.vo.ShopCartVo;
 
 import java.util.List;

src/main/java/com/peanut/modules/book/service/PayPaymentOrderService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.PayPaymentOrderEntity;
+import com.peanut.modules.common.entity.PayPaymentOrderEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/PayWechatOrderService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.PayWechatOrderEntity;
+import com.peanut.modules.common.entity.PayWechatOrderEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/PayZfbOrderService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.PayZfbOrderEntity;
+import com.peanut.modules.common.entity.PayZfbOrderEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/PointCategoryService.java

@@ -1,11 +1,9 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.PointCategoryEntity;
-import com.peanut.modules.book.entity.PointEntity;
+import com.peanut.modules.common.entity.PointCategoryEntity;
 
 import java.util.List;
-import java.util.Map;
 
 public interface PointCategoryService extends IService<PointCategoryEntity> {