chore: 利用PageHelper的PageInfo简化代码。

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.service;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.admin.dao.GoodsAllinone;
@@ -49,7 +50,7 @@ public class AdminGoodsService {
     public Object list(String goodsSn, String name,
                        Integer page, Integer limit, String sort, String order) {
         List<LitemallGoods> goodsList = goodsService.querySelective(goodsSn, name, page, limit, sort, order);
-        int total = goodsService.countSelective(goodsSn, name, page, limit, sort, order);
+        long total = PageInfo.of(goodsList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", goodsList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java

@@ -4,6 +4,7 @@ import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
 import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.core.notify.NotifyService;
@@ -52,7 +53,7 @@ public class AdminOrderService {
     public Object list(Integer userId, String orderSn, List<Short> orderStatusArray,
                        Integer page, Integer limit, String sort, String order) {
         List<LitemallOrder> orderList = orderService.querySelective(userId, orderSn, orderStatusArray, page, limit, sort, order);
-        int total = orderService.countSelective(userId, orderSn, orderStatusArray, page, limit, sort, order);
+        long total = PageInfo.of(orderList).getTotal();
 
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -37,7 +38,7 @@ public class AdminAdController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallAd> adList = adService.querySelective(name, content, page, limit, sort, order);
-        int total = adService.countSelective(name, content, page, limit, sort, order);
+        long total = PageInfo.of(adList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", adList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAddressController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -63,7 +64,7 @@ public class AdminAddressController {
                        @Order @RequestParam(defaultValue = "desc") String order) {
 
         List<LitemallAddress> addressList = addressService.querySelective(userId, name, page, limit, sort, order);
-        int total = addressService.countSelective(userId, name, page, limit, sort, order);
+        long total = PageInfo.of(addressList).getTotal();
 
         List<Map<String, Object>> addressVoList = new ArrayList<>(addressList.size());
         for (LitemallAddress address : addressList) {

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -41,7 +42,7 @@ public class AdminAdminController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallAdmin> adminList = adminService.querySelective(username, page, limit, sort, order);
-        int total = adminService.countSelective(username, page, limit, sort, order);
+        long total = PageInfo.of(adminList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", adminList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminBrandController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -38,7 +39,7 @@ public class AdminBrandController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallBrand> brandList = brandService.querySelective(id, name, page, limit, sort, order);
-        int total = brandService.countSelective(id, name, page, limit, sort, order);
+        long total = PageInfo.of(brandList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", brandList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -38,7 +39,7 @@ public class AdminCategoryController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallCategory> collectList = categoryService.querySelective(id, name, page, limit, sort, order);
-        int total = categoryService.countSelective(id, name, page, limit, sort, order);
+        long total = PageInfo.of(collectList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", collectList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCollectController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -39,7 +40,7 @@ public class AdminCollectController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallCollect> collectList = collectService.querySelective(userId, valueId, page, limit, sort, order);
-        int total = collectService.countSelective(userId, valueId, page, limit, sort, order);
+        long total = PageInfo.of(collectList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", collectList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCommentController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -35,7 +36,7 @@ public class AdminCommentController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallComment> brandList = commentService.querySelective(userId, valueId, page, limit, sort, order);
-        int total = commentService.countSelective(userId, valueId, page, limit, sort, order);
+        long total = PageInfo.of(brandList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", brandList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -42,7 +43,7 @@ public class AdminCouponController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallCoupon> couponList = couponService.querySelective(name, type, status, page, limit, sort, order);
-        int total = couponService.countSelective(name, type, status, page, limit, sort, order);
+        long total = PageInfo.of(couponList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", couponList);
@@ -59,7 +60,7 @@ public class AdminCouponController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallCouponUser> couponList = couponUserService.queryList(userId, couponId, status, page, limit, sort, order);
-        int total = couponUserService.countList(userId, couponId, status, page, limit, sort, order);
+        long total = PageInfo.of(couponList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", couponList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFeedbackController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -42,7 +43,7 @@ public class AdminFeedbackController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallFeedback> feedbackList = feedbackService.querySelective(userId, username, page, limit, sort, order);
-        int total = feedbackService.countSelective(userId, username, page, limit, sort, order);
+        long total = PageInfo.of(feedbackList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", feedbackList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFootprintController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -38,7 +39,7 @@ public class AdminFootprintController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallFootprint> footprintList = footprintService.querySelective(userId, goodsId, page, limit, sort, order);
-        int total = footprintService.countSelective(userId, goodsId, page, limit, sort, order);
+        long total = PageInfo.of(footprintList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", footprintList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -46,7 +47,7 @@ public class AdminGrouponController {
                              @Sort @RequestParam(defaultValue = "add_time") String sort,
                              @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallGroupon> grouponList = grouponService.querySelective(grouponId, page, limit, sort, order);
-        int total = grouponService.countSelective(grouponId, page, limit, sort, order);
+        long total = PageInfo.of(grouponList).getTotal();
 
         List<Map<String, Object>> records = new ArrayList<>();
         for (LitemallGroupon groupon : grouponList) {
@@ -83,7 +84,7 @@ public class AdminGrouponController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallGrouponRules> rulesList = rulesService.querySelective(goodsId, page, limit, sort, order);
-        int total = rulesService.countSelective(goodsId, page, limit, sort, order);
+        long total = PageInfo.of(rulesList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", rulesList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminHistoryController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -36,7 +37,7 @@ public class AdminHistoryController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallSearchHistory> footprintList = searchHistoryService.querySelective(userId, keyword, page, limit, sort, order);
-        int total = searchHistoryService.countSelective(userId, keyword, page, limit, sort, order);
+        long total = PageInfo.of(footprintList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", footprintList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -37,7 +38,7 @@ public class AdminIssueController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallIssue> issueList = issueService.querySelective(question, page, limit, sort, order);
-        int total = issueService.countSelective(question, page, limit, sort, order);
+        long total = PageInfo.of(issueList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", issueList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -37,7 +38,7 @@ public class AdminKeywordController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallKeyword> brandList = keywordService.querySelective(keyword, url, page, limit, sort, order);
-        int total = keywordService.countSelective(keyword, url, page, limit, sort, order);
+        long total = PageInfo.of(brandList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", brandList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.core.util.ResponseUtil;
@@ -41,7 +42,7 @@ public class AdminRegionController {
                        @Sort(accepts = {"id"}) @RequestParam(defaultValue = "id") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallRegion> regionList = regionService.querySelective(name, code, page, limit, sort, order);
-        int total = regionService.countSelective(name, code, page, limit, sort, order);
+        long total = PageInfo.of(regionList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", regionList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.SecurityUtils;
@@ -51,7 +52,7 @@ public class AdminRoleController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallRole> roleList = roleService.querySelective(name, page, limit, sort, order);
-        int total = roleService.countSelective(name, page, limit, sort, order);
+        long total = PageInfo.of(roleList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", roleList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStorageController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -42,7 +43,7 @@ public class AdminStorageController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallStorage> storageList = litemallStorageService.querySelective(key, name, page, limit, sort, order);
-        int total = litemallStorageService.countSelective(key, name, page, limit, sort, order);
+        long total = PageInfo.of(storageList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", storageList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -38,7 +39,7 @@ public class AdminTopicController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallTopic> topicList = topicService.querySelective(title, subtitle, page, limit, sort, order);
-        int total = topicService.countSelective(title, subtitle, page, limit, sort, order);
+        long total = PageInfo.of(topicList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", topicList);

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.admin.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -41,7 +42,7 @@ public class AdminUserController {
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
         List<LitemallUser> userList = userService.querySelective(username, mobile, page, limit, sort, order);
-        int total = userService.countSeletive(username, mobile, page, limit, sort, order);
+        long total = PageInfo.of(userList).getTotal();
         Map<String, Object> data = new HashMap<>();
         data.put("total", total);
         data.put("items", userList);
@@ -51,11 +52,11 @@ public class AdminUserController {
 
     @GetMapping("/username")
     public Object username(@NotEmpty String username) {
-        int total = userService.countSeletive(username, null, null, null, null, null);
-        if (total == 0) {
-            return ResponseUtil.ok("不存在");
+        boolean exist = userService.checkByUsername(username);
+        if (exist) {
+            return ResponseUtil.ok("已存在");
         }
-        return ResponseUtil.ok("已存在");
+        return ResponseUtil.ok("不存在");
     }
 
     private Object validate(LitemallUser user) {

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAdService.java

@@ -42,21 +42,6 @@ public class LitemallAdService {
         return adMapper.selectByExample(example);
     }
 
-    public int countSelective(String name, String content, Integer page, Integer size, String sort, String order) {
-        LitemallAdExample example = new LitemallAdExample();
-        LitemallAdExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(name)) {
-            criteria.andNameLike("%" + name + "%");
-        }
-        if (!StringUtils.isEmpty(content)) {
-            criteria.andContentLike("%" + content + "%");
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) adMapper.countByExample(example);
-    }
-
     public int updateById(LitemallAd ad) {
         ad.setUpdateTime(LocalDateTime.now());
         return adMapper.updateByPrimaryKeySelective(ad);

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAddressService.java

@@ -75,19 +75,4 @@ public class LitemallAddressService {
         PageHelper.startPage(page, limit);
         return addressMapper.selectByExample(example);
     }
-
-    public int countSelective(Integer userId, String name, Integer page, Integer limit, String sort, String order) {
-        LitemallAddressExample example = new LitemallAddressExample();
-        LitemallAddressExample.Criteria criteria = example.createCriteria();
-
-        if (userId != null) {
-            criteria.andUserIdEqualTo(userId);
-        }
-        if (!StringUtils.isEmpty(name)) {
-            criteria.andNameLike("%" + name + "%");
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) addressMapper.countByExample(example);
-    }
 }

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAdminService.java

@@ -45,18 +45,6 @@ public class LitemallAdminService {
         return adminMapper.selectByExampleSelective(example, result);
     }
 
-    public int countSelective(String username, Integer page, Integer size, String sort, String order) {
-        LitemallAdminExample example = new LitemallAdminExample();
-        LitemallAdminExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(username)) {
-            criteria.andUsernameLike("%" + username + "%");
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) adminMapper.countByExample(example);
-    }
-
     public int updateById(LitemallAdmin admin) {
         admin.setUpdateTime(LocalDateTime.now());
         return adminMapper.updateByPrimaryKeySelective(admin);

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallBrandService.java

@@ -56,21 +56,6 @@ public class LitemallBrandService {
         return brandMapper.selectByExample(example);
     }
 
-    public int countSelective(String id, String name, Integer page, Integer size, String sort, String order) {
-        LitemallBrandExample example = new LitemallBrandExample();
-        LitemallBrandExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(id)) {
-            criteria.andIdEqualTo(Integer.valueOf(id));
-        }
-        if (!StringUtils.isEmpty(name)) {
-            criteria.andNameLike("%" + name + "%");
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) brandMapper.countByExample(example);
-    }
-
     public int updateById(LitemallBrand brand) {
         brand.setUpdateTime(LocalDateTime.now());
         return brandMapper.updateByPrimaryKeySelective(brand);

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCartService.java

@@ -93,21 +93,6 @@ public class LitemallCartService {
         return cartMapper.selectByExample(example);
     }
 
-    public int countSelective(Integer userId, Integer goodsId, Integer page, Integer limit, String sort, String order) {
-        LitemallCartExample example = new LitemallCartExample();
-        LitemallCartExample.Criteria criteria = example.createCriteria();
-
-        if (userId != null) {
-            criteria.andUserIdEqualTo(userId);
-        }
-        if (goodsId != null) {
-            criteria.andGoodsIdEqualTo(goodsId);
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) cartMapper.countByExample(example);
-    }
-
     public void deleteById(Integer id) {
         cartMapper.logicalDeleteByPrimaryKey(id);
     }

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCategoryService.java

@@ -73,21 +73,6 @@ public class LitemallCategoryService {
         return categoryMapper.selectByExample(example);
     }
 
-    public int countSelective(String id, String name, Integer page, Integer size, String sort, String order) {
-        LitemallCategoryExample example = new LitemallCategoryExample();
-        LitemallCategoryExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(id)) {
-            criteria.andIdEqualTo(Integer.valueOf(id));
-        }
-        if (!StringUtils.isEmpty(name)) {
-            criteria.andNameLike("%" + name + "%");
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) categoryMapper.countByExample(example);
-    }
-
     public int updateById(LitemallCategory category) {
         category.setUpdateTime(LocalDateTime.now());
         return categoryMapper.updateByPrimaryKeySelective(category);

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCollectService.java

@@ -71,19 +71,4 @@ public class LitemallCollectService {
         PageHelper.startPage(page, size);
         return collectMapper.selectByExample(example);
     }
-
-    public int countSelective(String userId, String valueId, Integer page, Integer size, String sort, String order) {
-        LitemallCollectExample example = new LitemallCollectExample();
-        LitemallCollectExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(userId)) {
-            criteria.andUserIdEqualTo(Integer.valueOf(userId));
-        }
-        if (!StringUtils.isEmpty(valueId)) {
-            criteria.andValueIdEqualTo(Integer.valueOf(valueId));
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) collectMapper.countByExample(example);
-    }
 }

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCommentService.java

@@ -24,12 +24,6 @@ public class LitemallCommentService {
         return commentMapper.selectByExample(example);
     }
 
-    public int countGoodsByGid(Integer id, int offset, int limit) {
-        LitemallCommentExample example = new LitemallCommentExample();
-        example.or().andValueIdEqualTo(id).andTypeEqualTo((byte) 0).andDeletedEqualTo(false);
-        return (int) commentMapper.countByExample(example);
-    }
-
     public List<LitemallComment> query(Byte type, Integer valueId, Integer showType, Integer offset, Integer limit) {
         LitemallCommentExample example = new LitemallCommentExample();
         example.setOrderByClause(LitemallComment.Column.addTime.desc());
@@ -44,7 +38,7 @@ public class LitemallCommentService {
         return commentMapper.selectByExample(example);
     }
 
-    public int count(Byte type, Integer valueId, Integer showType, Integer offset, Integer size) {
+    public int count(Byte type, Integer valueId, Integer showType) {
         LitemallCommentExample example = new LitemallCommentExample();
         if (showType == 0) {
             example.or().andValueIdEqualTo(valueId).andTypeEqualTo(type).andDeletedEqualTo(false);
@@ -85,21 +79,6 @@ public class LitemallCommentService {
         return commentMapper.selectByExample(example);
     }
 
-    public int countSelective(String userId, String valueId, Integer page, Integer size, String sort, String order) {
-        LitemallCommentExample example = new LitemallCommentExample();
-        LitemallCommentExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(userId)) {
-            criteria.andUserIdEqualTo(Integer.valueOf(userId));
-        }
-        if (!StringUtils.isEmpty(valueId)) {
-            criteria.andValueIdEqualTo(Integer.valueOf(valueId)).andTypeEqualTo((byte) 0);
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) commentMapper.countByExample(example);
-    }
-
     public void deleteById(Integer id) {
         commentMapper.logicalDeleteByPrimaryKey(id);
     }

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCouponService.java

@@ -133,28 +133,6 @@ public class LitemallCouponService {
         return couponMapper.selectByExample(example);
     }
 
-    public int countSelective(String name, Short type, Short status, Integer page, Integer limit, String sort, String order) {
-        LitemallCouponExample example = new LitemallCouponExample();
-        LitemallCouponExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(name)) {
-            criteria.andNameLike("%" + name + "%");
-        }
-        if (type != null) {
-            criteria.andTypeEqualTo(type);
-        }
-        if (status != null) {
-            criteria.andStatusEqualTo(status);
-        }
-        criteria.andDeletedEqualTo(false);
-
-        if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
-            example.setOrderByClause(sort + " " + order);
-        }
-
-        return (int)couponMapper.countByExample(example);
-    }
-
     public void add(LitemallCoupon coupon) {
         coupon.setAddTime(LocalDateTime.now());
         coupon.setUpdateTime(LocalDateTime.now());

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCouponUserService.java

@@ -60,32 +60,6 @@ public class LitemallCouponUserService {
         return couponUserMapper.selectByExample(example);
     }
 
-
-    public int countList(Integer userId, Integer couponId, Short status, Integer page, Integer size, String sort, String order) {
-        LitemallCouponUserExample example = new LitemallCouponUserExample();
-        LitemallCouponUserExample.Criteria criteria = example.createCriteria();
-        if (userId != null) {
-            criteria.andUserIdEqualTo(userId);
-        }
-        if(couponId != null){
-            criteria.andCouponIdEqualTo(couponId);
-        }
-        if (status != null) {
-            criteria.andStatusEqualTo(status);
-        }
-        criteria.andDeletedEqualTo(false);
-
-        if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
-            example.setOrderByClause(sort + " " + order);
-        }
-
-        if (!StringUtils.isEmpty(page) && !StringUtils.isEmpty(size)) {
-            PageHelper.startPage(page, size);
-        }
-
-        return (int)couponUserMapper.countByExample(example);
-    }
-
     public List<LitemallCouponUser> queryAll(Integer userId, Integer couponId) {
         return queryList(userId, couponId, CouponUserConstant.STATUS_USABLE, null, null, "add_time", "desc");
     }

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallFeedbackService.java

@@ -45,18 +45,4 @@ public class LitemallFeedbackService {
         PageHelper.startPage(page, limit);
         return feedbackMapper.selectByExample(example);
     }
-
-    public int countSelective(Integer userId, String username, Integer page, Integer limit, String sort, String order) {
-        LitemallFeedbackExample example = new LitemallFeedbackExample();
-        LitemallFeedbackExample.Criteria criteria = example.createCriteria();
-
-        if (userId != null) {
-            criteria.andUserIdEqualTo(userId);
-        }
-        if (!StringUtils.isEmpty(username)) {
-            criteria.andUsernameLike("%" + username + "%");
-        }
-        criteria.andDeletedEqualTo(false);
-        return (int) feedbackMapper.countByExample(example);
-    }
 }

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallFootprintService.java

@@ -24,12 +24,6 @@ public class LitemallFootprintService {
         return footprintMapper.selectByExample(example);
     }
 
-    public int countByAddTime(Integer userId, Integer page, Integer size) {
-        LitemallFootprintExample example = new LitemallFootprintExample();
-        example.or().andUserIdEqualTo(userId).andDeletedEqualTo(false);
-        return (int) footprintMapper.countByExample(example);
-    }
-
     public LitemallFootprint findById(Integer id) {
         return footprintMapper.selectByPrimaryKey(id);
     }
@@ -63,19 +57,4 @@ public class LitemallFootprintService {
         PageHelper.startPage(page, size);
         return footprintMapper.selectByExample(example);
     }
-
-    public int countSelective(String userId, String goodsId, Integer page, Integer size, String sort, String order) {
-        LitemallFootprintExample example = new LitemallFootprintExample();
-        LitemallFootprintExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(userId)) {
-            criteria.andUserIdEqualTo(Integer.valueOf(userId));
-        }
-        if (!StringUtils.isEmpty(goodsId)) {
-            criteria.andGoodsIdEqualTo(Integer.valueOf(goodsId));
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) footprintMapper.countByExample(example);
-    }
 }

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java

@@ -121,46 +121,11 @@ public class LitemallGoodsService {
             example.setOrderByClause(sort + " " + order);
         }
 
-        if (!StringUtils.isEmpty(limit) && !StringUtils.isEmpty(offset)) {
-            PageHelper.startPage(offset, limit);
-        }
+        PageHelper.startPage(offset, limit);
 
         return goodsMapper.selectByExampleSelective(example, columns);
     }
 
-    public int countSelective(Integer catId, Integer brandId, String keywords, Boolean isHot, Boolean isNew, Integer offset, Integer limit, String sort, String order) {
-        LitemallGoodsExample example = new LitemallGoodsExample();
-        LitemallGoodsExample.Criteria criteria1 = example.or();
-        LitemallGoodsExample.Criteria criteria2 = example.or();
-
-        if (!StringUtils.isEmpty(catId) && catId != 0) {
-            criteria1.andCategoryIdEqualTo(catId);
-            criteria2.andCategoryIdEqualTo(catId);
-        }
-        if (!StringUtils.isEmpty(brandId)) {
-            criteria1.andBrandIdEqualTo(brandId);
-            criteria2.andBrandIdEqualTo(brandId);
-        }
-        if (!StringUtils.isEmpty(isNew)) {
-            criteria1.andIsNewEqualTo(isNew);
-            criteria2.andIsNewEqualTo(isNew);
-        }
-        if (!StringUtils.isEmpty(isHot)) {
-            criteria1.andIsHotEqualTo(isHot);
-            criteria2.andIsHotEqualTo(isHot);
-        }
-        if (!StringUtils.isEmpty(keywords)) {
-            criteria1.andKeywordsLike("%" + keywords + "%");
-            criteria2.andNameLike("%" + keywords + "%");
-        }
-        criteria1.andIsOnSaleEqualTo(true);
-        criteria2.andIsOnSaleEqualTo(true);
-        criteria1.andDeletedEqualTo(false);
-        criteria2.andDeletedEqualTo(false);
-
-        return (int) goodsMapper.countByExample(example);
-    }
-
     public List<LitemallGoods> querySelective(String goodsSn, String name, Integer page, Integer size, String sort, String order) {
         LitemallGoodsExample example = new LitemallGoodsExample();
         LitemallGoodsExample.Criteria criteria = example.createCriteria();
@@ -181,21 +146,6 @@ public class LitemallGoodsService {
         return goodsMapper.selectByExampleWithBLOBs(example);
     }
 
-    public int countSelective(String goodsSn, String name, Integer page, Integer size, String sort, String order) {
-        LitemallGoodsExample example = new LitemallGoodsExample();
-        LitemallGoodsExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(goodsSn)) {
-            criteria.andGoodsSnEqualTo(goodsSn);
-        }
-        if (!StringUtils.isEmpty(name)) {
-            criteria.andNameLike("%" + name + "%");
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) goodsMapper.countByExample(example);
-    }
-
     /**
      * 获取某个商品信息,包含完整信息
      *

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGrouponRulesService.java

@@ -89,12 +89,6 @@ public class LitemallGrouponRulesService {
         return grouponList;
     }
 
-    public int countList(int offset, int limit, String sort, String order) {
-        LitemallGrouponRulesExample example = new LitemallGrouponRulesExample();
-        example.or().andDeletedEqualTo(false);
-        return (int) mapper.countByExample(example);
-    }
-
     /**
      * 判断某个团购活动是否已经过期
      *
@@ -129,18 +123,6 @@ public class LitemallGrouponRulesService {
         return mapper.selectByExample(example);
     }
 
-    public int countSelective(String goodsId, Integer page, Integer limit, String sort, String order) {
-        LitemallGrouponRulesExample example = new LitemallGrouponRulesExample();
-        LitemallGrouponRulesExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(goodsId)) {
-            criteria.andGoodsIdEqualTo(Integer.parseInt(goodsId));
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) mapper.countByExample(example);
-    }
-
     public void delete(Integer id) {
         mapper.logicalDeleteByPrimaryKey(id);
     }

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGrouponService.java

@@ -133,18 +133,4 @@ public class LitemallGrouponService {
         PageHelper.startPage(page, size);
         return mapper.selectByExample(example);
     }
-
-    public int countSelective(String rulesId, Integer page, Integer limit, String sort, String order) {
-        LitemallGrouponExample example = new LitemallGrouponExample();
-        LitemallGrouponExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(rulesId)) {
-            criteria.andRulesIdEqualTo(Integer.parseInt(rulesId));
-        }
-        criteria.andDeletedEqualTo(false);
-        criteria.andPayedEqualTo(true);
-        criteria.andGrouponIdEqualTo(0);
-
-        return (int) mapper.countByExample(example);
-    }
 }

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallIssueService.java

@@ -49,18 +49,6 @@ public class LitemallIssueService {
         return issueMapper.selectByExample(example);
     }
 
-    public int countSelective(String question, Integer page, Integer size, String sort, String order) {
-        LitemallIssueExample example = new LitemallIssueExample();
-        LitemallIssueExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(question)) {
-            criteria.andQuestionLike("%" + question + "%");
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) issueMapper.countByExample(example);
-    }
-
     public int updateById(LitemallIssue issue) {
         issue.setUpdateTime(LocalDateTime.now());
         return issueMapper.updateByPrimaryKeySelective(issue);

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallKeywordService.java

@@ -56,22 +56,6 @@ public class LitemallKeywordService {
         return keywordsMapper.selectByExample(example);
     }
 
-    public int countSelective(String keyword, String url, Integer page, Integer limit, String sort, String order) {
-        LitemallKeywordExample example = new LitemallKeywordExample();
-        LitemallKeywordExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(keyword)) {
-            criteria.andKeywordLike("%" + keyword + "%");
-        }
-        if (!StringUtils.isEmpty(url)) {
-            criteria.andUrlLike("%" + url + "%");
-        }
-        criteria.andDeletedEqualTo(false);
-
-        PageHelper.startPage(page, limit);
-        return (int) keywordsMapper.countByExample(example);
-    }
-
     public void add(LitemallKeyword keywords) {
         keywords.setAddTime(LocalDateTime.now());
         keywords.setUpdateTime(LocalDateTime.now());

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallOrderService.java

@@ -115,21 +115,6 @@ public class LitemallOrderService {
         return litemallOrderMapper.selectByExample(example);
     }
 
-    public int countSelective(Integer userId, String orderSn, List<Short> orderStatusArray, Integer page, Integer size, String sort, String order) {
-        LitemallOrderExample example = new LitemallOrderExample();
-        LitemallOrderExample.Criteria criteria = example.createCriteria();
-
-        if (userId != null) {
-            criteria.andUserIdEqualTo(userId);
-        }
-        if (!StringUtils.isEmpty(orderSn)) {
-            criteria.andOrderSnEqualTo(orderSn);
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) litemallOrderMapper.countByExample(example);
-    }
-
     public int updateWithOptimisticLocker(LitemallOrder order) {
         LocalDateTime preUpdateTime = order.getUpdateTime();
         order.setUpdateTime(LocalDateTime.now());

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallPermissionService.java

@@ -56,7 +56,6 @@ public class LitemallPermissionService {
     }
 
     public boolean checkSuperPermission(Integer roleId) {
-        Set<String> permissions = new HashSet<String>();
         if(roleId == null){
             return false;
         }

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallRegionService.java

@@ -51,17 +51,4 @@ public class LitemallRegionService {
         PageHelper.startPage(page, size);
         return regionMapper.selectByExample(example);
     }
-
-    public int countSelective(String name, Integer code, Integer page, Integer size, String sort, String order) {
-        LitemallRegionExample example = new LitemallRegionExample();
-        LitemallRegionExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(name)) {
-            criteria.andNameLike("%" + name + "%");
-        }
-        if (code != null) {
-            criteria.andCodeEqualTo(code);
-        }
-        return (int) regionMapper.countByExample(example);
-    }
 }

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallRoleService.java

@@ -54,23 +54,6 @@ public class LitemallRoleService {
         return roleMapper.selectByExample(example);
     }
 
-    public int countSelective(String roleName, Integer page, Integer size, String sort, String order) {
-        LitemallRoleExample example = new LitemallRoleExample();
-        LitemallRoleExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(roleName)) {
-            criteria.andNameEqualTo("%" + roleName + "%");
-        }
-        criteria.andDeletedEqualTo(false);
-
-        if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
-            example.setOrderByClause(sort + " " + order);
-        }
-
-        PageHelper.startPage(page, size);
-        return (int)roleMapper.countByExample(example);
-    }
-
     public LitemallRole findById(Integer id) {
         return roleMapper.selectByPrimaryKey(id);
     }

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallSearchHistoryService.java

@@ -54,19 +54,4 @@ public class LitemallSearchHistoryService {
         PageHelper.startPage(page, size);
         return searchHistoryMapper.selectByExample(example);
     }
-
-    public int countSelective(String userId, String keyword, Integer page, Integer size, String sort, String order) {
-        LitemallSearchHistoryExample example = new LitemallSearchHistoryExample();
-        LitemallSearchHistoryExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(userId)) {
-            criteria.andUserIdEqualTo(Integer.valueOf(userId));
-        }
-        if (!StringUtils.isEmpty(keyword)) {
-            criteria.andKeywordLike("%" + keyword + "%");
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) searchHistoryMapper.countByExample(example);
-    }
 }

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallStorageService.java

@@ -62,19 +62,4 @@ public class LitemallStorageService {
         PageHelper.startPage(page, limit);
         return storageMapper.selectByExample(example);
     }
-
-    public int countSelective(String key, String name, Integer page, Integer size, String sort, String order) {
-        LitemallStorageExample example = new LitemallStorageExample();
-        LitemallStorageExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(key)) {
-            criteria.andKeyEqualTo(key);
-        }
-        if (!StringUtils.isEmpty(name)) {
-            criteria.andNameLike("%" + name + "%");
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) storageMapper.countByExample(example);
-    }
 }

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallTopicService.java

@@ -82,21 +82,6 @@ public class LitemallTopicService {
         return topicMapper.selectByExampleWithBLOBs(example);
     }
 
-    public int countSelective(String title, String subtitle, Integer page, Integer size, String sort, String order) {
-        LitemallTopicExample example = new LitemallTopicExample();
-        LitemallTopicExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(title)) {
-            criteria.andTitleLike("%" + title + "%");
-        }
-        if (!StringUtils.isEmpty(subtitle)) {
-            criteria.andSubtitleLike("%" + subtitle + "%");
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) topicMapper.countByExample(example);
-    }
-
     public int updateById(LitemallTopic topic) {
         topic.setUpdateTime(LocalDateTime.now());
         LitemallTopicExample example = new LitemallTopicExample();

litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallUserService.java

@@ -66,21 +66,6 @@ public class LitemallUserService {
         return userMapper.selectByExample(example);
     }
 
-    public int countSeletive(String username, String mobile, Integer page, Integer size, String sort, String order) {
-        LitemallUserExample example = new LitemallUserExample();
-        LitemallUserExample.Criteria criteria = example.createCriteria();
-
-        if (!StringUtils.isEmpty(username)) {
-            criteria.andUsernameLike("%" + username + "%");
-        }
-        if (!StringUtils.isEmpty(mobile)) {
-            criteria.andMobileEqualTo(mobile);
-        }
-        criteria.andDeletedEqualTo(false);
-
-        return (int) userMapper.countByExample(example);
-    }
-
     public int count() {
         LitemallUserExample example = new LitemallUserExample();
         example.or().andDeletedEqualTo(false);
@@ -94,6 +79,12 @@ public class LitemallUserService {
         return userMapper.selectByExample(example);
     }
 
+    public boolean checkByUsername(String username) {
+        LitemallUserExample example = new LitemallUserExample();
+        example.or().andUsernameEqualTo(username).andDeletedEqualTo(false);
+        return userMapper.countByExample(example) != 0;
+    }
+
     public List<LitemallUser> queryByMobile(String mobile) {
         LitemallUserExample example = new LitemallUserExample();
         example.or().andMobileEqualTo(mobile).andDeletedEqualTo(false);

litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.wx.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -110,8 +111,8 @@ public class WxCommentController {
      */
     @GetMapping("count")
     public Object count(@NotNull Byte type, @NotNull Integer valueId) {
-        int allCount = commentService.count(type, valueId, 0, 0, 0);
-        int hasPicCount = commentService.count(type, valueId, 1, 0, 0);
+        int allCount = commentService.count(type, valueId, 0);
+        int hasPicCount = commentService.count(type, valueId, 1);
         Map<String, Object> data = new HashMap<String, Object>();
         data.put("allCount", allCount);
         data.put("hasPicCount", hasPicCount);
@@ -135,7 +136,7 @@ public class WxCommentController {
                        @RequestParam(defaultValue = "1") Integer page,
                        @RequestParam(defaultValue = "10") Integer size) {
         List<LitemallComment> commentList = commentService.query(type, valueId, showType, page, size);
-        int count = commentService.count(type, valueId, showType, page, size);
+        long count = PageInfo.of(commentList).getTotal();
 
         List<Map<String, Object>> commentVoList = new ArrayList<>(commentList.size());
         for (LitemallComment comment : commentList) {

litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.wx.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.core.util.JacksonUtil;
@@ -81,7 +82,7 @@ public class WxFootprintController {
         }
 
         List<LitemallFootprint> footprintList = footprintService.queryByAddTime(userId, page, size);
-        int count = footprintService.countByAddTime(userId, page, size);
+        long count = PageInfo.of(footprintList).getTotal();
         int totalPages = (int) Math.ceil((double) count / size);
 
         List<Object> footprintVoList = new ArrayList<>(footprintList.size());

litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java

@@ -1,5 +1,7 @@
 package org.linlinjava.litemall.wx.web;
 
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageInfo;
 import com.mysql.jdbc.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -10,7 +12,6 @@ import org.linlinjava.litemall.core.validator.Sort;
 import org.linlinjava.litemall.db.domain.*;
 import org.linlinjava.litemall.db.service.*;
 import org.linlinjava.litemall.wx.annotation.LoginUser;
-import org.linlinjava.litemall.wx.service.GetRegionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -122,7 +123,7 @@ public class WxGoodsController {
 		Callable<Map> commentsCallable = () -> {
 			List<LitemallComment> comments = commentService.queryGoodsByGid(id, 0, 2);
 			List<Map<String, Object>> commentsVo = new ArrayList<>(comments.size());
-			int commentCount = commentService.countGoodsByGid(id, 0, 2);
+			long commentCount = PageInfo.of(comments).getTotal();
 			for (LitemallComment comment : comments) {
 				Map<String, Object> c = new HashMap<>();
 				c.put("id", comment.getId());
@@ -265,7 +266,6 @@ public class WxGoodsController {
 
 		//查询列表数据
 		List<LitemallGoods> goodsList = goodsService.querySelective(categoryId, brandId, keyword, isHot, isNew, page, size, sort, order);
-		int total = goodsService.countSelective(categoryId, brandId, keyword, isHot, isNew, page, size, sort, order);
 
 		// 查询商品所属类目列表。
 		List<Integer> goodsCatIds = goodsService.getCatIds(brandId, keyword, isHot, isNew);
@@ -278,8 +278,9 @@ public class WxGoodsController {
 
 		Map<String, Object> data = new HashMap<>();
 		data.put("goodsList", goodsList);
+		data.put("count", PageInfo.of(goodsList).getTotal());
 		data.put("filterCategoryList", categoryList);
-		data.put("count", total);
+
 		return ResponseUtil.ok(data);
 	}
 

litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGrouponController.java

@@ -1,5 +1,6 @@
 package org.linlinjava.litemall.wx.web;
 
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.core.express.ExpressService;
@@ -66,8 +67,8 @@ public class WxGrouponController {
                        @RequestParam(defaultValue = "10") Integer size,
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
                        @Order @RequestParam(defaultValue = "desc") String order) {
-        Object topicList = grouponRulesService.queryList(page, size, sort, order);
-        int total = grouponRulesService.countList(page, size, sort, order);
+        List<Map<String, Object>> topicList = grouponRulesService.queryList(page, size, sort, order);
+        long total = PageInfo.of(topicList).getTotal();
         Map<String, Object> data = new HashMap<String, Object>();
         data.put("data", topicList);
         data.put("count", total);