From 5a43a5020bf3deca7908a58bf6e698fb98425090 Mon Sep 17 00:00:00 2001
From: yc13649764453 <1902434166@qq.com>
Date: Tue, 19 Sep 2023 15:00:15 +0800
Subject: [PATCH] --9.19

---
 .idea/workspace.xml                           | 782 +++++++++---------
 .../controller/BookChapterController.java     |  86 +-
 .../BookClockinPunchController.java           |  17 +-
 .../book/controller/BookController.java       |  15 +-
 .../book/controller/BuyOrderController.java   |   3 +-
 .../controller/ShopProductController.java     | 252 +++---
 .../ShopProudictBookController.java           |  19 +-
 .../modules/book/dao/ShopProudictBookDao.java |   5 +
 .../book/entity/ShopProductEntity.java        |   3 +
 .../book/entity/ShopProudictBookEntity.java   |   7 +-
 .../modules/book/service/BookService.java     |   2 +-
 .../book/service/ShopProductService.java      |   2 +
 .../book/service/ShopProudictBookService.java |   1 +
 .../service/impl/BookChapterServiceImpl.java  |   2 +-
 .../book/service/impl/BookServiceImpl.java    |  53 +-
 .../service/impl/BookTaskServiceImpl.java     |   2 +-
 .../service/impl/OrderCartServiceImpl.java    |   3 +-
 .../service/impl/ShopProductServiceImpl.java  |   9 +
 .../impl/ShopProudictBookServiceImpl.java     |  43 +-
 .../modules/book/vo/ProudictBookqueryVO.java  |  19 +-
 .../mapper/book/ShopProudictBookDao.xml       |   2 +
 21 files changed, 745 insertions(+), 582 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index db373d5e..cb7df820 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,33 +2,27 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c20d2499-ffac-46d1-a23d-75d554327ce0" name="Default Changelist" comment="---快递发货问题和取消面单接口">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/BookForumArticlesVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/ProudictBookqueryVO.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/peanut_book.iml" beforeDir="false" afterPath="$PROJECT_DIR$/peanut_book.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookCategoryController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookCategoryController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookChapterController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookChapterController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookClockinPunchController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookClockinPunchController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/OrderCartController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/OrderCartController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProductController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProductController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/UserRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/UserRecordController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/BookCategoryDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/BookCategoryDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookEntity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/OrderCartEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/OrderCartEntity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProudictBookController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProudictBookController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/ShopProudictBookDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/ShopProudictBookDao.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BookCategoryService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BookCategoryService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/MyUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/MyUserService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/UserRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/UserRecordService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookCategoryServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookCategoryServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProudictBookEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProudictBookEntity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BookService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BookService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/ShopProductService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/ShopProductService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookChapterServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookChapterServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookTaskServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookTaskServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/OrderCartServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/OrderCartServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/UserRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/UserRecordServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/ShopCartVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/ShopCartVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/book/OrderCartDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/book/OrderCartDao.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/book/UserRecordDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/book/UserRecordDao.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/ProudictBookqueryVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/ProudictBookqueryVO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/book/ShopProudictBookDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/book/ShopProudictBookDao.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -67,10 +61,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProudictBookEntity.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="575">
-              <caret line="38" column="34" lean-forward="true" selection-start-line="38" selection-start-column="34" selection-end-line="38" selection-end-column="34" />
+            <state relative-caret-position="1125">
+              <caret line="45" column="55" lean-forward="true" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -78,41 +72,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="350">
-              <caret line="57" column="41" selection-start-line="57" selection-start-column="41" selection-end-line="57" selection-end-column="41" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookCategoryController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="500">
-              <caret line="20" selection-start-line="20" selection-end-line="21" selection-end-column="36" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="843">
-              <caret line="611" column="34" selection-start-line="611" selection-start-column="12" selection-end-line="611" selection-end-column="34" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProudictBookController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProductController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="450">
-              <caret line="57" column="44" lean-forward="true" selection-start-line="57" selection-start-column="44" selection-end-line="57" selection-end-column="44" />
+            <state relative-caret-position="66">
+              <caret line="339" column="49" lean-forward="true" selection-start-line="339" selection-start-column="49" selection-end-line="339" selection-end-column="49" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -121,19 +85,25 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopCategoryController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProudictBookController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="318">
-              <caret line="117" column="67" selection-start-line="117" selection-start-column="67" selection-end-line="117" selection-end-column="67" />
+            <state relative-caret-position="-1250">
+              <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/weChatConfig.properties">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProudictBookEntity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="750">
-              <caret line="30" column="10" selection-start-line="30" selection-start-column="10" selection-end-line="30" selection-end-column="10" />
+            <state relative-caret-position="675">
+              <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -153,15 +123,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>book/bookchapter</find>
-      <find>未购买</find>
-      <find>签到</find>
-      <find>catalogueEntity</find>
-      <find>Append</find>
-      <find>shop-categorytree</find>
-      <find>save</find>
-      <find>mybatis</find>
-      <find>验证码</find>
       <find>/sms/sendcode</find>
       <find>账户余额不足</find>
       <find>余额不足</find>
@@ -183,6 +144,15 @@
       <find>shopproduct</find>
       <find>book/book</find>
       <find>record/All</find>
+      <find>book/shopproduct</find>
+      <find>buy/record</find>
+      <find>赠送</find>
+      <find>book/bookchapter</find>
+      <find>book/task</find>
+      <find>签到</find>
+      <find>精选</find>
+      <find>bookinfolists</find>
+      <find>购买</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -196,22 +166,14 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookForumCommenServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookForumCommentController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookForumArticlesEntity.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/uedit-config.json" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopCategoryServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/book/BookCategoryDao.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookClockinEntity.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookChapterContentServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/oss/service/impl/OssServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookChapterServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookClockinController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookForumArticlesServiceController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookChapterController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookCategoryEntity.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/UserEbookBuyController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/BookBuyConfigDao.java" />
@@ -219,34 +181,42 @@
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/ShopProductDao.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookEntity.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/MyUserService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/BookCategoryDao.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BookCategoryService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookCategoryServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookCategoryController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/ShopProudictBookDao.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/UserRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/OrderCartEntity.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/book/OrderCartDao.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/ShopCartVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/OrderCartServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/OrderCartController.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/book/ShopProudictBookDao.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/ProudictBookqueryVO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProudictBookEntity.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/book/UserRecordDao.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/UserRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/UserRecordService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProductController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/weChatConfig.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/OrderCartServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/book/ShopProudictBookDao.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/ShopProudictBookDao.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/ShopProductService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BookService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookChapterServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookTaskServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookChapterController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/ProudictBookqueryVO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookClockinPunchController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProudictBookController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProudictBookEntity.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProductController.java" />
       </list>
     </option>
   </component>
@@ -285,8 +255,8 @@
     <option name="jreName" value="1.8" />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="161" />
-    <option name="y" value="25" />
+    <option name="x" value="233" />
+    <option name="y" value="18" />
     <option name="width" value="1510" />
     <option name="height" value="966" />
   </component>
@@ -447,13 +417,6 @@
               <item name="book" type="462c0819:PsiDirectoryNode" />
               <item name="vo" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
-              <item name="peanut_book" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
               <item name="peanut_book" type="462c0819:PsiDirectoryNode" />
@@ -467,14 +430,14 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="DatabaseDriversLRU" value="mysql" />
     <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
-    <property name="MyBatisLogPluginindexNum" value="83063" />
+    <property name="MyBatisLogPluginindexNum" value="32675" />
     <property name="MyBatisLogPluginparameters" value="Parameters:" />
     <property name="MyBatisLogPluginpreparing" value="Preparing:" />
     <property name="MyBatisLogPluginrunning" value="true" />
@@ -966,7 +929,8 @@
       <workItem from="1694739476334" duration="30349000" />
       <workItem from="1694775178443" duration="490000" />
       <workItem from="1694841408669" duration="24017000" />
-      <workItem from="1694999050548" duration="2054000" />
+      <workItem from="1694999050548" duration="32265000" />
+      <workItem from="1695085368317" duration="16861000" />
     </task>
     <task id="LOCAL-00006" summary="1">
       <created>1663124293206</created>
@@ -1347,7 +1311,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="4261783000" />
+    <option name="totallyTimeSpent" value="4308855000" />
   </component>
   <component name="TodoView" selected-index="3">
     <todo-panel id="selected-file">
@@ -1368,18 +1332,18 @@
       <window_info id="UI Designer" order="4" />
       <window_info id="Favorites" order="5" sideWeight="0.5016892" side_tool="true" weight="0.22506666" />
       <window_info id="Web" order="6" sideWeight="0.50089127" side_tool="true" weight="0.29264393" />
-      <window_info active="true" content_ui="combo" id="Project" order="7" sideWeight="0.4983108" visible="true" weight="0.2784" />
+      <window_info content_ui="combo" id="Project" order="7" sideWeight="0.4983108" visible="true" weight="0.21813333" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.80151844" />
-      <window_info anchor="bottom" x="22" y="339" width="1876" height="361" id="Debug" order="2" sideWeight="0.49813333" weight="0.37201735" />
+      <window_info anchor="bottom" x="22" y="339" width="1876" height="361" id="Debug" order="2" sideWeight="0.49813333" weight="0.61930585" />
       <window_info anchor="bottom" id="Cvs" order="3" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="4" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="5" sideWeight="0.4992" weight="0.329718" />
       <window_info anchor="bottom" id="Spring" order="6" sideWeight="0.49973333" weight="0.329718" />
       <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.49946696" weight="0.73752713" />
       <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50346667" side_tool="true" weight="0.8969631" />
-      <window_info anchor="bottom" id="MyBatis Log" order="10" weight="0.6724512" />
+      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.504" side_tool="true" weight="0.47722343" />
+      <window_info anchor="bottom" id="MyBatis Log" order="10" weight="0.54013014" />
       <window_info anchor="bottom" id="Java Enterprise" order="11" weight="0.329718" />
       <window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="13" weight="0.3470716" />
@@ -1389,9 +1353,9 @@
       <window_info anchor="bottom" id="Sequence Diagram" order="17" weight="0.9229935" />
       <window_info anchor="bottom" id="thief-book" order="18" weight="0.329718" />
       <window_info anchor="bottom" id="Problems" order="19" weight="0.28850326" />
-      <window_info anchor="bottom" id="Run" order="20" sideWeight="0.49653333" weight="0.6529284" />
+      <window_info active="true" anchor="bottom" id="Run" order="20" sideWeight="0.496" visible="true" weight="0.72776574" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.2496" />
       <window_info anchor="right" id="Palette" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="right" id="Ant Build" order="4" weight="0.2496" />
@@ -1555,6 +1519,12 @@
           <properties />
           <option name="timeStamp" value="29" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookChapterController.java</url>
+          <line>159</line>
+          <properties />
+          <option name="timeStamp" value="32" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>
@@ -1575,142 +1545,6 @@
     </SUITE>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookChapterContentServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="45" selection-start-column="45" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BookCategoryService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="575">
-          <caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookCategoryServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="664">
-          <caret line="67" column="59" selection-start-line="67" selection-start-column="59" selection-end-line="67" selection-end-column="59" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/UserAddressEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="297">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/UserEbookBuyService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="15" column="72" selection-start-line="15" selection-start-column="54" selection-end-line="15" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/SeckillProdRelationServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="15" column="21" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/PayZfbOrderServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/UserFeedbackController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-745">
-          <caret line="37" column="11" lean-forward="true" selection-start-line="37" selection-start-column="11" selection-end-line="37" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/UserFollowUpController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1880">
-          <caret line="192" column="5" lean-forward="true" selection-start-line="161" selection-start-column="2" selection-end-line="192" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/ShopCategoryService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="22" column="18" selection-start-line="22" selection-start-column="18" selection-end-line="22" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopCategoryServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="347">
-          <caret line="83" column="35" lean-forward="true" selection-start-line="83" selection-start-column="35" selection-end-line="83" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/book/ShopSeckillDao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="6" column="85" selection-start-line="6" selection-start-column="85" selection-end-line="6" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/SeckillProdRelationDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/PublisherService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.3.1/mybatis-plus-core-3.3.1.jar!/com/baomidou/mybatisplus/core/metadata/IPage.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="297">
-          <caret line="68" column="12" selection-start-line="68" selection-start-column="12" selection-end-line="68" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/book/OrderCartDao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="15" column="57" selection-start-line="15" selection-start-column="57" selection-end-line="15" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/OrderCartDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.3.1/mybatis-plus-extension-3.3.1.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="297">
-          <caret line="53" column="20" selection-start-line="53" selection-start-column="20" selection-end-line="53" selection-end-column="20" />
-          <folding>
-            <element signature="e#1960#1961#0" expanded="true" />
-            <element signature="e#2037#2038#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/PayPaymentOrderEntity.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-481">
@@ -1718,99 +1552,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/book/ShopProudictBookDao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="250">
-          <caret line="10" column="54" lean-forward="true" selection-start-line="10" selection-start-column="54" selection-end-line="10" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/ShopProudictBookDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/OrderCartEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="37" column="32" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/OrderCartService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/ShopCartVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="9" column="18" lean-forward="true" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/OrderCartController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="594">
-          <caret line="97" column="73" lean-forward="true" selection-start-line="97" selection-start-column="73" selection-end-line="97" selection-end-column="73" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-154">
-          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/ProudictBookqueryVO.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="619">
-          <caret line="27" column="37" selection-start-line="27" selection-start-column="37" selection-end-line="27" selection-end-column="37" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/OrderCartServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="780">
-          <caret line="77" column="17" selection-start-line="77" selection-start-column="17" selection-end-line="77" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BookService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="297">
-          <caret line="17" column="14" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-153">
-          <caret line="58" column="21" selection-start-line="58" selection-start-column="21" selection-end-line="58" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="380">
-          <caret line="57" column="40" selection-start-line="57" selection-start-column="40" selection-end-line="57" selection-end-column="40" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/UserRecordDao.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="175">
@@ -1818,13 +1559,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/UserRecordController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="176" column="25" selection-start-line="176" selection-start-column="25" selection-end-line="176" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/book/UserRecordDao.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="250">
@@ -1839,51 +1573,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/UserRecordServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="24" selection-start-line="24" selection-end-line="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/UserRecordService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="21" column="1" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="15" column="36" selection-start-line="15" selection-start-column="36" selection-end-line="15" selection-end-column="36" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="439">
-          <caret line="150" column="37" selection-start-line="150" selection-start-column="30" selection-end-line="150" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProductController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="433">
-          <caret line="175" column="25" selection-start-line="175" selection-start-column="25" selection-end-line="175" selection-end-column="25" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#4212#4232#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1897,33 +1589,26 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/weChatConfig.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/ShopCartVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="750">
-          <caret line="30" column="10" selection-start-line="30" selection-start-column="10" selection-end-line="30" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProudictBookEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="575">
-          <caret line="38" column="34" lean-forward="true" selection-start-line="38" selection-start-column="34" selection-end-line="38" selection-end-column="34" />
+        <state relative-caret-position="469">
+          <caret line="38" column="24" selection-start-line="38" selection-start-column="24" selection-end-line="38" selection-end-column="24" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/OrderCartEntity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="350">
-          <caret line="57" column="41" selection-start-line="57" selection-start-column="41" selection-end-line="57" selection-end-column="41" />
+        <state relative-caret-position="-78">
+          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookCategoryController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="500">
+        <state relative-caret-position="405">
           <caret line="20" selection-start-line="20" selection-end-line="21" selection-end-column="36" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1931,24 +1616,305 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/OrderCartService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="843">
-          <caret line="611" column="34" selection-start-line="611" selection-start-column="12" selection-end-line="611" selection-end-column="34" />
+        <state relative-caret-position="375">
+          <caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/OrderCartController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="594">
+          <caret line="97" column="56" lean-forward="true" selection-start-line="97" selection-start-column="56" selection-end-line="97" selection-end-column="56" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/OrderCartServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1475">
+          <caret line="78" column="32" selection-start-line="78" selection-start-column="32" selection-end-line="78" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/book/ShopProudictBookDao.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="400">
+          <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/ShopProudictBookDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="12" selection-start-line="12" selection-end-line="12" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/weChatConfig.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="6" column="48" selection-start-line="6" selection-start-column="48" selection-end-line="6" selection-end-column="48" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopCategoryController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="318">
+        <state relative-caret-position="2550">
           <caret line="117" column="67" selection-start-line="117" selection-start-column="67" selection-end-line="117" selection-end-column="67" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/entity/SysDictDataEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="35" lean-forward="true" selection-start-column="35" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/UserRecordService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="18" column="14" selection-start-line="18" selection-start-column="14" selection-end-line="18" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/UserRecordController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="475">
+          <caret line="34" column="47" selection-start-line="34" selection-start-column="47" selection-end-line="34" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/UserRecordServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="439">
+          <caret line="45" column="56" lean-forward="true" selection-start-line="45" selection-start-column="56" selection-end-line="45" selection-end-column="56" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="430" column="74" lean-forward="true" selection-start-line="430" selection-start-column="74" selection-end-line="430" selection-end-column="74" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookChapterEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="543">
+          <caret line="60" column="20" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookTaskController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="49" column="20" lean-forward="true" selection-start-line="49" selection-start-column="20" selection-end-line="49" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookChapterServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="475">
+          <caret line="37" column="5" lean-forward="true" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BookTaskService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="175">
+          <caret line="11" column="14" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BookChapterService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="20" column="14" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookTaskServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="19" column="60" lean-forward="true" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.3.18/spring-webmvc-5.3.18.jar!/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="178">
+          <caret line="56" selection-start-line="56" selection-end-line="56" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.18/spring-web-5.3.18.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="178">
+          <caret line="107" selection-start-line="107" selection-end-line="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BookService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="297">
+          <caret line="17" column="14" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="75" column="77" selection-start-line="75" selection-start-column="77" selection-end-line="75" selection-end-column="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="425">
+          <caret line="56" column="40" selection-start-line="56" selection-start-column="40" selection-end-line="56" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_151/src.zip!/java/lang/Integer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="51" column="19" selection-start-line="51" selection-start-column="19" selection-end-line="51" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2616">
+          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookChapterController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="174" column="11" selection-start-line="174" selection-start-column="11" selection-end-line="174" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/ProudictBookqueryVO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="334">
+          <caret line="26" column="26" lean-forward="true" selection-start-line="26" selection-start-column="26" selection-end-line="26" selection-end-column="26" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/MyUserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="30" column="19" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="289">
+          <caret line="139" column="38" lean-forward="true" selection-start-line="139" selection-start-column="38" selection-end-line="139" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/ShopProductService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="544">
+          <caret line="28" column="14" selection-start-line="28" selection-start-column="14" selection-end-line="28" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="400">
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="194">
+          <caret line="150" column="11" lean-forward="true" selection-start-line="150" selection-start-column="11" selection-end-line="150" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="389">
+          <caret line="62" column="92" lean-forward="true" selection-start-line="62" selection-start-column="92" selection-end-line="62" selection-end-column="92" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookClockinPunchController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="394">
+          <caret line="165" column="76" lean-forward="true" selection-start-line="165" selection-start-column="76" selection-end-line="165" selection-end-column="76" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.3.1/mybatis-plus-extension-3.3.1.jar!/com/baomidou/mybatisplus/extension/plugins/pagination/Page.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3450">
+          <caret line="27" column="24" lean-forward="true" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
+          <folding>
+            <element signature="e#2234#2235#0" expanded="true" />
+            <element signature="e#2269#2270#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.3.1/mybatis-plus-core-3.3.1.jar!/com/baomidou/mybatisplus/core/metadata/IPage.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="297">
+          <caret line="68" column="13" lean-forward="true" selection-start-line="68" selection-start-column="13" selection-end-line="68" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1125">
+          <caret line="45" column="55" lean-forward="true" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProudictBookEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="675">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProudictBookController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="57" column="44" lean-forward="true" selection-start-line="57" selection-start-column="44" selection-end-line="57" selection-end-column="44" />
+        <state relative-caret-position="-1250">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProductController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="339" column="49" lean-forward="true" selection-start-line="339" selection-start-column="49" selection-end-line="339" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
diff --git a/src/main/java/com/peanut/modules/book/controller/BookChapterController.java b/src/main/java/com/peanut/modules/book/controller/BookChapterController.java
index 17174936..34dc976b 100644
--- a/src/main/java/com/peanut/modules/book/controller/BookChapterController.java
+++ b/src/main/java/com/peanut/modules/book/controller/BookChapterController.java
@@ -109,10 +109,8 @@ public class BookChapterController {
     public R contentupdate(@RequestBody BookChapterEntity bookChapter) {
         Integer id = bookChapter.getId();
         String content = bookChapter.getContent();
-//
-//        bookChapterService.updateById(bookChapter); // 更新对象的属性
-//
-//        return R.ok();
+        Integer number = bookChapter.getNumber();
+        Integer bookId = bookChapter.getBookId();
 
         BookChapterEntity byId = bookChapterService.getById(id);
         String content1 = byId.getContent();
@@ -123,6 +121,17 @@ public class BookChapterController {
             bookChapter.setVoices(""); // 设置voices字段为空
 
         }
+
+        List<BookChapterEntity> bookChapterEntities = this.bookChapterService.getBaseMapper().selectList(new QueryWrapper<BookChapterEntity>()
+                .eq("book_id", bookId)
+                .ge("number", number));
+        for(BookChapterEntity entity: bookChapterEntities){
+            entity.setNumber(entity.getNumber() + 1);
+            this.bookChapterService.updateById(entity);
+        }
+
+
+
         bookChapterService.updateById(bookChapter); // 更新对象的属性
         return R.ok();
 
@@ -133,11 +142,78 @@ public class BookChapterController {
      */
     @RequestMapping("/update")
     public R update(@RequestBody BookChapterEntity bookChapter) {
-        bookChapterService.updateById(bookChapter); // 更新对象的属性
+        Integer id = bookChapter.getId();
+        String content = bookChapter.getContent();
+        Integer number = bookChapter.getNumber();
+        Integer bookId = bookChapter.getBookId();
+
+        BookChapterEntity byId = bookChapterService.getById(id);
+        String content1 = byId.getContent();
+        if (content.equals(content1)) {
+
+        } else {
+            // 如果content字段和原来数据库的content内容不同则voices字段为空
+            bookChapter.setVoices(""); // 设置voices字段为空
+
+        }
+
+        List<BookChapterEntity> bookChapterEntities = this.bookChapterService.getBaseMapper().selectList(new QueryWrapper<BookChapterEntity>()
+                .eq("book_id", bookId)
+                .ge("number", number));
+        System.out.println("bookChapterEntitiesbookChapterEntitiesbookChapterEntities"+bookChapterEntities);
+
+        BookChapterEntity bookChapterEntity = null;
+        for (BookChapterEntity entity : bookChapterEntities) {
+            if (entity.getNumber() == number) {
+                bookChapterEntity = entity;
+                break;
+            }
+        }
+//        if (bookChapterEntity != null) {
+//            bookChapterEntity.setNumber(1); // 设置新的章节编号为1
+//            bookChapterService.updateById(bookChapterEntity); // 更新章节编号为1的章节
+//        }
+
+        List<BookChapterEntity> bookChapterEntitiesCopy = new ArrayList<>(bookChapterEntities); // 复制章节列表
+        Collections.sort(bookChapterEntitiesCopy, new Comparator<BookChapterEntity>() {
+            @Override
+            public int compare(BookChapterEntity o1, BookChapterEntity o2) {
+                return o1.getNumber() - o2.getNumber(); // 根据章节编号进行排序
+            }
+        });
+
+
+//        bookChapterService.updateById(bookChapter);
+//        List<BookChapterEntity> bookChapterEntities = this.bookChapterService.getBaseMapper().selectList(new QueryWrapper<BookChapterEntity>()
+//                .eq("book_id", bookId)
+//                .ge("number", number));
+//
+//        for(BookChapterEntity entity: bookChapterEntities){
+//            if (bookChapter.getNumber()>=) {
+//            }
+//            entity.setNumber(entity.getNumber() - 1);
+//
+//            bookChapterService.updateById(entity);
+//        }
+//        List<BookChapterEntity> tempEntity = this.bookChapterService.getBaseMapper().selectList(new QueryWrapper<BookChapterEntity>()
+//                .eq("book_id", bookChapter.getBookId()).orderByAsc("number")
+//        );
+//        int index = 0;
+//        for(BookChapterEntity entity: tempEntity){
+//            index ++;
+//            entity.setNumber(index);
+//            this.bookChapterService.updateById(entity);
+//        }
+//
+
         return R.ok();
 
     }
 
+
+
+
+
     public static List<BookChapterEntity> sort(List<BookChapterEntity> list){
         //根据指定比较器产生的顺序对指定列表进行排序。
         Collections.sort(list, new Comparator<BookChapterEntity>() {
diff --git a/src/main/java/com/peanut/modules/book/controller/BookClockinPunchController.java b/src/main/java/com/peanut/modules/book/controller/BookClockinPunchController.java
index fc643caa..c6fa1b53 100644
--- a/src/main/java/com/peanut/modules/book/controller/BookClockinPunchController.java
+++ b/src/main/java/com/peanut/modules/book/controller/BookClockinPunchController.java
@@ -35,7 +35,6 @@ private BookClockinCommentService bookClockinCommentService;
     @RequestMapping("/applist")
     public R applist(@RequestParam Map<String, Object> params) {
         PageUtils page = bookClockinPunchService.queryPage(params);
-
         return R.ok().put("page", page);
     }
 
@@ -49,25 +48,20 @@ private BookClockinCommentService bookClockinCommentService;
     public R applists(@RequestParam("bookId") String bookid,
                       @RequestParam("userId") String userid) {
         ArrayList<Object> list = new ArrayList<>();
-
         //查询用户id图书id 根据第一天打卡天数开始计算
         BookClockinPunchEntity bookClockinEntity = bookClockinPunchService.getBaseMapper().selectOne(new QueryWrapper<BookClockinPunchEntity>()
                 .eq("book_id", bookid)
                 .eq("user_id", userid)
                 .eq("days",1)
-
         );
         List<BookClockinPunchEntity> bookClockinEntityList = bookClockinPunchService.getBaseMapper().selectList(new QueryWrapper<BookClockinPunchEntity>()
                 .eq("book_id", bookid)
                 .eq("user_id", userid)
-
         );
         for (BookClockinPunchEntity bookClock : bookClockinEntityList) {
             Integer days = bookClock.getDays();
-
             list.add(days);
         }
-
              if (bookClockinEntity != null) {
                  Date createTime = bookClockinEntity.getCreateTime();
                  long createTimeMillis = createTime.getTime();
@@ -78,7 +72,6 @@ private BookClockinCommentService bookClockinCommentService;
              } else if (bookClockinEntity == null) {
                  Date createTime = new Date();
                  long createTimeMillis = createTime.getTime();
-                 //获取第一次打卡天数createTimeMillis毫秒数，时间戳减并除以毫秒数（24 * 60 * 60 * 1000）计算打卡总天数+1
                  int daysBetween = (int) (System.currentTimeMillis() - createTimeMillis) / (24 * 60 * 60 * 1000)+1;
                  return R.ok().put("daysBetween", daysBetween).put("dayslist",list );
 
@@ -105,7 +98,6 @@ private BookClockinCommentService bookClockinCommentService;
      * 保存
      */
     @RequestMapping("/save")
-    //请求接口时是从task的info或者list中发出的，理论上
     public R save(@RequestBody BookClockinPunchEntity bookClockinPunchEntity) {
         Integer bookid1 = bookClockinPunchEntity.getBookId();
         Integer userId = bookClockinPunchEntity.getUserId();
@@ -126,18 +118,21 @@ private BookClockinCommentService bookClockinCommentService;
 
 
         if(canListen == true){
-            boolean b = myUserService.bookAuthenticate(bookid1,userId);
+            boolean b = myUserService.bookAuthen(bookid1,userId);
             if (b){
                 bookClockinPunchEntity.setDelFlag(0);
                 bookClockinPunchService.save(bookClockinPunchEntity);
                 return R.ok("签到成功");
+            }else {
+                return R.error("您还未购买此书，购买后即可签到");
+
             }
 
         }else {
-            return R.error("购买此书即可参与签到");
+            return R.error("该书暂未开放打卡权限");
         }
 
-        return R.ok("跳方法001");
+
     }
 
 
diff --git a/src/main/java/com/peanut/modules/book/controller/BookController.java b/src/main/java/com/peanut/modules/book/controller/BookController.java
index 0a0cbf61..426beb97 100644
--- a/src/main/java/com/peanut/modules/book/controller/BookController.java
+++ b/src/main/java/com/peanut/modules/book/controller/BookController.java
@@ -53,12 +53,25 @@ public class BookController {
      * 列表
      */
     @RequestMapping("/list")
-//    @RequiresPermissions("book:book:list")
     public R list(@RequestParam Map<String, Object> params) {
         PageUtils page = bookService.queryPage(params);
 
         return R.ok().put("page", page);
     }
+
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/listbooks")
+    public R listbooks(@RequestParam Map<String, Object> params) {
+        PageUtils page = bookService.queryPagebooks(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+
     /**
      * 信息
      */
diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
index 83e499a7..5816650e 100644
--- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
+++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
@@ -419,6 +419,7 @@ public class BuyOrderController {
                     for (BuyOrderDetailEntity buyOrdr : produ) {
                         Integer pId = buyOrdr.getProductId();
                         ShopProductEntity product1 = shopProductService.getById(pId);
+                        String productName = product1.getProductName();
                         // 如果是虚拟币购买 减少用户的虚拟币数量
                         if ("4".equals(buyOrder.getPaymentMethod())) {
                             MyUserEntity user = this.myUserService.getById(buyOrder.getUserId());
@@ -433,7 +434,7 @@ public class BuyOrderController {
                                 transactionDetailsEntity.setChangeAmount(realMoney.negate());
                                 transactionDetailsEntity.setUserBalance(user.getPeanutCoin());
                                 transactionDetailsEntity.setTel(user.getTel());
-                                transactionDetailsEntity.setOrderType("赠送本书听书图书");
+                                transactionDetailsEntity.setOrderType("购买《"+productName+"》赠送本书听书功能");
                                 transactionDetailsService.save(transactionDetailsEntity);
                             } else {
                                 return R.error("余额不足！");
diff --git a/src/main/java/com/peanut/modules/book/controller/ShopProductController.java b/src/main/java/com/peanut/modules/book/controller/ShopProductController.java
index a1706501..a698f249 100644
--- a/src/main/java/com/peanut/modules/book/controller/ShopProductController.java
+++ b/src/main/java/com/peanut/modules/book/controller/ShopProductController.java
@@ -1,6 +1,4 @@
 package com.peanut.modules.book.controller;
-
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -36,12 +34,9 @@ public class ShopProductController {
     private BuyOrderDetailService buyOrderDetailService;
     @Autowired
     private BookService bookService;
-
      @Autowired
      private ShopProudictBookService shopProudictBookService;
 
-
-
     /**
      *  精选商品   列表
      */
@@ -52,10 +47,15 @@ public class ShopProductController {
         return R.ok().put("page", page);
 
     }
+    /**
+     * 折扣商品
+     */
+    @RequestMapping("/listactivityprice")
+    public R listactivityprice(@RequestParam Map<String, Object> params){
+        PageUtils page = shopProductService.queryPageactivityprice(params);
+        return R.ok().put("page", page);
 
-
-
-
+    }
 
     /**
      * 列表
@@ -68,9 +68,8 @@ public class ShopProductController {
 
 }
 
-
     /**
-     * 列表
+     * 查询列表
      */
     @RequestMapping("/selectList")
     public R selectList(@RequestParam Map<String, Object> params){
@@ -79,16 +78,6 @@ public class ShopProductController {
         return R.ok().put("page", page);
     }
 
-
-
-
-
-
-
-
-
-
-
     //新书
     @RequestMapping("/getNewBook")
     public R getNewBook(@RequestParam Map<String, Object> params) {
@@ -102,19 +91,11 @@ public class ShopProductController {
 
 
 
-
-
-
-
-
-
-
     /**
      *   未购买书列表
      * @param userId  用户id
      * @return
      */
-    //todo  9.7未调试
     @RequestMapping("/booklist")
     public R booklistss(@RequestParam("userId") Integer userId
                        ) {
@@ -151,29 +132,28 @@ public class ShopProductController {
         return R.ok().put("pages", lists); // 返回未购买的书籍分页
     }
 
+
+
+
+
     @RequestMapping("/bookinfo/{productId}")
     public R bookinfo(@PathVariable("productId") Integer productId){
         ArrayList<Map<String, String>> imagesUrl = new ArrayList<Map<String,String>>();
-        ShopProductEntity shopProductEntity = shopProductService.getBaseMapper().selectOne(new QueryWrapper<ShopProductEntity>().eq("product_id", productId));
-        Integer poid = shopProductEntity.getProductPid();
-        List<Integer> poids = shopCategoryService.findPoid(poid);
-        Integer productId1 = shopProductEntity.getProductId();
-        shopProductEntity.setPoids(poids);
+        List<ShopProudictBookEntity> bookEntityList = shopProudictBookService.getBaseMapper().selectList(new QueryWrapper<ShopProudictBookEntity>().eq("book_id", productId));
         List<Object> list = new ArrayList<>();
         ArrayList<String> booklist = new ArrayList<>();
-
-
-        List<ShopProudictBookEntity> proudict = shopProudictBookService.getBaseMapper().selectList(new QueryWrapper<ShopProudictBookEntity>()
-                .eq("proudict_id", productId1));
-
-        for (ShopProudictBookEntity shopProudictBookEntity : proudict) {
+        ShopProductEntity shopProductEntity=null;
+        for (ShopProudictBookEntity shopProudictBookEntity : bookEntityList) {
+            Integer proudictId = shopProudictBookEntity.getProudictId();
+            shopProductEntity = shopProductService.getBaseMapper().selectOne(new QueryWrapper<ShopProductEntity>().eq("product_id", proudictId));
             Integer bookId = shopProudictBookEntity.getBookId();
             BookEntity byId = bookService.getById(bookId);
             booklist.add(String.valueOf(bookId));
             list.add(byId);
+            shopProductEntity.setBookidsimages(list);
+            shopProductEntity.setBookids(booklist);
         }
-        shopProductEntity.setBookidsimages(list);
-        shopProductEntity.setBookids(booklist);
+
         return R.ok().put("shopProduct", shopProductEntity);
 
     }
@@ -181,10 +161,54 @@ public class ShopProductController {
 
 
 
+    @RequestMapping("/bookinfolists/{productId}")
+    public R bookinfolists(@PathVariable("productId") Integer productId) {
+        //查询商品
+        ShopProductEntity shopProductEntity = shopProductService.getBaseMapper().selectOne(new QueryWrapper<ShopProductEntity>().eq("product_id", productId));
+        ArrayList<Map<String, String>> imagesUrl = new ArrayList<Map<String, String>>();
+        //分类
+        Integer poid = shopProductEntity.getProductPid();
+        //商品id
+        Integer productId1 = shopProductEntity.getProductId();
+        //分类信息
+        List<Integer> poids = shopCategoryService.findPoid(poid);
+        List<ShopProudictBookEntity> proudict = shopProudictBookService.getBaseMapper().selectList(new QueryWrapper<ShopProudictBookEntity>()
+                .eq("proudict_id", productId1));
+        List<ShopProductEntity> result = new ArrayList<>();
+        //获取商品id
+        Set<Integer> productIds = new HashSet<>();
+        productIds.add(productId);
+        for (ShopProudictBookEntity shopProudictBookEntity : proudict) {
+            Integer bookId = shopProudictBookEntity.getBookId();
+            BookEntity byId = bookService.getById(bookId);
+            List<ShopProudictBookEntity> entityByBookId = shopProudictBookService.getBaseMapper().selectList(new QueryWrapper<ShopProudictBookEntity>()
+                    .eq("book_id", bookId));
+            for(ShopProudictBookEntity entity : entityByBookId){
+                productIds.add(entity.getProudictId());
+            }
+        }
+        for(Integer pId : productIds){
+            ShopProductEntity proEntity =null;
+            proEntity = shopProductService.getById(pId);
+            List<ShopProudictBookEntity> pbookEntitys = shopProudictBookService.getBaseMapper().selectList(new QueryWrapper<ShopProudictBookEntity>()
+                    .eq("proudict_id", pId));
+            ArrayList<String> booklist = new ArrayList<>();
+            List<Object> list = new ArrayList<>();
+            for (ShopProudictBookEntity shopProudictBookEntity : pbookEntitys) {
+                booklist.add(String.valueOf(shopProudictBookEntity.getBookId()));
+                BookEntity byId = bookService.getById(shopProudictBookEntity.getBookId());
+                list.add(byId);
+            }
+            proEntity.setPoids(poids);
+            proEntity.setBookidsimages(list);
+            proEntity.setBookids(booklist);
+            result.add(proEntity);
+        }
+        return R.ok().put("result", result);
+    }
     /**
      * 信息
-
-     * @param productId     9.13商品详情原接口
+     * @param productId
      * @return
      */
     @RequestMapping("/info/{productId}")
@@ -194,34 +218,52 @@ public class ShopProductController {
 
         Integer poid = shopProductEntity.getProductPid();
         Integer productId1 = shopProductEntity.getProductId();
-        System.out.println("productId1=============================="+productId1);
-
         List<Integer> poids = shopCategoryService.findPoid(poid);
         shopProductEntity.setPoids(poids);
         List<Object> list = new ArrayList<>();
+        List<Object> bookIdlist = new ArrayList<>();
         ArrayList<String> booklist = new ArrayList<>();
-
-
         List<ShopProudictBookEntity> proudict = shopProudictBookService.getBaseMapper().selectList(new QueryWrapper<ShopProudictBookEntity>()
                 .eq("proudict_id", productId1));
-
         for (ShopProudictBookEntity shopProudictBookEntity : proudict) {
+            Integer id = shopProudictBookEntity.getId();
             Integer bookId = shopProudictBookEntity.getBookId();
+
             BookEntity byId = bookService.getById(bookId);
+            bookIdlist.add(id);
             booklist.add(String.valueOf(bookId));
             list.add(byId);
         }
         shopProductEntity.setBookidsimages(list);
         shopProductEntity.setBookids(booklist);
+        shopProductEntity.setShoproudIds(bookIdlist);
         return R.ok().put("shopProduct", shopProductEntity);
-
-
-
-
-
     }
+    /**
+     *  根据传入商品id反向查询图书id，然后查询图书id下包含的商品
+     * @param productId
+     * @return
+     */
+    @RequestMapping("/infobook/{productId}")
+    public R infobook(@PathVariable("productId") Integer productId) {
+        List<ShopProudictBookEntity> proudict = shopProudictBookService.getBaseMapper().selectList(new QueryWrapper<ShopProudictBookEntity>()
+                .eq("proudict_id", productId));
+        List<Object> list = new ArrayList<>();
+        for (ShopProudictBookEntity shopProudictBookEntity : proudict) {
+            Integer bookId = shopProudictBookEntity.getBookId();
 
+            List<ShopProudictBookEntity> bookIds = shopProudictBookService.getBaseMapper().selectList(new QueryWrapper<ShopProudictBookEntity>()
+                    .eq("book_id", bookId));
 
+            for (ShopProudictBookEntity shopProudict : bookIds) {
+                Integer proudictId = shopProudict.getProudictId();
+                List<ShopProductEntity> shopProductEntities = shopProductService.getBaseMapper().selectList(new QueryWrapper<ShopProductEntity>()
+                        .eq("proudict_id",proudictId));
+                list.add(shopProductEntities);
+            }
+        }
+        return R.ok();
+    }
 
 
     /**
@@ -231,20 +273,18 @@ public class ShopProductController {
     public R save(@RequestBody ShopProductEntity shopProduct) {
 
         shopProduct.setCreateTime(new Date());
-//        //用list集合接收数组，转String类型字符串
-//        String bkids = "";
-//        for(String s : shopProduct.getBookids()){
-//              bkids += s+",";
-//        }
-//         if (bkids!=null &&!bkids.isEmpty()){
-//             String substring = bkids.substring(0, bkids.length() - 1);
-//             shopProduct.setBookId(substring);
-//         }else {
-//             shopProduct.setBookId("");
-//         }
+
+        String bkids = "";
+        for(String s : shopProduct.getBookids()){
+              bkids += s+",";
+        }
+         if (bkids!=null &&!bkids.isEmpty()){
+             String substring = bkids.substring(0, bkids.length() - 1);
+             shopProduct.setBookId(substring);
+         }else {
+             shopProduct.setBookId("");
+         }
         shopProductService.save(shopProduct);
-
-
         ShopProudictBookEntity shopProudictBookEntity = new ShopProudictBookEntity();
         for (String s : shopProduct.getBookids()) {
             String bookidlist = s;
@@ -253,49 +293,80 @@ public class ShopProductController {
                 shopProudictBookEntity.setProudictId(proudict);
                 shopProudictBookEntity.setBookId(Integer.valueOf(bookidlist));
                 shopProudictBookService.save(shopProudictBookEntity);
-
             }
-
-
-
         }
-
-
         return R.ok();
     }
-
-
-
-
-
-
     /**
      * 修改
      */
         @RequestMapping("/update")
     public R update(@RequestBody ShopProductEntity shopProduct) {
-            ShopProudictBookEntity shopProudictBookEntity = new ShopProudictBookEntity();
+
+            Integer productId = shopProduct.getProductId();
+            //多个图书id
+            ArrayList<String> bookId = shopProduct.getBookids();
+            shopProduct.setCreateTime(new Date());
+            //用list集合接收数组，转String类型字符串
+            String bkids = "";
+            for (String s : shopProduct.getBookids()) {
+                bkids += s + ",";
+            }
+            if (bkids != null && !bkids.isEmpty()) {
+                String substring = bkids.substring(0, bkids.length() - 1);
+                shopProduct.setBookId(substring);
+            } else {
+                shopProduct.setBookId("");
+            }
+            //查询proudict中，不包含传过来的bookid
+            List<ShopProudictBookEntity> bookEntityList = shopProudictBookService.getBaseMapper().selectList(new QueryWrapper<ShopProudictBookEntity>()
+                    .eq("proudict_id", productId)
+                    .notIn("book_id", bookId)
+            );
 
 
 
+            System.out.println("bookEntityList==========" + bookEntityList);
+
+                for (ShopProudictBookEntity shopProudictBookEntity : bookEntityList) {
+
+                    Integer id = shopProudictBookEntity.getId();
+                    shopProudictBookService.removeById(id);
+                }
+
 
             shopProductService.updateById(shopProduct);
-
-
             return R.ok();
+
         }
+
+
+
+
+
     /**
      * 删除
      */
     @RequestMapping("/delete")
-//    @RequiresPermissions("book:shopproduct:delete")
     public R delete(@RequestBody Integer[] productIds){
-		shopProductService.removeByIds(Arrays.asList(productIds));
 
+        List<ShopProudictBookEntity> bookEntityList = shopProudictBookService.getBaseMapper().selectList(new QueryWrapper<ShopProudictBookEntity>()
+                .in("proudict_id", productIds)
+        );
+        for (ShopProudictBookEntity shopProudictBookEntity : bookEntityList) {
+            Integer id = shopProudictBookEntity.getId();
+            shopProudictBookService.removeById(id);
+        }
+		shopProductService.removeByIds(Arrays.asList(productIds));
         return R.ok();
     }
 
 
+
+
+
+
+
     /**
      * 列表
      */
@@ -306,23 +377,25 @@ public class ShopProductController {
         return R.ok().put("page", page);
     }
 
+
+
+
+
+
+
     /**
      * 获取分类下商品列表
      */
     @RequestMapping("/appGetCategoryList")
     public R appGetCategoryList(@RequestParam("catId") Integer catId){
-        System.out.println("catId======================"+catId);
         List<ShopCategoryEntity> list1 = shopCategoryService.getBaseMapper().selectList(new QueryWrapper<ShopCategoryEntity>()
                 .eq("cat_id",catId));
         if (catId == null) {
-
         }
-
         if(catId == 0){
             catId = null;
         }
         List<ShopProductEntity> list = shopProductService.appGetCategoryList(catId);
-        System.out.println("list==========================="+list);
         return R.ok().put("list", list);
     }
 
@@ -338,8 +411,6 @@ public class ShopProductController {
             shopProductVo.setValue(shopProductEntity.getProductName());
             return shopProductVo;
         }).collect(Collectors.toList());
-
-
         return R.ok().put("list", collect);
     }
 
@@ -348,12 +419,9 @@ public class ShopProductController {
      */
     @RequestMapping("/backProdSearch")
     public R backProdSearch(@RequestParam Map<String, Object> params){
-
         String productName = (String) params.get("productName");
-
         List<ShopProductEntity> list = shopProductService.list(new QueryWrapper<ShopProductEntity>()
         .like("product_name",productName));
-
         return R.ok().put("list", list);
     }
 
diff --git a/src/main/java/com/peanut/modules/book/controller/ShopProudictBookController.java b/src/main/java/com/peanut/modules/book/controller/ShopProudictBookController.java
index 89c513b1..bbef294c 100644
--- a/src/main/java/com/peanut/modules/book/controller/ShopProudictBookController.java
+++ b/src/main/java/com/peanut/modules/book/controller/ShopProudictBookController.java
@@ -1,5 +1,4 @@
 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.ShopProudictBookEntity;
@@ -13,15 +12,8 @@ import java.util.Map;
 @RestController
 @RequestMapping("book/shopProudictBook")
 public class ShopProudictBookController {
-
-
-
     @Autowired
     private ShopProudictBookService shopProudictBookService;
-
-
-
-
     /**
      * 列表
      */
@@ -31,20 +23,16 @@ public class ShopProudictBookController {
         return R.ok().put("page", page);
 
     }
-
-
-
     /**
      *  图书与商品信息
      */
+    //  根据商品id查询图书信息，查询到图书信息，反向查找包含该图书id的所有商品返回
     @RequestMapping("/proudictBooklist")
     public R proudictBooklist(@RequestParam Integer proudictId){
         List<ProudictBookqueryVO> cartList = shopProudictBookService.getCartList(proudictId);
         return R.ok().put("cartList", cartList);
 
     }
-
-
     /**
      * 保存
      */
@@ -61,10 +49,6 @@ public class ShopProudictBookController {
 
             }
         }
-
-
-
-
         return R.ok();
     }
 
@@ -77,7 +61,6 @@ public class ShopProudictBookController {
         shopProudictBookService.updateById(shopProudictBookEntity);
         return R.ok();
     }
-
     /**
      * 删除
      */
diff --git a/src/main/java/com/peanut/modules/book/dao/ShopProudictBookDao.java b/src/main/java/com/peanut/modules/book/dao/ShopProudictBookDao.java
index 4d565980..19d92a40 100644
--- a/src/main/java/com/peanut/modules/book/dao/ShopProudictBookDao.java
+++ b/src/main/java/com/peanut/modules/book/dao/ShopProudictBookDao.java
@@ -4,6 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.peanut.modules.book.entity.ShopProudictBookEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface ShopProudictBookDao extends BaseMapper<ShopProudictBookEntity> {
+
+
+
 }
diff --git a/src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java b/src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java
index 3057a74c..3d56791e 100644
--- a/src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java
+++ b/src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java
@@ -160,6 +160,9 @@ public class ShopProductEntity implements Serializable {
 	@TableField(exist =  false)
 	private List<Object> shoproudBook;
 
+	@TableField(exist =  false)
+	private  List<Object> shoproudIds;
+
 
 //	private Object bookidsimages;
 //
diff --git a/src/main/java/com/peanut/modules/book/entity/ShopProudictBookEntity.java b/src/main/java/com/peanut/modules/book/entity/ShopProudictBookEntity.java
index 6bfdffad..b58623a9 100644
--- a/src/main/java/com/peanut/modules/book/entity/ShopProudictBookEntity.java
+++ b/src/main/java/com/peanut/modules/book/entity/ShopProudictBookEntity.java
@@ -1,11 +1,8 @@
 package com.peanut.modules.book.entity;
-
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.Date;
-
 @Data
 @TableName("shop_proudict_book")
 public class ShopProudictBookEntity {
@@ -32,14 +29,12 @@ public class ShopProudictBookEntity {
     @TableField("del_flag")
     @TableLogic
     private  Integer delFlag;
-
     /**
      * 创建日期
      */
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
-
-
+    //
     @TableField(exist =  false)
     private ArrayList<Integer> bookidlist;
 }
diff --git a/src/main/java/com/peanut/modules/book/service/BookService.java b/src/main/java/com/peanut/modules/book/service/BookService.java
index a5db4b3f..b30966f5 100644
--- a/src/main/java/com/peanut/modules/book/service/BookService.java
+++ b/src/main/java/com/peanut/modules/book/service/BookService.java
@@ -36,6 +36,6 @@ public interface BookService extends IService<BookEntity> {
     boolean getWordSection (Integer bookId);
 
 
-
+    PageUtils queryPagebooks(Map<String, Object> params);
 }
 
diff --git a/src/main/java/com/peanut/modules/book/service/ShopProductService.java b/src/main/java/com/peanut/modules/book/service/ShopProductService.java
index b9dfd389..53f8eaf0 100644
--- a/src/main/java/com/peanut/modules/book/service/ShopProductService.java
+++ b/src/main/java/com/peanut/modules/book/service/ShopProductService.java
@@ -29,5 +29,7 @@ public interface ShopProductService extends IService<ShopProductEntity> {
     PageUtils selectListqueryPage(Map<String, Object> params);
 
     PageUtils queryPageproductSales(Map<String, Object> params);
+
+    PageUtils queryPageactivityprice(Map<String, Object> params);
 }
 
diff --git a/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java b/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java
index 1a577f60..e9773622 100644
--- a/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java
+++ b/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java
@@ -14,4 +14,5 @@ public interface ShopProudictBookService extends IService<ShopProudictBookEntity
     PageUtils proudictBookqueryPage(Map<String, Object> params);
 
     List<ProudictBookqueryVO> getCartList(Integer proudictId);
+
 }
diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookChapterServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookChapterServiceImpl.java
index b76399c8..b225da12 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/BookChapterServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/BookChapterServiceImpl.java
@@ -31,7 +31,7 @@ public class BookChapterServiceImpl extends ServiceImpl<BookChapterDao, BookChap
         IPage<BookChapterEntity> page = this.page(
                 new Query<BookChapterEntity>().getPage(params),
                 //8.24修改根据number升序 排序
-                new QueryWrapper<BookChapterEntity>().eq("book_id",bookid).orderByDesc("number")
+                new QueryWrapper<BookChapterEntity>().eq("book_id",bookid).orderByAsc("number")
         );
 
         return new PageUtils(page);
diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java
index c7277ef5..3ba92946 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java
@@ -561,16 +561,13 @@ public class BookServiceImpl extends ServiceImpl<BookDao, BookEntity> implements
         Map<String,List<String[]>> paraMap = new HashMap<>();
         Map<String,String> headMap = new HashMap<>();
         List<String> title_list = new ArrayList<>();
-
         for (int i = 0; i < doc.getSections().getCount(); i++) {
             String currentTitle = "";
             Section section = doc.getSections().get(i);
             for (int j = 0; j < section.getParagraphs().getCount() - 1; j++) {
                 Paragraph paragraph = section.getParagraphs().get(j);
                 if (paragraph.getStyleName().equals("Heading1") ) {
-//
                     String textq = paragraph.getText();
-
                     currentTitle = textq;
                     title_list.add(currentTitle);
                     List<String[]> secondTitleList = new ArrayList<>();
@@ -578,7 +575,6 @@ public class BookServiceImpl extends ServiceImpl<BookDao, BookEntity> implements
                     if(!section.getParagraphs().get(j+1).getStyleName().matches("Heading2")){
                         int head_index = j ;
                         StringBuilder builder = new StringBuilder();
-
                         do {
                                 builder.append(section.getParagraphs().get(head_index).getText());
                             head_index++;
@@ -660,6 +656,55 @@ public class BookServiceImpl extends ServiceImpl<BookDao, BookEntity> implements
         return false;
     }
 
+    @Override
+    public PageUtils queryPagebooks(Map<String, Object> params) {
+        IPage<BookEntity> page = this.page(
+                new Query<BookEntity>().getPage(params),
+                new QueryWrapper<BookEntity>()
+                        .eq("state", "1")
+                        .orderByDesc("create_time")
+
+        );
+        for (BookEntity book : page.getRecords()) {
+            String authorName = "";
+            String publisherName = "";
+            ArrayList<Object> list = new ArrayList<>();
+
+
+            String authorId = book.getAuthorId();
+            String publisherId = book.getPublisherId();
+
+            String[] authorIds = authorId.split(",");
+            String[] publisherIds = publisherId.split(",");
+
+            List<String> authorList = Arrays.asList(authorIds);
+            List<String> publisherList = Arrays.asList(publisherIds);
+
+            List<PublisherEntity> publisherEntities = publisherService.getBaseMapper().selectList(new QueryWrapper<PublisherEntity>().in("id", publisherList));
+            List<AuthorEntity> authorEntities = authorService.getBaseMapper().selectList(new QueryWrapper<AuthorEntity>().in("id", authorList));
+            for (AuthorEntity authorEntity : authorEntities) {
+                authorName += "," + authorEntity.getAuthorName();
+            }
+            for (PublisherEntity publisherEntity : publisherEntities) {
+                publisherName += "," + publisherEntity.getPublisherName();
+            }
+            authorName = authorName.startsWith(",") ? authorName.substring(1) : authorName;
+            publisherName = publisherName.startsWith(",") ? publisherName.substring(1) : publisherName;
+
+            if (!CollectionUtils.isEmpty(list)) {
+                book.setType(Joiner.on(",").join(list));
+            }
+            if (!StringUtils.isEmpty(authorName)) {
+                book.setAuthorName(authorName);
+            }
+            if (!StringUtils.isEmpty(publisherName)) {
+                book.setPublisherName(publisherName);
+            }
+
+        }
+
+        return new PageUtils(page);
+    }
 
 
 }
diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookTaskServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookTaskServiceImpl.java
index 1393c30a..e3c7ef06 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/BookTaskServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/BookTaskServiceImpl.java
@@ -21,7 +21,7 @@ public class BookTaskServiceImpl extends ServiceImpl<BookTaskDao, BookTaskEntity
         Object bookid = params.get("bookid");
         IPage<BookTaskEntity> page = this.page(
                 new Query<BookTaskEntity>().getPage(params),
-                new QueryWrapper<BookTaskEntity>().eq("book_id",bookid).orderByDesc("days")
+                new QueryWrapper<BookTaskEntity>().eq("book_id",bookid).orderByAsc("days")
 
         );
 
diff --git a/src/main/java/com/peanut/modules/book/service/impl/OrderCartServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/OrderCartServiceImpl.java
index 63e902a0..c0f648ae 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/OrderCartServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/OrderCartServiceImpl.java
@@ -51,6 +51,7 @@ public class OrderCartServiceImpl extends ServiceImpl<OrderCartDao, OrderCartEnt
             Integer productId = orderCartEntity.getProductId();
 
             ShopProductEntity productEntity = shopProductService.getById(productId);
+//            shopProductService.getBaseMapper().selectList()
             ShopCartVo shopCartVo = new ShopCartVo();
 
             BeanUtils.copyProperties(orderCartEntity, shopCartVo);
@@ -62,7 +63,7 @@ public class OrderCartServiceImpl extends ServiceImpl<OrderCartDao, OrderCartEnt
             shopCartVo.setWeight(productEntity.getWeight().doubleValue());
 
             shopCartVo.setProductStock(productEntity.getProductStock());
-            shopCartVo.setProudictBook(Integer.valueOf(productEntity.getBookId()));
+//            shopCartVo.setProudictBook(Integer.valueOf(productEntity.getBookId()));
 
             BigDecimal activityPrice = productEntity.getActivityPrice();
             BigDecimal big = new BigDecimal(0);
diff --git a/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java
index 92f97951..95d88844 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java
@@ -76,4 +76,13 @@ public class ShopProductServiceImpl extends ServiceImpl<ShopProductDao, ShopProd
         return new PageUtils(page);
     }
 
+    @Override
+    public PageUtils queryPageactivityprice(Map<String, Object> params) {
+        IPage<ShopProductEntity> page = this.page(
+                new Query<ShopProductEntity>().getPage(params),
+                new QueryWrapper<ShopProductEntity>().ne("activity_price", "").ne("activity_price", 0)
+        );
+        return new PageUtils(page);
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java
index 1f49307e..5ba45a68 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java
@@ -1,6 +1,4 @@
 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;
@@ -8,7 +6,6 @@ import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
 import com.peanut.modules.book.dao.ShopProudictBookDao;
 import com.peanut.modules.book.entity.BookEntity;
-import com.peanut.modules.book.entity.ShopCategoryEntity;
 import com.peanut.modules.book.entity.ShopProductEntity;
 import com.peanut.modules.book.entity.ShopProudictBookEntity;
 import com.peanut.modules.book.service.BookService;
@@ -17,8 +14,8 @@ import com.peanut.modules.book.service.ShopProudictBookService;
 import com.peanut.modules.book.vo.ProudictBookqueryVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -53,33 +50,25 @@ public class ShopProudictBookServiceImpl  extends ServiceImpl<ShopProudictBookDa
     @Override
     public List<ProudictBookqueryVO> getCartList(Integer proudictId) {
 
+
+        ShopProductEntity shopProductEntity = shopProductService.getBaseMapper().selectOne(new QueryWrapper<ShopProductEntity>().eq("proudict_id", proudictId));
         List<ShopProudictBookEntity> proudictBooklist = this.list(new QueryWrapper<ShopProudictBookEntity>().eq("proudict_id", proudictId));
-
         List prList = new ArrayList<>();
+        List prLists = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
         for (ShopProudictBookEntity shopProudictBookEntity : proudictBooklist) {
-            Integer proudictId1 = shopProudictBookEntity.getProudictId();
             Integer bookId = shopProudictBookEntity.getBookId();
-
-            System.out.println("proudictId1======="+proudictId1);
-            System.out.println("bookId======="+bookId);
-            BookEntity bookbyId = bookService.getById(bookId);
-            ShopProductEntity shopProductbyId = shopProductService.getById(proudictId1);
-            ProudictBookqueryVO queryVO = new ProudictBookqueryVO();
-            queryVO.setBookId(bookbyId.getId());
-            queryVO.setName(bookbyId.getName());
-            queryVO.setCanListen(bookbyId.getCanListen());
-            queryVO.setImages(bookbyId.getImages());
-            queryVO.setClockIn(bookbyId.getClockIn());
-            queryVO.setProudictId(shopProductbyId.getProductId());
-            queryVO.setProductName(shopProductbyId.getProductName());
-            queryVO.setPrice(shopProductbyId.getPrice());
-            queryVO.setActivityPrice(shopProductbyId.getActivityPrice());
-            queryVO.setSumSales(shopProductbyId.getSumSales());
-            prList.add(queryVO);
-            System.out.println("queryVO======="+queryVO);
+            List<ShopProudictBookEntity> booklist = this.list(new QueryWrapper<ShopProudictBookEntity>().eq("book_id", bookId));
+            for (ShopProudictBookEntity shopProudictBook : booklist) {
+                Integer proudictId1 = shopProudictBook.getProudictId();
+                Integer bookId1 = shopProudictBook.getBookId();
+                BookEntity bookbyId = bookService.getById(bookId1);
+                prList.add(bookbyId);
+                ShopProductEntity shopProductbyId = shopProductService.getById(proudictId1);
+                 shopProductbyId.setBookidsimages(prList);
+            }
         }
-
-        return prList;
+        shopProductEntity.setBookidsimages(prList);
+        return prLists;
     }
-
 }
diff --git a/src/main/java/com/peanut/modules/book/vo/ProudictBookqueryVO.java b/src/main/java/com/peanut/modules/book/vo/ProudictBookqueryVO.java
index 530731b3..29db4d89 100644
--- a/src/main/java/com/peanut/modules/book/vo/ProudictBookqueryVO.java
+++ b/src/main/java/com/peanut/modules/book/vo/ProudictBookqueryVO.java
@@ -4,28 +4,37 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
+
+/**
+ *  返回图书与商品基本信息vo,
+
+ */
 @Data
 public class ProudictBookqueryVO {
 
 
 
     /**
-     *图书id
+     *图书基本信息
      */
     private Integer bookId;
-    private String name;
+    private String bookname;
     private Boolean canListen;
     private Integer clockIn;
     private String images;
+     private List<String> proudicts;
 
-
-
-
+    /**
+     * 商品基本信息
+     */
     private  Integer proudictId;
     private String productName;
     private BigDecimal price;
     private BigDecimal activityPrice;
     private Integer sumSales;
+    private String proudictimages;
 
 }
diff --git a/src/main/resources/mapper/book/ShopProudictBookDao.xml b/src/main/resources/mapper/book/ShopProudictBookDao.xml
index 41653cee..614dd2b6 100644
--- a/src/main/resources/mapper/book/ShopProudictBookDao.xml
+++ b/src/main/resources/mapper/book/ShopProudictBookDao.xml
@@ -14,4 +14,6 @@
     </resultMap>
 
 
+
+
 </mapper>
\ No newline at end of file