x

.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/template_setmeal.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/template_setmeal.html" />
+      <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" />
     </list>
     <ignored path="$PROJECT_DIR$/shop/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -40,31 +40,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="IndexController.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="IndexController.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1845">
-              <caret line="151" column="58" lean-forward="false" selection-start-line="151" selection-start-column="58" selection-end-line="151" selection-end-column="58" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application.properties">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="application-dev.properties" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application-dev.properties">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <state relative-caret-position="-286">
+              <caret line="62" column="79" lean-forward="false" selection-start-line="62" selection-start-column="79" selection-end-line="62" selection-end-column="79" />
               <folding />
             </state>
           </provider>
@@ -73,17 +53,17 @@
       <file leaf-file-name="main.css" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/shop/static/style/main.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="326">
+            <state relative-caret-position="4485">
               <caret line="299" column="1" lean-forward="false" selection-start-line="299" selection-start-column="1" selection-end-line="299" selection-end-column="1" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.js" pinned="false" current-in-tab="true">
+      <file leaf-file-name="main.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/shop/static/js/main.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="185">
+            <state relative-caret-position="300">
               <caret line="69" column="33" lean-forward="false" selection-start-line="69" selection-start-column="33" selection-end-line="69" selection-end-column="33" />
               <folding />
             </state>
@@ -103,7 +83,7 @@
       <file leaf-file-name="DoctorManageController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="201">
+            <state relative-caret-position="225">
               <caret line="32" column="59" lean-forward="false" selection-start-line="32" selection-start-column="59" selection-end-line="32" selection-end-column="59" />
               <folding />
             </state>
@@ -126,8 +106,45 @@
       <file leaf-file-name="GoodService.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="43" column="13" lean-forward="false" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
+            <state relative-caret-position="390">
+              <caret line="50" column="26" lean-forward="false" selection-start-line="50" selection-start-column="26" selection-end-line="50" selection-end-column="26" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="GoodMapper.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/resource/mapper/GoodMapper.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="390">
+              <caret line="26" column="33" lean-forward="false" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="33" />
+              <folding>
+                <marker date="1575454051197" expanded="true" signature="286:403" ph="select id, g... good_ad" />
+                <marker date="1575454051197" expanded="true" signature="489:613" ph="insert into good_ad... " />
+                <marker date="1575454051197" expanded="true" signature="702:795" ph="update good_ad... " />
+                <marker date="1575454051197" expanded="true" signature="834:868" ph="delete from good_ad... " />
+                <marker date="1575454051197" expanded="true" signature="928:1028" ph="select gid, " />
+                <marker date="1575454051197" expanded="true" signature="2615:2764" ph="insert into good_base... " />
+                <marker date="1575454051197" expanded="true" signature="2857:2979" ph="update good_base... " />
+                <marker date="1575454051197" expanded="true" signature="3020:3066" ph="update good_base... " />
+                <marker date="1575454051197" expanded="true" signature="3156:3246" ph="update good_base... " />
+                <marker date="1575454051197" expanded="true" signature="3308:3357" ph="select id, g... " />
+                <marker date="1575454051197" expanded="true" signature="3636:3767" ph="insert into good_describe... " />
+                <marker date="1575454051197" expanded="true" signature="3868:3969" ph="update good_describe... " />
+                <marker date="1575454051197" expanded="true" signature="4018:4060" ph="delete from good_describe... " />
+                <marker date="1575454051197" expanded="true" signature="4119:4228" ph="select id, g... " />
+                <marker date="1575454051197" expanded="true" signature="4489:4710" ph="INSERT INTO `good_price`... " />
+                <marker date="1575454051197" expanded="true" signature="4806:4967" ph="update good_price... " />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="GoodMapper.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/GoodMapper.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="615">
+              <caret line="54" column="43" lean-forward="false" selection-start-line="54" selection-start-column="26" selection-end-line="54" selection-end-column="43" />
               <folding />
             </state>
           </provider>
@@ -145,7 +162,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>ALL_KEYS</find>
       <find>bigweixin</find>
       <find>queryAllOnlineDoctors</find>
       <find>alldocter</find>
@@ -172,9 +188,10 @@
       <find>click</find>
       <find>zskk-weixin</find>
       <find>.add</find>
-      <find>queryAllGoodBases</find>
       <find>zskk-bg-</find>
       <find>.swiper-slide .title</find>
+      <find>queryAllGoodBases</find>
+      <find>shop</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -237,11 +254,11 @@
         <option value="$PROJECT_DIR$/shop/static/style/nHeader.css" />
         <option value="$PROJECT_DIR$/shop/static/style/shop.css" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java" />
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java" />
         <option value="$PROJECT_DIR$/shop/static/style/main.css" />
         <option value="$PROJECT_DIR$/shop/static/js/main.js" />
+        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" />
       </list>
     </option>
   </component>
@@ -270,7 +287,7 @@
   <component name="NodeModulesDirectoryManager">
     <handled-path value="$PROJECT_DIR$/shop/static/manager/node_modules" />
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="120" />
     <option name="y" value="32" />
     <option name="width" value="1440" />
@@ -302,8 +319,9 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scratches" />
+      <pane id="AndroidView" />
       <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -320,27 +338,99 @@
               <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
               <item name="tjshop" type="462c0819:PsiDirectoryNode" />
               <item name="shop" type="462c0819:PsiDirectoryNode" />
-              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
+              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
+              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
+              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
+              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="zskk" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
+              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="zskk" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
+              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="zskk" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
+              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="zskk" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="pc" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
               <item name="tjshop" type="462c0819:PsiDirectoryNode" />
               <item name="shop" type="462c0819:PsiDirectoryNode" />
-              <item name="static" type="462c0819:PsiDirectoryNode" />
-              <item name="js" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resource" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
               <item name="tjshop" type="462c0819:PsiDirectoryNode" />
               <item name="shop" type="462c0819:PsiDirectoryNode" />
-              <item name="static" type="462c0819:PsiDirectoryNode" />
-              <item name="style" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resource" type="462c0819:PsiDirectoryNode" />
+              <item name="mapper" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -528,12 +618,13 @@
       <workItem from="1579068546792" duration="1909000" />
       <workItem from="1579073948519" duration="1104000" />
       <workItem from="1579153318820" duration="21000" />
-      <workItem from="1579242767300" duration="1537000" />
+      <workItem from="1579242767300" duration="1660000" />
+      <workItem from="1579244519607" duration="83000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="170428000" />
+    <option name="totallyTimeSpent" value="170634000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -545,7 +636,8 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="120" y="32" width="1440" height="823" extended-state="0" />
+    <frame x="0" y="23" width="1440" height="826" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36038515" sideWeight="0.47567955" order="7" side_tool="true" content_ui="tabs" />
@@ -559,16 +651,15 @@
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3933975" sideWeight="0.49679193" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35851648" sideWeight="0.5243205" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35851648" sideWeight="0.5243205" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2239011" sideWeight="0.49679193" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23748212" sideWeight="0.48895028" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22298221" sideWeight="0.49679193" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24034335" sideWeight="0.48895028" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -579,6 +670,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.76076996" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3933975" sideWeight="0.49679193" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
@@ -750,6 +842,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -866,75 +959,79 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/GoodMapper.java">
+    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="54" column="43" lean-forward="false" selection-start-line="54" selection-start-column="26" selection-end-line="54" selection-end-column="43" />
+        <state relative-caret-position="270">
+          <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/mapper/GoodMapper.xml">
+    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application-dev.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="630">
-          <caret line="42" column="21" lean-forward="false" selection-start-line="42" selection-start-column="17" selection-end-line="42" selection-end-column="21" />
-          <folding>
-            <marker date="1575454051197" expanded="true" signature="286:403" ph="select id, g... good_ad" />
-            <marker date="1575454051197" expanded="true" signature="489:613" ph="insert into good_ad... " />
-            <marker date="1575454051197" expanded="true" signature="702:795" ph="update good_ad... " />
-            <marker date="1575454051197" expanded="true" signature="834:868" ph="delete from good_ad... " />
-            <marker date="1575454051197" expanded="true" signature="928:1028" ph="select gid, " />
-            <marker date="1575454051197" expanded="true" signature="2615:2764" ph="insert into good_base... " />
-            <marker date="1575454051197" expanded="true" signature="2857:2979" ph="update good_base... " />
-            <marker date="1575454051197" expanded="true" signature="3020:3066" ph="update good_base... " />
-            <marker date="1575454051197" expanded="true" signature="3156:3246" ph="update good_base... " />
-            <marker date="1575454051197" expanded="true" signature="3308:3357" ph="select id, g... " />
-            <marker date="1575454051197" expanded="true" signature="3636:3767" ph="insert into good_describe... " />
-            <marker date="1575454051197" expanded="true" signature="3868:3969" ph="update good_describe... " />
-            <marker date="1575454051197" expanded="true" signature="4018:4060" ph="delete from good_describe... " />
-            <marker date="1575454051197" expanded="true" signature="4119:4228" ph="select id, g... " />
-            <marker date="1575454051197" expanded="true" signature="4489:4710" ph="INSERT INTO `good_price`... " />
-            <marker date="1575454051197" expanded="true" signature="4806:4967" ph="update good_price... " />
-          </folding>
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/GoodController.java">
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="44" column="28" lean-forward="false" selection-start-line="44" selection-start-column="28" selection-end-line="44" selection-end-column="28" />
-          <folding />
+        <state relative-caret-position="660">
+          <caret line="69" column="5" lean-forward="false" selection-start-line="69" selection-start-column="5" selection-end-line="69" selection-end-column="5" />
+          <folding>
+            <element signature="e#1287#1288#0" expanded="true" />
+            <element signature="e#1331#1332#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java">
+    <entry file="file://$PROJECT_DIR$/shop/static/style/main.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="43" column="13" lean-forward="false" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
+        <state relative-caret-position="4485">
+          <caret line="299" column="1" lean-forward="false" selection-start-line="299" selection-start-column="1" selection-end-line="299" selection-end-column="1" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java">
+    <entry file="file://$PROJECT_DIR$/shop/static/js/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1845">
-          <caret line="151" column="58" lean-forward="false" selection-start-line="151" selection-start-column="58" selection-end-line="151" selection-end-column="58" />
+        <state relative-caret-position="300">
+          <caret line="69" column="33" lean-forward="false" selection-start-line="69" selection-start-column="33" selection-end-line="69" selection-end-column="33" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application.properties">
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/GoodMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
+        <state relative-caret-position="615">
+          <caret line="54" column="43" lean-forward="false" selection-start-line="54" selection-start-column="26" selection-end-line="54" selection-end-column="43" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application-dev.properties">
+    <entry file="file://$PROJECT_DIR$/shop/src/main/resource/mapper/GoodMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="390">
+          <caret line="26" column="33" lean-forward="false" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="33" />
+          <folding>
+            <marker date="1575454051197" expanded="true" signature="286:403" ph="select id, g... good_ad" />
+            <marker date="1575454051197" expanded="true" signature="489:613" ph="insert into good_ad... " />
+            <marker date="1575454051197" expanded="true" signature="702:795" ph="update good_ad... " />
+            <marker date="1575454051197" expanded="true" signature="834:868" ph="delete from good_ad... " />
+            <marker date="1575454051197" expanded="true" signature="928:1028" ph="select gid, " />
+            <marker date="1575454051197" expanded="true" signature="2615:2764" ph="insert into good_base... " />
+            <marker date="1575454051197" expanded="true" signature="2857:2979" ph="update good_base... " />
+            <marker date="1575454051197" expanded="true" signature="3020:3066" ph="update good_base... " />
+            <marker date="1575454051197" expanded="true" signature="3156:3246" ph="update good_base... " />
+            <marker date="1575454051197" expanded="true" signature="3308:3357" ph="select id, g... " />
+            <marker date="1575454051197" expanded="true" signature="3636:3767" ph="insert into good_describe... " />
+            <marker date="1575454051197" expanded="true" signature="3868:3969" ph="update good_describe... " />
+            <marker date="1575454051197" expanded="true" signature="4018:4060" ph="delete from good_describe... " />
+            <marker date="1575454051197" expanded="true" signature="4119:4228" ph="select id, g... " />
+            <marker date="1575454051197" expanded="true" signature="4489:4710" ph="INSERT INTO `good_price`... " />
+            <marker date="1575454051197" expanded="true" signature="4806:4967" ph="update good_price... " />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -946,37 +1043,34 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java">
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="660">
-          <caret line="69" column="5" lean-forward="false" selection-start-line="69" selection-start-column="5" selection-end-line="69" selection-end-column="5" />
-          <folding>
-            <element signature="e#1287#1288#0" expanded="true" />
-            <element signature="e#1331#1332#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="225">
+          <caret line="32" column="59" lean-forward="false" selection-start-line="32" selection-start-column="59" selection-end-line="32" selection-end-column="59" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java">
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/GoodController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="201">
-          <caret line="32" column="59" lean-forward="false" selection-start-line="32" selection-start-column="59" selection-end-line="32" selection-end-column="59" />
+        <state relative-caret-position="405">
+          <caret line="44" column="28" lean-forward="false" selection-start-line="44" selection-start-column="28" selection-end-line="44" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/main.css">
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="326">
-          <caret line="299" column="1" lean-forward="false" selection-start-line="299" selection-start-column="1" selection-end-line="299" selection-end-column="1" />
+        <state relative-caret-position="390">
+          <caret line="50" column="26" lean-forward="false" selection-start-line="50" selection-start-column="26" selection-end-line="50" selection-end-column="26" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/js/main.js">
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="69" column="33" lean-forward="false" selection-start-line="69" selection-start-column="33" selection-end-line="69" selection-end-column="33" />
+        <state relative-caret-position="-286">
+          <caret line="62" column="79" lean-forward="false" selection-start-line="62" selection-start-column="79" selection-end-line="62" selection-end-column="79" />
           <folding />
         </state>
       </provider>

shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java

@@ -60,7 +60,7 @@ public class IndexController extends AbstractController {
 	@RequestMapping("/shop")
 	public String shop(Model model, @RequestParam(name="label", required=false) Integer label){
 
-		List<GoodBean> beans 		= this.getGoodList(label);
+		List<GoodBean> beans 		= this.getGoodList(label, Integer.MAX_VALUEt);
 		List<SysLabel> labels		= this.queryAllSysLabel();
 		model.addAttribute("goods", beans);
 		model.addAttribute("labels", labels);
@@ -120,7 +120,7 @@ public class IndexController extends AbstractController {
 
 	private List<SysLabel> getSysLabels() {
 		return sysLabelService.queryLabels().stream().map(sysLabel -> {
-			sysLabel.setGoods(this.getGoodList(sysLabel.getId()));
+			sysLabel.setGoods(this.getGoodList(sysLabel.getId(), GoodService.GOOD_MAX_NUMBER));
 			return sysLabel;
 		}).collect(Collectors.toList());
 	}
@@ -129,7 +129,7 @@ public class IndexController extends AbstractController {
 		return doctorService.queryOnlines(MAIN_DOCTOR_NUMBER);
 	}
 
-	private List<GoodBean> getGoodList(Integer lid){
+	private List<GoodBean> getGoodList(Integer lid, Integer max){
 		List<GoodBase> goodList = null;
 		if (lid == null){
 			goodList = goodService.queryAllGoodBases(null, GoodService.GOOD_ONLINE, null);
@@ -149,7 +149,7 @@ public class IndexController extends AbstractController {
 			} else  {
 				price.setDiscount(price.getDiscountPrice().divide(price.getPrice(), 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(10)));
 			}
-			if(beans.size() < GoodService.GOOD_MAX_NUMBER) {
+			if(beans.size() < max) {
 				beans.add(goodService.toSimpleGoodBean(base, price));
 			}
 		}