修复分页的问题

.gitignore

@@ -1,27 +1,62 @@
-# Compiled class file
-*.class
+### gradle ###
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
 
-# Log file
-*.log
+### STS ###
+.settings/
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+bin/
 
-# BlueJ files
-*.ctxt
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+*.lock
+rebel.xml
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+### NetBeans ###
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
 
-# Package Files #
-*.jar
+### maven ###
+target/
 *.war
-*.nar
 *.ear
 *.zip
+*.tar
 *.tar.gz
-*.rar
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+### logs ####
+/logs/
+*.log
 
+### temp ignore ###
+*.cache
+*.diff
+*.patch
+*.tmp
+*.java~
+*.properties~
+*.xml~
 
-*.iml
-target/
+### system ignore ###
+.DS_Store
+Thumbs.db
+Servers
+.metadata
+upload
+gen_code
+
+### node ###
+node_modules

yami-shop-common/src/main/java/com/yami/shop/common/util/PageAdapter.java

@@ -19,11 +19,11 @@ public class PageAdapter{
 
     private int begin;
 
-    private int end;
+    private int size;
 
     public PageAdapter(Page page) {
         int[] startEnd = PageUtil.transToStartEnd((int) page.getCurrent(), (int) page.getSize());
         this.begin = startEnd[0];
-        this.end = startEnd[1];
+        this.size = (int)page.getSize();
     }
 }

yami-shop-service/src/main/resources/mapper/OrderMapper.xml

@@ -254,7 +254,7 @@
             </if>
         </where>
         ORDER BY update_time DESC
-        LIMIT #{adapter.begin} , #{adapter.end}
+        LIMIT #{adapter.begin} , #{adapter.size}
         ) AS o
         LEFT JOIN tz_order_item oi
         ON o.order_number = oi.order_number
@@ -315,7 +315,7 @@
             AND temp.status = #{status}
         </if>
         ORDER BY temp.create_time DESC
-        LIMIT #{adapter.begin} , #{adapter.end}
+        LIMIT #{adapter.begin} , #{adapter.size}
         )AS o
         LEFT JOIN tz_order_item oi ON o.order_number = oi.order_number
     </select>

yami-shop-service/src/main/resources/mapper/ProdPropMapper.xml

@@ -38,7 +38,7 @@
             <if test="prodProp.propName != null and prodProp.propName != ''">
                 and prop_name like concat('%',#{prodProp.propName},'%')
             </if>
-            LIMIT #{adapter.begin} , #{adapter.end}
+            LIMIT #{adapter.begin} , #{adapter.size}
         ) pp
         left join tz_prod_prop_value ppv
         on pp.prop_id = ppv.prop_id