1

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> {
 

src/main/java/com/peanut/modules/book/service/PointService.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.PointEntity;
+import com.peanut.modules.common.entity.PointEntity;
 
 import java.util.Date;
 import java.util.List;

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

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.PrescriptCategoryEntity;
+import com.peanut.modules.common.entity.PrescriptCategoryEntity;
 
 import java.util.List;
 

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

@@ -2,8 +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.PrescriptCategoryEntity;
-import com.peanut.modules.book.entity.PrescriptEntity;
+import com.peanut.modules.common.entity.PrescriptEntity;
 
 import java.util.List;
 

src/main/java/com/peanut/modules/book/service/ProvinceService.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.Province;
+import com.peanut.modules.common.entity.Province;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/peanut/modules/book/service/PublisherService.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.Publisher;
+import com.peanut.modules.common.entity.Publisher;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/SeckillProdRelationService.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.SeckillProdRelationEntity;
+import com.peanut.modules.common.entity.SeckillProdRelationEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/ShopCategoryService.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.ShopCategoryEntity;
+import com.peanut.modules.common.entity.ShopCategoryEntity;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/peanut/modules/book/service/ShopProductBookService.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.BookEntity;
-import com.peanut.modules.book.entity.ShopProductBookEntity;
+import com.peanut.modules.common.entity.BookEntity;
+import com.peanut.modules.common.entity.ShopProductBookEntity;
 import com.peanut.modules.book.vo.ProductBookQueryVO;
 
 import java.util.List;

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

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

src/main/java/com/peanut/modules/book/service/ShopProductService.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.ShopProduct;
+import com.peanut.modules.common.entity.ShopProduct;
 
 import java.util.List;
 import java.util.Map;

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

@@ -1,9 +1,8 @@
 package com.peanut.modules.book.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.yulichang.base.MPJBaseService;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.entity.ShopProductToLabelEntity;
+import com.peanut.modules.common.entity.ShopProductToLabelEntity;
 
 import java.util.Map;
 

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

@@ -3,8 +3,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.common.utils.PageUtils;
-import com.peanut.modules.book.entity.TransactionDetailsEntity;
-import org.springframework.context.annotation.Lazy;
+import com.peanut.modules.common.entity.TransactionDetailsEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/UserAddressService.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.UserAddress;
+import com.peanut.modules.common.entity.UserAddress;
 import com.peanut.modules.book.vo.UserAddressVo;
 
 import java.util.Map;

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

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

src/main/java/com/peanut/modules/book/service/UserEbookBuyService.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.UserEbookBuyEntity;
+import com.peanut.modules.common.entity.UserEbookBuyEntity;
 
 import java.util.List;
 import java.util.Map;

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

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

src/main/java/com/peanut/modules/book/service/UserFollowUpService.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.UserFollowUpEntity;
+import com.peanut.modules.common.entity.UserFollowUpEntity;
 
 import java.util.Map;
 

src/main/java/com/peanut/modules/book/service/UserRecordService.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.UserRecord;
+import com.peanut.modules.common.entity.UserRecord;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Map;

src/main/java/com/peanut/modules/book/service/impl/ActivityServiceImpl.java

@@ -2,13 +2,11 @@ package com.peanut.modules.book.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
-import com.peanut.modules.book.dao.ActivityDao;
-import com.peanut.modules.book.dao.BuyOrderDao;
-import com.peanut.modules.book.entity.ActivityEntity;
+import com.peanut.modules.common.dao.ActivityDao;
+import com.peanut.modules.common.entity.ActivityEntity;
 import com.peanut.modules.book.service.ActivityService;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;

src/main/java/com/peanut/modules/book/service/impl/AuthorServiceImpl.java

@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
 
-import com.peanut.modules.book.dao.AuthorDao;
-import com.peanut.modules.book.entity.AuthorEntity;
+import com.peanut.modules.common.dao.AuthorDao;
+import com.peanut.modules.common.entity.AuthorEntity;
 import com.peanut.modules.book.service.AuthorService;
 
 @Slf4j

src/main/java/com/peanut/modules/book/service/impl/BaseAreaServiceImpl.java

@@ -3,8 +3,8 @@ package com.peanut.modules.book.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.peanut.modules.book.dao.BaseAreaDao;
-import com.peanut.modules.book.entity.BaseAreaEntity;
+import com.peanut.modules.common.dao.BaseAreaDao;
+import com.peanut.modules.common.entity.BaseAreaEntity;
 import com.peanut.modules.book.service.BaseAreaService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/peanut/modules/book/service/impl/BookBrowseRecordsServiceImpl.java

@@ -1,8 +1,8 @@
 package com.peanut.modules.book.service.impl;
 
-import com.peanut.modules.book.entity.BookChapterEntity;
-import com.peanut.modules.book.entity.BookEntity;
-import com.peanut.modules.book.entity.BookReadRateEntity;
+import com.peanut.modules.common.entity.BookChapterEntity;
+import com.peanut.modules.common.entity.BookEntity;
+import com.peanut.modules.common.entity.BookReadRateEntity;
 import com.peanut.modules.book.service.BookChapterService;
 import com.peanut.modules.book.service.BookReadRateService;
 import com.peanut.modules.book.service.BookService;
@@ -18,8 +18,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
 
-import com.peanut.modules.book.dao.BookBrowseRecordsDao;
-import com.peanut.modules.book.entity.BookBrowseRecordsEntity;
+import com.peanut.modules.common.dao.BookBrowseRecordsDao;
+import com.peanut.modules.common.entity.BookBrowseRecordsEntity;
 import com.peanut.modules.book.service.BookBrowseRecordsService;
 
 @Slf4j

src/main/java/com/peanut/modules/book/service/impl/BookBuyConfigServiceImpl.java

@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
 
-import com.peanut.modules.book.dao.BookBuyConfigDao;
-import com.peanut.modules.book.entity.BookBuyConfigEntity;
+import com.peanut.modules.common.dao.BookBuyConfigDao;
+import com.peanut.modules.common.entity.BookBuyConfigEntity;
 import com.peanut.modules.book.service.BookBuyConfigService;
 
 @Slf4j

src/main/java/com/peanut/modules/book/service/impl/BookCategoryServiceImpl.java

@@ -1,15 +1,13 @@
 package com.peanut.modules.book.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
-import com.peanut.modules.book.dao.BookCategoryDao;
-import com.peanut.modules.book.entity.BookCategoryEntity;
-import com.peanut.modules.book.entity.ShopCategoryEntity;
+import com.peanut.modules.common.dao.BookCategoryDao;
+import com.peanut.modules.common.entity.BookCategoryEntity;
 import com.peanut.modules.book.service.BookCategoryService;
 
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/peanut/modules/book/service/impl/BookChapterContentServiceImpl.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service.impl;
 import com.peanut.common.utils.FileDownloadUtil;
-import com.peanut.modules.book.entity.BookChapterEntity;
-import com.peanut.modules.book.entity.BookEntity;
+import com.peanut.modules.common.entity.BookChapterEntity;
+import com.peanut.modules.common.entity.BookEntity;
 import com.peanut.modules.book.service.BookChapterService;
 import com.peanut.modules.book.service.BookService;
 import com.spire.doc.Document;
@@ -20,8 +20,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
-import com.peanut.modules.book.dao.BookChapterContentDao;
-import com.peanut.modules.book.entity.BookChapterContentEntity;
+import com.peanut.modules.common.dao.BookChapterContentDao;
+import com.peanut.modules.common.entity.BookChapterContentEntity;
 import com.peanut.modules.book.service.BookChapterContentService;
 import org.springframework.util.CollectionUtils;
 @Slf4j

src/main/java/com/peanut/modules/book/service/impl/BookChapterServiceImpl.java

@@ -1,13 +1,8 @@
 package com.peanut.modules.book.service.impl;
 
-import com.peanut.modules.book.vo.BookShelfVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.List;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,10 +11,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
 
-import com.peanut.modules.book.dao.BookChapterDao;
-import com.peanut.modules.book.entity.BookChapterEntity;
+import com.peanut.modules.common.dao.BookChapterDao;
+import com.peanut.modules.common.entity.BookChapterEntity;
 import com.peanut.modules.book.service.BookChapterService;
-import org.springframework.web.multipart.MultipartFile;
 
 @Slf4j
 @Service("bookChapterService")

src/main/java/com/peanut/modules/book/service/impl/BookClockEntryChatImpl.java

@@ -1,8 +1,8 @@
 package com.peanut.modules.book.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.peanut.modules.book.dao.BookClockEntryChatDao;
-import com.peanut.modules.book.entity.BookClockEntryChat;
+import com.peanut.modules.common.dao.BookClockEntryChatDao;
+import com.peanut.modules.common.entity.BookClockEntryChat;
 import com.peanut.modules.book.service.BookClockEntryChatService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/peanut/modules/book/service/impl/BookClockEntryImpl.java

@@ -1,8 +1,8 @@
 package com.peanut.modules.book.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.peanut.modules.book.dao.BookClockEntryDao;
-import com.peanut.modules.book.entity.BookClockEntryEntity;
+import com.peanut.modules.common.dao.BookClockEntryDao;
+import com.peanut.modules.common.entity.BookClockEntryEntity;
 import com.peanut.modules.book.service.BookClockEntryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/peanut/modules/book/service/impl/BookForumArticlesServiceImpl.java

@@ -6,15 +6,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
-import com.peanut.modules.book.dao.BookForumArticlesDao;
-import com.peanut.modules.book.entity.BookForumArticlesEntity;
+import com.peanut.modules.common.dao.BookForumArticlesDao;
+import com.peanut.modules.common.entity.BookForumArticlesEntity;
 import com.peanut.modules.book.service.BookForumArticlesService;
-import com.peanut.modules.book.service.MyUserService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 import java.util.Map;
 @Slf4j
 @Service

src/main/java/com/peanut/modules/book/service/impl/BookForumCommenServiceImpl.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
-import com.peanut.modules.book.dao.BookForumCommentDao;
-import com.peanut.modules.book.entity.BookForumCommentEntity;
+import com.peanut.modules.common.dao.BookForumCommentDao;
+import com.peanut.modules.common.entity.BookForumCommentEntity;
 import com.peanut.modules.book.service.BookForumCommenService;
 import com.peanut.modules.book.service.MyUserService;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/peanut/modules/book/service/impl/BookListeningServiceImpl.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
-import com.peanut.modules.book.dao.BookListeningDao;
-import com.peanut.modules.book.entity.BookListeningEntity;
+import com.peanut.modules.common.dao.BookListeningDao;
+import com.peanut.modules.common.entity.BookListeningEntity;
 import com.peanut.modules.book.service.BookListeningService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/peanut/modules/book/service/impl/BookListeningShelfServiceImpl.java

@@ -1,10 +1,9 @@
 package com.peanut.modules.book.service.impl;
 
-import cn.com.marsoft.base.impl.BaseServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
-import com.peanut.modules.book.dao.BookListeningShelfDao;
-import com.peanut.modules.book.entity.BookListeningShelfEntity;
+import com.peanut.modules.common.dao.BookListeningShelfDao;
+import com.peanut.modules.common.entity.BookListeningShelfEntity;
 import com.peanut.modules.book.service.BookListeningShelfService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/peanut/modules/book/service/impl/BookMedicalRecordsServiceImpl.java

@@ -1,13 +1,9 @@
 package com.peanut.modules.book.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.peanut.common.utils.PageUtils;
-import com.peanut.common.utils.Query;
-import com.peanut.modules.book.dao.BookMedicalRecordsDao;
-import com.peanut.modules.book.entity.BookEntity;
-import com.peanut.modules.book.entity.BookMedicalRecordsEntity;
+import com.peanut.modules.common.dao.BookMedicalRecordsDao;
+import com.peanut.modules.common.entity.BookEntity;
+import com.peanut.modules.common.entity.BookMedicalRecordsEntity;
 import com.peanut.modules.book.service.BookMedicalRecordsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/peanut/modules/book/service/impl/BookReadRateServiceImpl.java

@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
 
-import com.peanut.modules.book.dao.BookReadRateDao;
-import com.peanut.modules.book.entity.BookReadRateEntity;
+import com.peanut.modules.common.dao.BookReadRateDao;
+import com.peanut.modules.common.entity.BookReadRateEntity;
 import com.peanut.modules.book.service.BookReadRateService;
 
 @Slf4j

src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java

@@ -14,13 +14,13 @@ import com.peanut.common.utils.ConstantPropertiesUtils;
 import com.peanut.common.utils.FileDownloadUtil;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
-import com.peanut.modules.book.dao.BookDao;
-import com.peanut.modules.book.entity.*;
+import com.peanut.modules.common.dao.BookDao;
 import com.peanut.modules.book.entity.SysDictDataEntity;
 import com.peanut.modules.book.service.BookChapterContentService;
 import com.peanut.modules.book.service.BookChapterService;
 import com.peanut.modules.book.service.BookService;
 import com.peanut.modules.book.service.PublisherService;
+import com.peanut.modules.common.entity.*;
 import com.peanut.modules.sys.service.SysDictDataService;
 import com.spire.doc.Document;
 import com.spire.doc.Section;
@@ -31,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.awt.print.Book;
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;

src/main/java/com/peanut/modules/book/service/impl/BookShelfServiceImpl.java

@@ -1,7 +1,7 @@
 package com.peanut.modules.book.service.impl;
-import com.peanut.modules.book.entity.*;
 import com.peanut.modules.book.service.*;
 import com.peanut.modules.book.vo.BookShelfVo;
+import com.peanut.modules.common.entity.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
-import com.peanut.modules.book.dao.BookShelfDao;
+import com.peanut.modules.common.dao.BookShelfDao;
 
 @Slf4j
 @Service("bookShelfService")

src/main/java/com/peanut/modules/book/service/impl/BookTeachCommentServiceImpl.java

@@ -1,8 +1,8 @@
 package com.peanut.modules.book.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.peanut.modules.book.dao.BookTeachCommentDao;
-import com.peanut.modules.book.entity.BookTeachCommentEntity;
+import com.peanut.modules.common.dao.BookTeachCommentDao;
+import com.peanut.modules.common.entity.BookTeachCommentEntity;
 import com.peanut.modules.book.service.BookTeachCommentService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/peanut/modules/book/service/impl/BookTeachLikeServiceImpl.java

@@ -1,8 +1,8 @@
 package com.peanut.modules.book.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.peanut.modules.book.dao.BookTeachLikeDao;
-import com.peanut.modules.book.entity.BookTeachLikeEntity;
+import com.peanut.modules.common.dao.BookTeachLikeDao;
+import com.peanut.modules.common.entity.BookTeachLikeEntity;
 import com.peanut.modules.book.service.BookTeachLikeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/peanut/modules/book/service/impl/BookTeachServiceImpl.java

@@ -1,8 +1,8 @@
 package com.peanut.modules.book.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.peanut.modules.book.dao.BookTeachDao;
-import com.peanut.modules.book.entity.BookTeachEntity;
+import com.peanut.modules.common.dao.BookTeachDao;
+import com.peanut.modules.common.entity.BookTeachEntity;
 import com.peanut.modules.book.service.BookTeachService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/peanut/modules/book/service/impl/BuyOrderDetailServiceImpl.java

@@ -1,6 +1,6 @@
 package com.peanut.modules.book.service.impl;
 
-import com.peanut.modules.book.entity.BuyOrderDetail;
+import com.peanut.modules.common.entity.BuyOrderDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
 
-import com.peanut.modules.book.dao.BuyOrderDetailDao;
+import com.peanut.modules.common.dao.BuyOrderDetailDao;
 import com.peanut.modules.book.service.BuyOrderDetailService;
 
 @Slf4j

src/main/java/com/peanut/modules/book/service/impl/BuyOrderProductServiceImpl.java

@@ -1,8 +1,8 @@
 package com.peanut.modules.book.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.peanut.modules.book.dao.BuyOrderProductDao;
-import com.peanut.modules.book.entity.BuyOrderProduct;
+import com.peanut.modules.common.dao.BuyOrderProductDao;
+import com.peanut.modules.common.entity.BuyOrderProduct;
 import com.peanut.modules.book.service.BuyOrderProductService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java

@@ -8,24 +8,22 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.query.MPJLambdaQueryWrapper;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.peanut.common.utils.DateUtils;
 import com.peanut.common.utils.ExcludeEmptyQueryWrapper;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
 import com.peanut.config.Constants;
-import com.peanut.modules.book.dao.BuyOrderDao;
-import com.peanut.modules.book.dao.BuyOrderProductDao;
-import com.peanut.modules.book.dao.ExpressOrderDao;
-import com.peanut.modules.book.dao.ShopProductBookDao;
-import com.peanut.modules.book.entity.*;
+import com.peanut.modules.common.dao.BuyOrderDao;
+import com.peanut.modules.common.dao.BuyOrderProductDao;
+import com.peanut.modules.common.dao.ExpressOrderDao;
+import com.peanut.modules.common.dao.ShopProductBookDao;
 import com.peanut.modules.book.service.*;
 import com.peanut.modules.book.to.UserOrderDto;
 import com.peanut.modules.book.vo.ExpressOrderResponseVo;
 import com.peanut.modules.book.vo.UserOrderVo;
 import com.peanut.modules.book.vo.request.BuyOrderListRequestVo;
 import com.peanut.modules.book.vo.response.*;
+import com.peanut.modules.common.entity.*;
 import com.peanut.modules.oss.service.OssService;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
@@ -33,15 +31,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.security.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;

src/main/java/com/peanut/modules/book/service/impl/CityServiceImpl.java

@@ -1,6 +1,6 @@
 package com.peanut.modules.book.service.impl;
 
-import com.peanut.modules.book.entity.City;
+import com.peanut.modules.common.entity.City;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import java.util.Map;
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
 
-import com.peanut.modules.book.dao.CityDao;
+import com.peanut.modules.common.dao.CityDao;
 import com.peanut.modules.book.service.CityService;
 
 @Slf4j

src/main/java/com/peanut/modules/book/service/impl/CountyServiceImpl.java

@@ -1,6 +1,6 @@
 package com.peanut.modules.book.service.impl;
 
-import com.peanut.modules.book.entity.County;
+import com.peanut.modules.common.entity.County;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import java.util.Map;
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
 
-import com.peanut.modules.book.dao.CountyDao;
+import com.peanut.modules.common.dao.CountyDao;
 import com.peanut.modules.book.service.CountyService;
 
 @Slf4j

src/main/java/com/peanut/modules/book/service/impl/CouponHistoryServiceImpl.java

@@ -1,9 +1,9 @@
 package com.peanut.modules.book.service.impl;
 
 import com.peanut.common.utils.DateUtil;
-import com.peanut.modules.book.entity.*;
 import com.peanut.modules.book.service.*;
 import com.peanut.modules.book.vo.UserCouponVo;
+import com.peanut.modules.common.entity.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
 
-import com.peanut.modules.book.dao.CouponHistoryDao;
+import com.peanut.modules.common.dao.CouponHistoryDao;
 
 @Slf4j
 @Service("couponHistoryService")

src/main/java/com/peanut/modules/book/service/impl/CouponProductCategoryRelationServiceImpl.java

@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
 
-import com.peanut.modules.book.dao.CouponProductCategoryRelationDao;
-import com.peanut.modules.book.entity.CouponProductCategoryRelationEntity;
+import com.peanut.modules.common.dao.CouponProductCategoryRelationDao;
+import com.peanut.modules.common.entity.CouponProductCategoryRelationEntity;
 import com.peanut.modules.book.service.CouponProductCategoryRelationService;
 
 @Slf4j

src/main/java/com/peanut/modules/book/service/impl/CouponProductRelationServiceImpl.java

@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
 
-import com.peanut.modules.book.dao.CouponProductRelationDao;
-import com.peanut.modules.book.entity.CouponProductRelationEntity;
+import com.peanut.modules.common.dao.CouponProductRelationDao;
+import com.peanut.modules.common.entity.CouponProductRelationEntity;
 import com.peanut.modules.book.service.CouponProductRelationService;
 
 @Slf4j

src/main/java/com/peanut/modules/book/service/impl/CouponServiceImpl.java

@@ -1,20 +1,18 @@
 package com.peanut.modules.book.service.impl;
 
 import com.peanut.common.utils.ExcludeEmptyQueryWrapper;
-import com.peanut.modules.book.service.CouponHistoryService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
 
-import com.peanut.modules.book.dao.CouponDao;
-import com.peanut.modules.book.entity.CouponEntity;
+import com.peanut.modules.common.dao.CouponDao;
+import com.peanut.modules.common.entity.CouponEntity;
 import com.peanut.modules.book.service.CouponService;
 
 @Slf4j

src/main/java/com/peanut/modules/book/service/impl/ExpressCompanyServiceImpl.java

@@ -1,8 +1,8 @@
 package com.peanut.modules.book.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.peanut.modules.book.dao.ExpressCompanyDao;
-import com.peanut.modules.book.entity.ExpressCompany;
+import com.peanut.modules.common.dao.ExpressCompanyDao;
+import com.peanut.modules.common.entity.ExpressCompany;
 import com.peanut.modules.book.service.ExpressCompanyService;
 import com.peanut.modules.book.vo.ExpressCompanyVo;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/peanut/modules/book/service/impl/ExpressFeeServiceImpl.java

@@ -2,8 +2,8 @@ package com.peanut.modules.book.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.peanut.modules.book.dao.ExpressFeeDao;
-import com.peanut.modules.book.entity.ExpressFee;
+import com.peanut.modules.common.dao.ExpressFeeDao;
+import com.peanut.modules.common.entity.ExpressFee;
 import com.peanut.modules.book.service.ExpressFeeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/peanut/modules/book/service/impl/ExpressOrderServiceImpl.java

@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.HttpClientUtils;
 import com.peanut.common.utils.KdUtils;
 import com.peanut.config.Constants;
-import com.peanut.modules.book.dao.ExpressOrderDao;
-import com.peanut.modules.book.entity.ExpressCommodity;
-import com.peanut.modules.book.entity.ExpressOrder;
-import com.peanut.modules.book.entity.ExpressQueryResponse;
+import com.peanut.modules.common.dao.ExpressOrderDao;
+import com.peanut.modules.common.entity.ExpressCommodity;
+import com.peanut.modules.common.entity.ExpressOrder;
+import com.peanut.modules.common.entity.ExpressQueryResponse;
 import com.peanut.modules.book.service.ExpressOrderService;
 import com.peanut.modules.book.vo.*;
 import com.peanut.modules.book.vo.request.ExpressOrderRequestVo;

src/main/java/com/peanut/modules/book/service/impl/MedicaldesBookServiceImpl.java

@@ -1,8 +1,8 @@
 package com.peanut.modules.book.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.peanut.modules.book.dao.MedicaldesBookDao;
-import com.peanut.modules.book.entity.MedicaldesBook;
+import com.peanut.modules.common.dao.MedicaldesBookDao;
+import com.peanut.modules.common.entity.MedicaldesBook;
 import com.peanut.modules.book.service.MedicaldesBookService;
 import org.springframework.stereotype.Service;
 

src/main/java/com/peanut/modules/book/service/impl/MedicaldesInheritRelationServiceImpl.java

@@ -1,8 +1,8 @@
 package com.peanut.modules.book.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.peanut.modules.book.dao.MedicaldesInheritRelationDao;
-import com.peanut.modules.book.entity.MedicaldesInheritRelation;
+import com.peanut.modules.common.dao.MedicaldesInheritRelationDao;
+import com.peanut.modules.common.entity.MedicaldesInheritRelation;
 import com.peanut.modules.book.service.MedicaldesInheritRelationService;
 import org.springframework.stereotype.Service;
 

src/main/java/com/peanut/modules/book/service/impl/MedicaldesInheritServiceImpl.java

@@ -1,8 +1,8 @@
 package com.peanut.modules.book.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.peanut.modules.book.dao.MedicaldesInheritDao;
-import com.peanut.modules.book.entity.MedicaldesInherit;
+import com.peanut.modules.common.dao.MedicaldesInheritDao;
+import com.peanut.modules.common.entity.MedicaldesInherit;
 import com.peanut.modules.book.service.MedicaldesInheritService;
 import org.springframework.stereotype.Service;