diff --git a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
index 44e53e0f..f08a1a70 100644
--- a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
+++ b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
@@ -130,8 +130,8 @@ public class GoodsMessageListener implements RocketMQListener<MessageExt> {
             //生成索引
             case GENERATOR_GOODS_INDEX:
                 try {
-                    String goodsJsonStr = new String(messageExt.getBody());
-                    Goods goods = JSONUtil.toBean(goodsJsonStr, Goods.class);
+                    String goodsId = new String(messageExt.getBody());
+                    Goods goods = this.goodsService.getById(goodsId);
                     updateGoodsIndex(goods);
                 } catch (Exception e) {
                     log.error("生成商品索引事件执行异常，商品信息 {}", new String(messageExt.getBody()));
diff --git a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java
index 1f4adbbd..983fd87a 100644
--- a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java
+++ b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java
@@ -158,12 +158,12 @@ public class NoticeSendMessageListener implements RocketMQListener<MessageExt> {
             //查询所有会员总数，因为会员总数比较大 如果一次性查出来会占用数据库资源，所以要分页查询
             MemberSearchVO memberSearchVO = new MemberSearchVO();
             memberSearchVO.setDisabled(SwitchEnum.OPEN.name());
-            Integer memberNum = memberService.getMemberNum(memberSearchVO);
+            long memberNum = memberService.getMemberNum(memberSearchVO);
             //构建分页查询参数
             //100条查一次
-            Integer pageSize = 100;
-            Integer pageCount = 0;
-            pageCount = memberNum / pageSize;
+            int pageSize = 100;
+            int pageCount;
+            pageCount = (int) (memberNum / pageSize);
             pageCount = memberNum % pageSize > 0 ? pageCount + 1 : pageCount;
             for (int i = 1; i <= pageCount; i++) {
                 PageVO pageVO = new PageVO();
diff --git a/framework/pom.xml b/framework/pom.xml
index 7d3c159c..952d1c71 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -95,7 +95,7 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter-test</artifactId>
-            <version>1.3.2</version>
+            <version>2.2.0</version>
         </dependency>
         <!-- Mysql Connector -->
         <dependency>
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java
index 93404507..491a8faf 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java
@@ -5,7 +5,6 @@ import cn.lili.modules.order.order.entity.dos.StoreFlow;
 import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -31,11 +30,6 @@ public class DistributionOrder extends BaseIdEntity {
 
     private static final long serialVersionUID = 501799944909496507L;
 
-    @TableId
-    @TableField
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java b/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java
index f517d5db..09a0bd1b 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java
@@ -49,7 +49,7 @@ public interface GoodsService extends IService<Goods> {
      * @param categoryId 分类ID
      * @return 商品数量
      */
-    Integer getGoodsCountByCategory(String categoryId);
+    long getGoodsCountByCategory(String categoryId);
 
     /**
      * 添加商品
@@ -143,7 +143,8 @@ public interface GoodsService extends IService<Goods> {
     /**
      * 统计店铺的商品数量
      * @param storeId 店铺id
+     * @return
      */
-    Integer countStoreGoodsNum(String storeId);
+    long countStoreGoodsNum(String storeId);
 
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
index abf65784..e8d63ee5 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
@@ -149,7 +149,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
-    public final Integer getGoodsCountByCategory(String categoryId) {
+    public final long getGoodsCountByCategory(String categoryId) {
         QueryWrapper<Goods> queryWrapper = Wrappers.query();
         queryWrapper.like("category_path", categoryId);
         queryWrapper.eq("delete_flag", false);
@@ -362,7 +362,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         goodEvaluationQueryWrapper.eq(MemberEvaluation::getId, goodsId);
         goodEvaluationQueryWrapper.eq(MemberEvaluation::getGrade, EvaluationGradeEnum.GOOD.name());
         //好评数量
-        int highPraiseNum = memberEvaluationService.count(goodEvaluationQueryWrapper);
+        long highPraiseNum = memberEvaluationService.count(goodEvaluationQueryWrapper);
         //好评率
         double grade = NumberUtil.mul(NumberUtil.div(highPraiseNum, goods.getCommentNum().doubleValue(), 2), 100);
         goods.setGrade(grade);
@@ -380,7 +380,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
-    public Integer countStoreGoodsNum(String storeId) {
+    public long countStoreGoodsNum(String storeId) {
         return this.count(
                 new LambdaQueryWrapper<Goods>()
                         .eq(Goods::getStoreId, storeId)
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
index a70fc838..b20f45ae 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
@@ -490,7 +490,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
         goodEvaluationQueryWrapper.eq(MemberEvaluation::getGrade, EvaluationGradeEnum.GOOD.name());
 
         //好评数量
-        int highPraiseNum = memberEvaluationService.count(goodEvaluationQueryWrapper);
+        long highPraiseNum = memberEvaluationService.count(goodEvaluationQueryWrapper);
 
         //更新商品评价数量
         goodsSku.setCommentNum(goodsSku.getCommentNum() != null ? goodsSku.getCommentNum() + 1 : 1);
@@ -539,7 +539,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
     public void generateEs(Goods goods) {
         String destination = rocketmqCustomProperties.getGoodsTopic() + ":" + GoodsTagsEnum.GENERATOR_GOODS_INDEX.name();
         //发送mq消息
-        rocketMQTemplate.asyncSend(destination, JSONUtil.toJsonStr(goods), RocketmqSendCallbackBuilder.commonCallback());
+        rocketMQTemplate.asyncSend(destination, goods.getId(), RocketmqSendCallbackBuilder.commonCallback());
     }
 
     /**
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java
index 0738666b..0b4a8ee4 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java
@@ -3,7 +3,6 @@ package cn.lili.modules.member.entity.dos;
 import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -27,11 +26,6 @@ public class MemberReceipt extends BaseIdEntity {
 
     private static final long serialVersionUID = -8210927482915675995L;
 
-    @TableId
-    @TableField
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
     @ApiModelProperty(value = "发票抬头")
     private String receiptTitle;
 
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/EvaluationNumberVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/EvaluationNumberVO.java
index 152bee47..92084f43 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/EvaluationNumberVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/EvaluationNumberVO.java
@@ -25,5 +25,5 @@ public class EvaluationNumberVO {
     private Integer worse;
 
     @ApiModelProperty(value = "有图数量")
-    private Integer haveImage;
+    private Long haveImage;
 }
diff --git a/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java b/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java
index 624683d5..fc5d8ca3 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java
@@ -51,5 +51,5 @@ public interface FootprintService extends IService<FootPrint> {
      *
      * @return 当前会员的浏览记录数量
      */
-    Integer getFootprintNum();
+    long getFootprintNum();
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
index 294b7301..a4256c17 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
@@ -203,7 +203,7 @@ public interface MemberService extends IService<Member> {
      * @param memberSearchVO
      * @return 会员总数
      */
-    Integer getMemberNum(MemberSearchVO memberSearchVO);
+    long getMemberNum(MemberSearchVO memberSearchVO);
 
     /**
      * 获取指定会员数据
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java
index c9c0be86..ff5dd16c 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java
@@ -1,13 +1,13 @@
 package cn.lili.modules.member.serviceimpl;
 
 import cn.lili.common.security.context.UserContext;
-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dos.FootPrint;
 import cn.lili.modules.member.mapper.FootprintMapper;
 import cn.lili.modules.member.service.FootprintService;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
 import cn.lili.modules.search.service.EsGoodsSearchService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -81,19 +82,19 @@ public class FootprintServiceImpl extends ServiceImpl<FootprintMapper, FootPrint
         lambdaQueryWrapper.eq(FootPrint::getDeleteFlag, false);
         lambdaQueryWrapper.orderByDesc(FootPrint::getUpdateTime);
         List<String> skuIdList = this.baseMapper.footprintSkuIdList(PageUtil.initPage(pageVO), lambdaQueryWrapper);
-        if (skuIdList.size() > 0) {
+        if (!skuIdList.isEmpty()) {
             List<EsGoodsIndex> list = esGoodsSearchService.getEsGoodsBySkuIds(skuIdList);
             //去除为空的商品数据
             list.removeIf(Objects::isNull);
             return list;
         }
-        return null;
+        return Collections.emptyList();
     }
 
     @Override
-    public Integer getFootprintNum() {
+    public long getFootprintNum() {
         LambdaQueryWrapper<FootPrint> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(FootPrint::getMemberId, UserContext.getCurrentUser().getId());
+        lambdaQueryWrapper.eq(FootPrint::getMemberId, Objects.requireNonNull(UserContext.getCurrentUser()).getId());
         lambdaQueryWrapper.eq(FootPrint::getDeleteFlag, false);
         return this.count(lambdaQueryWrapper);
     }
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index 75e16601..1695271e 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -17,7 +17,6 @@ import cn.lili.common.security.token.Token;
 import cn.lili.common.sensitive.SensitiveWordsFilter;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.CookieUtil;
-import cn.lili.common.utils.StringUtils;
 import cn.lili.common.utils.UuidUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.connect.config.ConnectAuthEnum;
@@ -104,7 +103,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
 
     @Override
     public Member findByUsername(String userName) {
-        QueryWrapper<Member> queryWrapper = new QueryWrapper();
+        QueryWrapper<Member> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("username", userName);
         return this.baseMapper.selectOne(queryWrapper);
     }
@@ -121,7 +120,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
 
     @Override
     public boolean findByMobile(String uuid, String mobile) {
-        QueryWrapper<Member> queryWrapper = new QueryWrapper();
+        QueryWrapper<Member> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("mobile", mobile);
         Member member = this.baseMapper.selectOne(queryWrapper);
         if (member == null) {
@@ -160,7 +159,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
             throw new ServiceException(ResultCode.USER_PASSWORD_ERROR);
         }
         //对店铺状态的判定处理
-        if (member.getHaveStore()) {
+        if (Boolean.TRUE.equals(member.getHaveStore())) {
             Store store = storeService.getById(member.getStoreId());
             if (!store.getStoreDisable().equals(StoreStatusEnum.OPEN.name())) {
                 throw new ServiceException(ResultCode.STORE_CLOSE_ERROR);
@@ -175,11 +174,11 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
     /**
      * 传递手机号或者用户名
      *
-     * @param userName
-     * @return
+     * @param userName 手机号或者用户名
+     * @return 会员信息
      */
     private Member findMember(String userName) {
-        QueryWrapper<Member> queryWrapper = new QueryWrapper();
+        QueryWrapper<Member> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("username", userName).or().eq("mobile", userName);
         return this.getOne(queryWrapper);
     }
@@ -187,10 +186,10 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
     @Override
     public Token autoRegister(ConnectAuthUser authUser) {
 
-        if (StringUtils.isEmpty(authUser.getNickname())) {
+        if (CharSequenceUtil.isEmpty(authUser.getNickname())) {
             authUser.setNickname("临时昵称");
         }
-        if (StringUtils.isEmpty(authUser.getAvatar())) {
+        if (CharSequenceUtil.isEmpty(authUser.getAvatar())) {
             authUser.setAvatar("https://i.loli.net/2020/11/19/LyN6JF7zZRskdIe.png");
         }
         try {
@@ -364,13 +363,13 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
     public IPage<MemberVO> getMemberPage(MemberSearchVO memberSearchVO, PageVO page) {
         QueryWrapper<Member> queryWrapper = Wrappers.query();
         //用户名查询
-        queryWrapper.like(StringUtils.isNotBlank(memberSearchVO.getUsername()), "username", memberSearchVO.getUsername());
+        queryWrapper.like(CharSequenceUtil.isNotBlank(memberSearchVO.getUsername()), "username", memberSearchVO.getUsername());
         //用户名查询
-        queryWrapper.like(StringUtils.isNotBlank(memberSearchVO.getNickName()), "nick_name", memberSearchVO.getNickName());
+        queryWrapper.like(CharSequenceUtil.isNotBlank(memberSearchVO.getNickName()), "nick_name", memberSearchVO.getNickName());
         //按照电话号码查询
-        queryWrapper.like(StringUtils.isNotBlank(memberSearchVO.getMobile()), "mobile", memberSearchVO.getMobile());
+        queryWrapper.like(CharSequenceUtil.isNotBlank(memberSearchVO.getMobile()), "mobile", memberSearchVO.getMobile());
         //按照会员状态查询
-        queryWrapper.eq(StringUtils.isNotBlank(memberSearchVO.getDisabled()), "disabled",
+        queryWrapper.eq(CharSequenceUtil.isNotBlank(memberSearchVO.getDisabled()), "disabled",
                 memberSearchVO.getDisabled().equals(SwitchEnum.OPEN.name()) ? 1 : 0);
         queryWrapper.orderByDesc("create_time");
         return this.baseMapper.pageByMemberVO(PageUtil.initPage(page), queryWrapper);
@@ -398,7 +397,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
             }
             member.setPoint(currentPoint);
             member.setTotalPoint(totalPoint);
-            Boolean result = this.updateById(member);
+            boolean result = this.updateById(member);
             if (result) {
                 //发送会员消息
                 MemberPointMessage memberPointMessage = new MemberPointMessage();
@@ -423,6 +422,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
 
         return this.update(updateWrapper);
     }
+
     /**
      * 根据手机号获取会员
      *
@@ -430,7 +430,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
      * @return 会员
      */
     private Member findByPhone(String mobilePhone) {
-        QueryWrapper<Member> queryWrapper = new QueryWrapper();
+        QueryWrapper<Member> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("mobile", mobilePhone);
         return this.baseMapper.selectOne(queryWrapper);
     }
@@ -440,7 +440,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
      *
      * @param uuid uuid
      * @param type 状态
-     * @return
+     * @return cookie中的联合登录对象
      */
     private ConnectAuthUser getConnectAuthUser(String uuid, String type) {
         Object context = cache.get(ConnectService.cacheKey(type, uuid));
@@ -477,7 +477,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
         String uuid = CookieUtil.getCookie(ConnectService.CONNECT_COOKIE, ThreadContextHolder.getHttpRequest());
         String connectType = CookieUtil.getCookie(ConnectService.CONNECT_TYPE, ThreadContextHolder.getHttpRequest());
         //如果联合登陆存储了信息
-        if (StringUtils.isNotEmpty(uuid) && StringUtils.isNotEmpty(connectType)) {
+        if (CharSequenceUtil.isNotEmpty(uuid) && CharSequenceUtil.isNotEmpty(connectType)) {
             try {
                 //获取信息
                 ConnectAuthUser connectAuthUser = getConnectAuthUser(uuid, connectType);
@@ -518,28 +518,24 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
         String connectType = CookieUtil.getCookie(ConnectService.CONNECT_TYPE, ThreadContextHolder.getHttpRequest());
 
         //如果联合登陆存储了信息
-        if (StringUtils.isNotEmpty(uuid) && StringUtils.isNotEmpty(connectType)) {
-            try {
-                //枚举 联合登陆类型获取
-                ConnectAuthEnum authInterface = ConnectAuthEnum.valueOf(connectType);
+        if (CharSequenceUtil.isNotEmpty(uuid) && CharSequenceUtil.isNotEmpty(connectType)) {
+            //枚举 联合登陆类型获取
+            ConnectAuthEnum authInterface = ConnectAuthEnum.valueOf(connectType);
 
-                ConnectAuthUser connectAuthUser = getConnectAuthUser(uuid, connectType);
-                if (connectAuthUser == null) {
-                    throw new ServiceException(ResultCode.USER_OVERDUE_CONNECT_ERROR);
-                }
-                //检测是否已经绑定过用户
-                Connect connect = connectService.queryConnect(
-                        ConnectQueryDTO.builder().unionType(connectType).unionId(connectAuthUser.getUuid()).build()
-                );
-                //没有关联则返回true，表示可以继续绑定
-                if (connect == null) {
-                    connectAuthUser.setConnectEnum(authInterface);
-                    return connectAuthUser;
-                } else {
-                    throw new ServiceException(ResultCode.USER_CONNECT_BANDING_ERROR);
-                }
-            } catch (Exception e) {
-                throw e;
+            ConnectAuthUser connectAuthUser = getConnectAuthUser(uuid, connectType);
+            if (connectAuthUser == null) {
+                throw new ServiceException(ResultCode.USER_OVERDUE_CONNECT_ERROR);
+            }
+            //检测是否已经绑定过用户
+            Connect connect = connectService.queryConnect(
+                    ConnectQueryDTO.builder().unionType(connectType).unionId(connectAuthUser.getUuid()).build()
+            );
+            //没有关联则返回true，表示可以继续绑定
+            if (connect == null) {
+                connectAuthUser.setConnectEnum(authInterface);
+                return connectAuthUser;
+            } else {
+                throw new ServiceException(ResultCode.USER_CONNECT_BANDING_ERROR);
             }
         } else {
             throw new ServiceException(ResultCode.USER_CONNECT_NOT_EXIST_ERROR);
@@ -547,14 +543,14 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
     }
 
     @Override
-    public Integer getMemberNum(MemberSearchVO memberSearchVO) {
+    public long getMemberNum(MemberSearchVO memberSearchVO) {
         QueryWrapper<Member> queryWrapper = Wrappers.query();
         //用户名查询
-        queryWrapper.like(StringUtils.isNotBlank(memberSearchVO.getUsername()), "username", memberSearchVO.getUsername());
+        queryWrapper.like(CharSequenceUtil.isNotBlank(memberSearchVO.getUsername()), "username", memberSearchVO.getUsername());
         //按照电话号码查询
-        queryWrapper.like(StringUtils.isNotBlank(memberSearchVO.getMobile()), "mobile", memberSearchVO.getMobile());
+        queryWrapper.like(CharSequenceUtil.isNotBlank(memberSearchVO.getMobile()), "mobile", memberSearchVO.getMobile());
         //按照状态查询
-        queryWrapper.eq(StringUtils.isNotBlank(memberSearchVO.getDisabled()), "disabled",
+        queryWrapper.eq(CharSequenceUtil.isNotBlank(memberSearchVO.getDisabled()), "disabled",
                 memberSearchVO.getDisabled().equals(SwitchEnum.OPEN.name()) ? 1 : 0);
         queryWrapper.orderByDesc("create_time");
         return this.count(queryWrapper);
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
index c3a4950a..895b2f41 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
@@ -129,7 +129,7 @@ public class OrderSearchParams extends PageVO {
                     && CharSequenceUtil.isNotEmpty(storeId), "o.store_id", storeId);
 
             //按买家查询
-            wrapper.eq(CharSequenceUtil.equals(currentUser.getRole().name(), UserEnums.MEMBER.name()) && CharSequenceUtil.isEmpty(memberId), "o.member_id", currentUser.getId());
+            wrapper.eq(CharSequenceUtil.equals(currentUser.getRole().name(), UserEnums.MEMBER.name()) && memberId == null, "o.member_id", currentUser.getId());
 
         }
         //按照买家查询
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java
index 7ab562da..3750ee3c 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java
@@ -72,7 +72,7 @@ public interface OrderComplaintService extends IService<OrderComplaint> {
      *
      * @return 待处理投诉数量
      */
-    Integer waitComplainNum();
+    long waitComplainNum();
 
     /**
      * 取消交易投诉
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
index abbd337a..e6396dcd 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
@@ -79,7 +79,7 @@ public interface OrderService extends IService<Order> {
      * @param orderSn 订单编号
      * @return 订单信息
      */
-    Integer queryCountByPromotion(String orderPromotionType, String payStatus, String parentOrderSn, String orderSn);
+    long queryCountByPromotion(String orderPromotionType, String payStatus, String parentOrderSn, String orderSn);
 
     /**
      * 父级拼团订单分组
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java
index 53746d82..405c712a 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.serviceimpl;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
@@ -8,7 +8,6 @@ import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.BeanUtil;
-import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.service.GoodsSkuService;
@@ -206,10 +205,10 @@ public class OrderComplaintServiceImpl extends ServiceImpl<OrderComplaintMapper,
     }
 
     @Override
-    public Integer waitComplainNum() {
+    public long waitComplainNum() {
         QueryWrapper queryWrapper = Wrappers.query();
         queryWrapper.ne("complain_status", ComplaintStatusEnum.COMPLETE.name());
-        queryWrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),
+        queryWrapper.eq(CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),
                 "store_id", UserContext.getCurrentUser().getStoreId());
         return this.count(queryWrapper);
     }
@@ -218,7 +217,7 @@ public class OrderComplaintServiceImpl extends ServiceImpl<OrderComplaintMapper,
     public boolean cancel(String id) {
         OrderComplaint orderComplaint = OperationalJudgment.judgment(this.getById(id));
         //如果以及仲裁，则不可以进行申诉取消
-        if(orderComplaint.getComplainStatus().equals(ComplaintStatusEnum.COMPLETE.name())){
+        if (orderComplaint.getComplainStatus().equals(ComplaintStatusEnum.COMPLETE.name())) {
             throw new ServiceException(ResultCode.COMPLAINT_CANCEL_ERROR);
         }
         LambdaUpdateWrapper<OrderComplaint> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
@@ -250,12 +249,12 @@ public class OrderComplaintServiceImpl extends ServiceImpl<OrderComplaintMapper,
     private void checkOperationParams(OrderComplaintOperationParams operationParam, OrderComplaint orderComplaint) {
         ComplaintStatusEnum complaintStatusEnum = ComplaintStatusEnum.valueOf(operationParam.getComplainStatus());
         if (complaintStatusEnum == ComplaintStatusEnum.COMPLETE) {
-            if (StrUtil.isEmpty(operationParam.getArbitrationResult())) {
+            if (CharSequenceUtil.isEmpty(operationParam.getArbitrationResult())) {
                 throw new ServiceException(ResultCode.COMPLAINT_ARBITRATION_RESULT_ERROR);
             }
             orderComplaint.setArbitrationResult(operationParam.getArbitrationResult());
         } else if (complaintStatusEnum == ComplaintStatusEnum.COMMUNICATION) {
-            if (StrUtil.isEmpty(operationParam.getAppealContent()) || operationParam.getImages() == null) {
+            if (CharSequenceUtil.isEmpty(operationParam.getAppealContent()) || operationParam.getImages() == null) {
                 throw new ServiceException(ResultCode.COMPLAINT_APPEAL_CONTENT_ERROR);
             }
             orderComplaint.setContent(operationParam.getAppealContent());
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index d3844817..80458c32 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -233,7 +233,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
      * @return 订单信息
      */
     @Override
-    public Integer queryCountByPromotion(String orderPromotionType, String payStatus, String parentOrderSn, String orderSn) {
+    public long queryCountByPromotion(String orderPromotionType, String payStatus, String parentOrderSn, String orderSn) {
         LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<>();
         //查找团长订单和已和当前拼团订单拼团的订单
         queryWrapper.eq(Order::getOrderPromotionType, orderPromotionType)
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/PayKit.java b/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/PayKit.java
index 8dd5a458..35cb4187 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/PayKit.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/PayKit.java
@@ -44,7 +44,7 @@ public class PayKit {
      * @return sha256 字符串
      */
     public static String hmacSha256(String data, String key) {
-        return SecureUtil.hmac(HmacAlgorithm.HmacSHA256, key).digestHex(data, CharsetUtil.UTF_8);
+        return SecureUtil.hmac(HmacAlgorithm.HmacSHA256, key).digestHex(data);
     }
 
     /**
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanMemberVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanMemberVO.java
index 7b1ce33f..99d65b1f 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanMemberVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanMemberVO.java
@@ -33,13 +33,13 @@ public class PintuanMemberVO {
     private String orderSn;
 
     @ApiModelProperty(value = "已参团人数")
-    private Integer groupedNum;
+    private long groupedNum;
 
     @ApiModelProperty(value = "待参团人数")
-    private Integer toBeGroupedNum;
+    private long toBeGroupedNum;
 
     @ApiModelProperty(value = "成团人数")
-    private Integer groupNum;
+    private long groupNum;
 
     public PintuanMemberVO(Member member) {
         this.memberId = member.getId();
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java b/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java
index 429915ec..56355b2e 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java
@@ -93,7 +93,7 @@ public interface MemberCouponService extends IService<MemberCoupon> {
      *
      * @return 会员优惠券数量
      */
-    Integer getMemberCouponsNum();
+    long getMemberCouponsNum();
 
     /**
      * 更新会员优惠券状态
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java b/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java
index eecb42c3..b0edb0b5 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java
@@ -37,7 +37,7 @@ public interface SeckillService extends AbstractPromotionsService<Seckill> {
      *
      * @return 可参与活动数量
      */
-    Integer getApplyNum();
+    long getApplyNum();
 
     /**
      * 更新秒杀活动的商品数量
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java
index 88152983..b0bfde1c 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java
@@ -55,7 +55,7 @@ public class KanjiaActivityLogServiceImpl extends ServiceImpl<KanJiaActivityLogM
         LambdaQueryWrapper<KanjiaActivityLog> queryWrapper = new LambdaQueryWrapper<KanjiaActivityLog>();
         queryWrapper.eq(kanjiaActivityDTO.getKanjiaActivityId() != null, KanjiaActivityLog::getKanjiaActivityId, kanjiaActivityDTO.getKanjiaActivityId());
         queryWrapper.eq( KanjiaActivityLog::getKanjiaMemberId, UserContext.getCurrentUser().getId());
-        Integer count = this.baseMapper.selectCount(queryWrapper);
+        long count = this.baseMapper.selectCount(queryWrapper);
         if (count > 0) {
             throw new ServiceException(ResultCode.KANJIA_ACTIVITY_LOG_MEMBER_ERROR);
         }
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java
index a42c5f30..b43db085 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java
@@ -50,7 +50,7 @@ public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, Mem
         LambdaQueryWrapper<MemberCoupon> queryWrapper = new LambdaQueryWrapper<MemberCoupon>()
                 .eq(MemberCoupon::getCouponId, couponId)
                 .eq(MemberCoupon::getMemberId, memberId);
-        int haveCoupons = this.count(queryWrapper);
+        long haveCoupons = this.count(queryWrapper);
         if (!PromotionsStatusEnum.START.name().equals(coupon.getPromotionStatus())) {
             throw new ServiceException(ResultCode.COUPON_RECEIVE_ERROR);
         }
@@ -167,7 +167,7 @@ public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, Mem
     }
 
     @Override
-    public Integer getMemberCouponsNum() {
+    public long getMemberCouponsNum() {
         AuthUser authUser = Objects.requireNonNull(UserContext.getCurrentUser());
         QueryWrapper<MemberCoupon> queryWrapper = Wrappers.query();
         queryWrapper.eq("member_id", authUser.getId());
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
index 86714e0b..ffe90e9e 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
@@ -158,7 +158,7 @@ public class PintuanServiceImpl extends AbstractPromotionsServiceImpl<PintuanMap
             for (String id : ids) {
                 Pintuan pintuan = this.getById(id);
                 QueryWrapper<Pintuan> queryWrapper = PromotionTools.checkActiveTime(new Date(startTime), new Date(endTime), PromotionTypeEnum.PINTUAN, pintuan.getStoreId(), id);
-                int sameNum = this.count(queryWrapper);
+                long sameNum = this.count(queryWrapper);
                 //当前时间段是否存在同类活动
                 if (sameNum > 0) {
                     throw new ServiceException(ResultCode.PROMOTION_SAME_ACTIVE_EXIST);
@@ -177,7 +177,7 @@ public class PintuanServiceImpl extends AbstractPromotionsServiceImpl<PintuanMap
     @Override
     public void checkPromotions(Pintuan promotions) {
         QueryWrapper<Pintuan> queryWrapper = PromotionTools.checkActiveTime(promotions.getStartTime(), promotions.getEndTime(), PromotionTypeEnum.PINTUAN, promotions.getStoreId(), promotions.getId());
-        int sameNum = this.count(queryWrapper);
+        long sameNum = this.count(queryWrapper);
         //当前时间段是否存在同类活动
         if (sameNum > 0) {
             throw new ServiceException(ResultCode.PROMOTION_SAME_ACTIVE_EXIST);
@@ -260,9 +260,9 @@ public class PintuanServiceImpl extends AbstractPromotionsServiceImpl<PintuanMap
     }
 
     private void setMemberVONum(PintuanMemberVO memberVO, Integer requiredNum, String orderSn) {
-        int count = this.orderService.queryCountByPromotion(PromotionTypeEnum.PINTUAN.name(), PayStatusEnum.PAID.name(), orderSn, orderSn);
+        long count = this.orderService.queryCountByPromotion(PromotionTypeEnum.PINTUAN.name(), PayStatusEnum.PAID.name(), orderSn, orderSn);
         //获取待参团人数
-        int toBoGrouped = requiredNum - count;
+        long toBoGrouped = requiredNum - count;
         memberVO.setGroupNum(requiredNum);
         memberVO.setGroupedNum(count);
         memberVO.setToBeGroupedNum(toBoGrouped);
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
index 796e5b4e..88674fa8 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
@@ -90,7 +90,7 @@ public class SeckillServiceImpl extends AbstractPromotionsServiceImpl<SeckillMap
     }
 
     @Override
-    public Integer getApplyNum() {
+    public long getApplyNum() {
         DateTime now = DateUtil.date();
         LambdaQueryWrapper<Seckill> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.ge(Seckill::getApplyEndTime, now);
@@ -194,7 +194,7 @@ public class SeckillServiceImpl extends AbstractPromotionsServiceImpl<SeckillMap
         if (promotions.getStartTime() != null && promotions.getEndTime() != null) {
             //同一时间段内相同的活动
             QueryWrapper<Seckill> queryWrapper = PromotionTools.checkActiveTime(promotions.getStartTime(), promotions.getEndTime(), PromotionTypeEnum.SECKILL, null, promotions.getId());
-            int sameNum = this.count(queryWrapper);
+            long sameNum = this.count(queryWrapper);
             //当前时间段是否存在同类活动
             if (sameNum > 0) {
                 throw new ServiceException(ResultCode.PROMOTION_SAME_ACTIVE_EXIST);
diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java
index 6cdf3b00..c01db760 100644
--- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java
@@ -118,7 +118,7 @@ public class CustomWordsServiceImpl extends ServiceImpl<CustomWordsMapper, Custo
     @Override
     public boolean existWords(String words) {
         LambdaQueryWrapper<CustomWords> queryWrapper = new LambdaQueryWrapper<CustomWords>().eq(CustomWords::getName, words);
-        int count = count(queryWrapper);
+        long count = count(queryWrapper);
         return count > 0;
     }
 }
diff --git a/framework/src/main/java/cn/lili/modules/statistics/entity/dos/MemberStatisticsData.java b/framework/src/main/java/cn/lili/modules/statistics/entity/dos/MemberStatisticsData.java
index 39e90891..ad6df23d 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/entity/dos/MemberStatisticsData.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/entity/dos/MemberStatisticsData.java
@@ -27,13 +27,13 @@ public class MemberStatisticsData extends BaseIdEntity {
     private Date createDate;
 
     @ApiModelProperty(value = "当前会员数量")
-    private Integer memberCount;
+    private Long memberCount;
 
     @ApiModelProperty(value = "新增会员数量")
-    private Integer newlyAdded;
+    private Long newlyAdded;
 
     @ApiModelProperty(value = "当日活跃数量")
-    private Integer activeQuantity;
+    private Long activeQuantity;
 
 
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexNoticeVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexNoticeVO.java
index 56b3f0f5..beca7f8d 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexNoticeVO.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexNoticeVO.java
@@ -13,21 +13,21 @@ import lombok.Data;
 public class IndexNoticeVO {
 
     @ApiModelProperty(value = "待处理商品审核")
-    private Integer goods;
+    private Long goods;
 
     @ApiModelProperty(value = "待处理店铺入驻审核")
-    private Integer store;
+    private Long store;
 
     @ApiModelProperty(value = "待处理售后申请")
-    private Integer refund;
+    private Long refund;
 
     @ApiModelProperty(value = "待处理投诉审核")
-    private Integer complain;
+    private Long complain;
 
     @ApiModelProperty(value = "待处理分销员提现申请")
-    private Integer distributionCash;
+    private Long distributionCash;
 
     @ApiModelProperty(value = "待处理商家结算")
-    private Integer waitPayBill;
+    private Long waitPayBill;
 
 }
diff --git a/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexStatisticsVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexStatisticsVO.java
index e449bd9e..3e5645a1 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexStatisticsVO.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexStatisticsVO.java
@@ -13,13 +13,13 @@ import lombok.Data;
 public class IndexStatisticsVO {
 
     @ApiModelProperty(value = "订单总数量")
-    private Integer orderNum;
+    private Long orderNum;
     @ApiModelProperty(value = "商品总数量")
-    private Integer goodsNum;
+    private Long goodsNum;
     @ApiModelProperty(value = "会员总数量")
-    private Integer memberNum;
+    private Long memberNum;
     @ApiModelProperty(value = "店铺总数量")
-    private Integer storeNum;
+    private Long storeNum;
 
     /**
      * 流量概括
@@ -41,13 +41,13 @@ public class IndexStatisticsVO {
     @ApiModelProperty(value = "今日下单金额")
     private Double todayOrderPrice;
     @ApiModelProperty(value = "今日新增会员数量")
-    private Integer todayMemberNum;
+    private Long todayMemberNum;
     @ApiModelProperty(value = "今日新增商品数量")
-    private Integer todayGoodsNum;
+    private Long todayGoodsNum;
     @ApiModelProperty(value = "今日新增店铺数量")
-    private Integer todayStoreNum;
+    private Long todayStoreNum;
     @ApiModelProperty(value = "今日新增评论数量")
-    private Integer todayMemberEvaluation;
+    private Long todayMemberEvaluation;
     @ApiModelProperty(value = "当前在线人数")
     private Long currentNumberPeopleOnline;
 }
diff --git a/framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreIndexStatisticsVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreIndexStatisticsVO.java
index f4b013f0..d3d2d5d5 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreIndexStatisticsVO.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreIndexStatisticsVO.java
@@ -13,7 +13,7 @@ import lombok.Data;
 public class StoreIndexStatisticsVO {
 
     @ApiModelProperty(value = "商品总数量")
-    private Integer goodsNum;
+    private Long goodsNum;
     @ApiModelProperty(value = "订单总数量")
     private Integer orderNum;
     @ApiModelProperty(value = "订单总额")
@@ -22,30 +22,30 @@ public class StoreIndexStatisticsVO {
     private Integer storeUV;
 
     @ApiModelProperty(value = "待付款订单数量")
-    private Integer unPaidOrder;
+    private Long unPaidOrder;
     @ApiModelProperty(value = "待发货订单数量")
-    private Integer unDeliveredOrder;
+    private Long unDeliveredOrder;
     @ApiModelProperty(value = "待收货订单数量")
-    private Integer deliveredOrder;
+    private Long deliveredOrder;
 
     @ApiModelProperty(value = "待处理退货数量")
-    private Integer returnGoods;
+    private Long returnGoods;
     @ApiModelProperty(value = "待处理退款数量")
-    private Integer returnMoney;
+    private Long returnMoney;
     @ApiModelProperty(value = "待回复评价数量")
-    private Integer memberEvaluation;
+    private Long memberEvaluation;
     @ApiModelProperty(value = "待处理交易投诉数量")
-    private Integer complaint;
+    private Long complaint;
 
     @ApiModelProperty(value = "待上架商品数量")
-    private Integer waitUpper;
+    private Long waitUpper;
     @ApiModelProperty(value = "待审核商品数量")
-    private Integer waitAuth;
+    private Long waitAuth;
 
     @ApiModelProperty(value = "可参与秒杀活动数量")
-    private Integer seckillNum;
+    private Long seckillNum;
     @ApiModelProperty(value = "未对账结算单数量")
-    private Integer waitPayBill;
+    private Long waitPayBill;
 
 
 }
diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsMapper.java
index 4e9f0206..e578425d 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsMapper.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsMapper.java
@@ -25,7 +25,7 @@ public interface MemberStatisticsMapper extends BaseMapper<MemberStatisticsData>
      * @return 会员统计数量
      */
     @Select("SELECT  COUNT(0)  FROM li_member  ${ew.customSqlSegment}")
-    Integer customSqlQuery(@Param(Constants.WRAPPER) Wrapper queryWrapper);
+    long customSqlQuery(@Param(Constants.WRAPPER) Wrapper queryWrapper);
 
 
     /**
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/AfterSaleStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/AfterSaleStatisticsService.java
index 20d8be4d..d1c11230 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/AfterSaleStatisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/AfterSaleStatisticsService.java
@@ -20,7 +20,7 @@ public interface AfterSaleStatisticsService extends IService<AfterSale> {
      * @param serviceType 售后类型
      * @return 待处理售后数量
      */
-    Integer applyNum(String serviceType);
+    long applyNum(String serviceType);
 
     /**
      * 获取统计的售后
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/BillStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/BillStatisticsService.java
index e2d92099..07d6ea3f 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/BillStatisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/BillStatisticsService.java
@@ -18,5 +18,5 @@ public interface BillStatisticsService extends IService<Bill> {
      * @param billStatusEnum 结算单类型
      * @return 待结算商家数量
      */
-    Integer billNum(BillStatusEnum billStatusEnum);
+    long billNum(BillStatusEnum billStatusEnum);
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/DistributionCashStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/DistributionCashStatisticsService.java
index 0facd4aa..c7d6bad3 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/DistributionCashStatisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/DistributionCashStatisticsService.java
@@ -16,5 +16,5 @@ public interface DistributionCashStatisticsService extends IService<Distribution
      *
      * @return 待处理分销员提现申请数量
      */
-    Integer newDistributionCash();
+    long newDistributionCash();
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsService.java
index fb6d0a36..d790047a 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsService.java
@@ -16,16 +16,16 @@ public interface GoodsStatisticsService extends IService<Goods> {
     /**
      * 获取所有的已上架的商品数量
      *
-     * @param goodsAuthEnum   商品审核枚举
      * @param goodsStatusEnum 商品状态枚举
+     * @param goodsAuthEnum   商品审核枚举
      * @return 所有的已上架的商品数量
      */
-    Integer goodsNum(GoodsStatusEnum goodsStatusEnum, GoodsAuthEnum goodsAuthEnum);
+    long goodsNum(GoodsStatusEnum goodsStatusEnum, GoodsAuthEnum goodsAuthEnum);
 
     /**
      * 获取今天的已上架的商品数量
      *
      * @return 今天的已上架的商品数量
      */
-    Integer todayUpperNum();
+    long todayUpperNum();
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/MemberEvaluationStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/MemberEvaluationStatisticsService.java
index e2d3d3f5..585c754c 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/MemberEvaluationStatisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/MemberEvaluationStatisticsService.java
@@ -16,13 +16,13 @@ public interface MemberEvaluationStatisticsService extends IService<MemberEvalua
      *
      * @return 今日评价数量
      */
-    Integer todayMemberEvaluation();
+    long todayMemberEvaluation();
 
     /**
      * 获取等待回复评价数量
      *
      * @return 等待回复评价数量
      */
-    Integer getWaitReplyNum();
+    long getWaitReplyNum();
 
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsService.java
index 8dd9a447..95292cfc 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsService.java
@@ -21,14 +21,14 @@ public interface MemberStatisticsService extends IService<MemberStatisticsData>
      *
      * @return 会员统计
      */
-    Integer getMemberCount();
+    long getMemberCount();
 
     /**
      * 获取今日新增会员数量
      *
      * @return 今日新增会员数量
      */
-    Integer todayMemberNum();
+    long todayMemberNum();
 
     /**
      * 获取指定结束时间前的会员数量
@@ -36,7 +36,7 @@ public interface MemberStatisticsService extends IService<MemberStatisticsData>
      * @param endTime
      * @return
      */
-    Integer memberCount(Date endTime);
+    long memberCount(Date endTime);
 
     /**
      * 当天活跃会员数量
@@ -44,7 +44,7 @@ public interface MemberStatisticsService extends IService<MemberStatisticsData>
      * @param startTime
      * @return
      */
-    Integer activeQuantity(Date startTime);
+    long activeQuantity(Date startTime);
 
     /**
      * 时间段内新增会员数量
@@ -53,7 +53,7 @@ public interface MemberStatisticsService extends IService<MemberStatisticsData>
      * @param startTime
      * @return
      */
-    Integer newlyAdded(Date endTime, Date startTime);
+    long newlyAdded(Date endTime, Date startTime);
 
     /**
      * 根据参数，查询这段时间的会员统计
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/OrderComplaintStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/OrderComplaintStatisticsService.java
index 16a896fe..95834e38 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/OrderComplaintStatisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/OrderComplaintStatisticsService.java
@@ -16,5 +16,5 @@ public interface OrderComplaintStatisticsService extends IService<OrderComplaint
      *
      * @return 待处理投诉数量
      */
-    Integer waitComplainNum();
+    long waitComplainNum();
 }
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsService.java
index 55206f90..7fb074dd 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsService.java
@@ -33,7 +33,7 @@ public interface OrderStatisticsService extends IService<Order> {
      * @param orderStatus 订单状态
      * @return 订单总数量
      */
-    Integer orderNum(String orderStatus);
+    long orderNum(String orderStatus);
 
     /**
      * 图表统计
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/SeckillStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/SeckillStatisticsService.java
index fe5d0b81..fdef0654 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/SeckillStatisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/SeckillStatisticsService.java
@@ -17,6 +17,6 @@ public interface SeckillStatisticsService extends IService<Seckill> {
      *
      * @return 可参与活动数量
      */
-    Integer getApplyNum();
+    long getApplyNum();
 
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/StoreStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/StoreStatisticsService.java
index a8e3a0dd..1a90c9f6 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/StoreStatisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/StoreStatisticsService.java
@@ -16,19 +16,19 @@ public interface StoreStatisticsService extends IService<Store> {
      *
      * @return 待审核店铺数量
      */
-    Integer auditNum();
+    long auditNum();
 
     /**
      * 获取所有店铺数量
      *
      * @return 店铺总数
      */
-    Integer storeNum();
+    long storeNum();
 
     /**
      * 获取今天的店铺数量
      *
      * @return 今天的店铺数量
      */
-    Integer todayStoreNum();
+    long todayStoreNum();
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/AfterSaleStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/AfterSaleStatisticsServiceImpl.java
index eabd80ee..21456526 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/AfterSaleStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/AfterSaleStatisticsServiceImpl.java
@@ -32,7 +32,7 @@ public class AfterSaleStatisticsServiceImpl extends ServiceImpl<AfterSaleStatist
 
 
     @Override
-    public Integer applyNum(String serviceType) {
+    public long applyNum(String serviceType) {
         AuthUser authUser = Objects.requireNonNull(UserContext.getCurrentUser());
         LambdaQueryWrapper<AfterSale> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(AfterSale::getServiceStatus, AfterSaleStatusEnum.APPLY.name());
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/BillStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/BillStatisticsServiceImpl.java
index e9350d29..622ff256 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/BillStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/BillStatisticsServiceImpl.java
@@ -1,8 +1,8 @@
 package cn.lili.modules.statistics.serviceimpl;
 
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.statistics.mapper.BillStatisticsMapper;
 import cn.lili.modules.statistics.service.BillStatisticsService;
 import cn.lili.modules.store.entity.dos.Bill;
@@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Objects;
+
 /**
  * 结算单统计
  *
@@ -25,10 +27,10 @@ public class BillStatisticsServiceImpl extends ServiceImpl<BillStatisticsMapper,
 
 
     @Override
-    public Integer billNum(BillStatusEnum billStatusEnum) {
+    public long billNum(BillStatusEnum billStatusEnum) {
         LambdaUpdateWrapper<Bill> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
         lambdaUpdateWrapper.eq(Bill::getBillStatus, billStatusEnum.name());
-        lambdaUpdateWrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),
+        lambdaUpdateWrapper.eq(CharSequenceUtil.equals(Objects.requireNonNull(UserContext.getCurrentUser()).getRole().name(), UserEnums.STORE.name()),
                 Bill::getStoreId, UserContext.getCurrentUser().getStoreId());
         return this.count(lambdaUpdateWrapper);
     }
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/DistributionCashStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/DistributionCashStatisticsServiceImpl.java
index 41cb6d9b..79ab876c 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/DistributionCashStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/DistributionCashStatisticsServiceImpl.java
@@ -24,7 +24,7 @@ public class DistributionCashStatisticsServiceImpl extends ServiceImpl<Distribut
 
 
     @Override
-    public Integer newDistributionCash() {
+    public long newDistributionCash() {
         QueryWrapper queryWrapper = Wrappers.query();
         queryWrapper.eq("distribution_cash_status", WithdrawStatusEnum.APPLY.name());
         return this.count(queryWrapper);
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsServiceImpl.java
index 120d9c15..b0e9768c 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsServiceImpl.java
@@ -28,7 +28,7 @@ import java.util.Objects;
 public class GoodsStatisticsServiceImpl extends ServiceImpl<GoodsStatisticsMapper, Goods> implements GoodsStatisticsService {
 
     @Override
-    public Integer goodsNum(GoodsStatusEnum goodsStatusEnum, GoodsAuthEnum goodsAuthEnum) {
+    public long goodsNum(GoodsStatusEnum goodsStatusEnum, GoodsAuthEnum goodsAuthEnum) {
         LambdaQueryWrapper<Goods> queryWrapper = Wrappers.lambdaQuery();
 
         queryWrapper.eq(Goods::getDeleteFlag, false);
@@ -47,7 +47,7 @@ public class GoodsStatisticsServiceImpl extends ServiceImpl<GoodsStatisticsMappe
     }
 
     @Override
-    public Integer todayUpperNum() {
+    public long todayUpperNum() {
         LambdaQueryWrapper<Goods> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(Goods::getMarketEnable, GoodsStatusEnum.UPPER.name());
         queryWrapper.ge(Goods::getCreateTime, DateUtil.beginOfDay(new DateTime()));
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberEvaluationStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberEvaluationStatisticsServiceImpl.java
index 255fca6e..62caf740 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberEvaluationStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberEvaluationStatisticsServiceImpl.java
@@ -2,9 +2,9 @@ package cn.lili.modules.statistics.serviceimpl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.member.entity.dos.MemberEvaluation;
 import cn.lili.modules.statistics.mapper.MemberEvaluationStatisticsMapper;
 import cn.lili.modules.statistics.service.MemberEvaluationStatisticsService;
@@ -15,6 +15,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Objects;
+
 /**
  * 会员商品评价业务层实现
  *
@@ -27,14 +29,14 @@ public class MemberEvaluationStatisticsServiceImpl extends ServiceImpl<MemberEva
 
 
     @Override
-    public Integer todayMemberEvaluation() {
+    public long todayMemberEvaluation() {
         return this.count(new LambdaQueryWrapper<MemberEvaluation>().ge(MemberEvaluation::getCreateTime, DateUtil.beginOfDay(new DateTime())));
     }
 
     @Override
-    public Integer getWaitReplyNum() {
+    public long getWaitReplyNum() {
         QueryWrapper<MemberEvaluation> queryWrapper = Wrappers.query();
-        queryWrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),
+        queryWrapper.eq(CharSequenceUtil.equals(Objects.requireNonNull(UserContext.getCurrentUser()).getRole().name(), UserEnums.STORE.name()),
                 "store_id", UserContext.getCurrentUser().getStoreId());
         queryWrapper.eq("reply_status", false);
         return this.count(queryWrapper);
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsServiceImpl.java
index 716828c2..cf39dde3 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsServiceImpl.java
@@ -27,28 +27,28 @@ import java.util.List;
 public class MemberStatisticsServiceImpl extends ServiceImpl<MemberStatisticsMapper, MemberStatisticsData> implements MemberStatisticsService {
 
     @Override
-    public Integer getMemberCount() {
+    public long getMemberCount() {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("disabled", true);
         return this.baseMapper.customSqlQuery(queryWrapper);
     }
 
     @Override
-    public Integer todayMemberNum() {
+    public long todayMemberNum() {
         QueryWrapper queryWrapper = Wrappers.query();
         queryWrapper.ge("create_time", DateUtil.beginOfDay(new Date()));
         return this.baseMapper.customSqlQuery(queryWrapper);
     }
 
     @Override
-    public Integer memberCount(Date endTime) {
+    public long memberCount(Date endTime) {
         QueryWrapper queryWrapper = Wrappers.query();
         queryWrapper.le("create_time", endTime);
         return this.baseMapper.customSqlQuery(queryWrapper);
     }
 
     @Override
-    public Integer activeQuantity(Date startTime) {
+    public long activeQuantity(Date startTime) {
 
         QueryWrapper queryWrapper = Wrappers.query();
         queryWrapper.ge("last_login_date", startTime);
@@ -56,7 +56,7 @@ public class MemberStatisticsServiceImpl extends ServiceImpl<MemberStatisticsMap
     }
 
     @Override
-    public Integer newlyAdded(Date startTime, Date endTime) {
+    public long newlyAdded(Date startTime, Date endTime) {
         QueryWrapper queryWrapper = Wrappers.query();
         queryWrapper.between("create_time", startTime, endTime);
         return this.baseMapper.customSqlQuery(queryWrapper);
@@ -66,10 +66,11 @@ public class MemberStatisticsServiceImpl extends ServiceImpl<MemberStatisticsMap
     public List<MemberStatisticsData> statistics(StatisticsQueryParam statisticsQueryParam) {
 
         Date[] dates = StatisticsDateUtil.getDateArray(statisticsQueryParam);
-        Date startTime = dates[0], endTime = dates[1];
+        Date startTime = dates[0];
+        Date endTime = dates[1];
 
         //如果统计今天，则自行构造数据
-        if(statisticsQueryParam.getSearchType().equals(SearchTypeEnum.TODAY.name())){
+        if (statisticsQueryParam.getSearchType().equals(SearchTypeEnum.TODAY.name())) {
             //构建数据，然后返回集合，提供给前端展示
             MemberStatisticsData memberStatisticsData = new MemberStatisticsData();
             memberStatisticsData.setMemberCount(this.memberCount(endTime));
@@ -88,11 +89,9 @@ public class MemberStatisticsServiceImpl extends ServiceImpl<MemberStatisticsMap
     }
 
 
-
     @Override
     public List<MemberDistributionVO> distribution() {
-        List<MemberDistributionVO> memberDistributionVOS = this.baseMapper.distribution();
-        return memberDistributionVOS;
+        return this.baseMapper.distribution();
     }
 
 }
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderComplaintStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderComplaintStatisticsServiceImpl.java
index a6b24251..7830ac73 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderComplaintStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderComplaintStatisticsServiceImpl.java
@@ -22,7 +22,7 @@ import org.springframework.stereotype.Service;
 public class OrderComplaintStatisticsServiceImpl extends ServiceImpl<OrderComplaintStatisticsMapper, OrderComplaint> implements OrderComplaintStatisticsService {
 
     @Override
-    public Integer waitComplainNum() {
+    public long waitComplainNum() {
         QueryWrapper queryWrapper = Wrappers.query();
         queryWrapper.ne("complain_status", ComplaintStatusEnum.COMPLETE.name());
         queryWrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsServiceImpl.java
index 00e8545c..b39266e9 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.lili.modules.statistics.serviceimpl;
 
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.CurrencyUtil;
@@ -26,10 +27,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 订单统计业务层实现
@@ -98,10 +96,10 @@ public class OrderStatisticsServiceImpl extends ServiceImpl<OrderStatisticsMappe
     }
 
     @Override
-    public Integer orderNum(String orderStatus) {
-        LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.eq(StringUtils.isNotEmpty(orderStatus), Order::getOrderStatus, orderStatus);
-        queryWrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),
+    public long orderNum(String orderStatus) {
+        LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(CharSequenceUtil.isNotEmpty(orderStatus), Order::getOrderStatus, orderStatus);
+        queryWrapper.eq(CharSequenceUtil.equals(Objects.requireNonNull(UserContext.getCurrentUser()).getRole().name(), UserEnums.STORE.name()),
                 Order::getStoreId, UserContext.getCurrentUser().getStoreId());
         return this.count(queryWrapper);
     }
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/SeckillStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/SeckillStatisticsServiceImpl.java
index 44462abc..1982553f 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/SeckillStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/SeckillStatisticsServiceImpl.java
@@ -23,7 +23,7 @@ public class SeckillStatisticsServiceImpl extends ServiceImpl<SeckillStatisticsM
 
 
     @Override
-    public Integer getApplyNum() {
+    public long getApplyNum() {
         QueryWrapper<Seckill> queryWrapper = Wrappers.query();
         //秒杀申请时间未超过当前时间
         queryWrapper.ge("apply_end_time", cn.hutool.core.date.DateUtil.date());
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/StoreStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/StoreStatisticsServiceImpl.java
index 1fb8c7c9..cba2e6e6 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/StoreStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/StoreStatisticsServiceImpl.java
@@ -22,21 +22,21 @@ public class StoreStatisticsServiceImpl extends ServiceImpl<StoreStatisticsMappe
 
 
     @Override
-    public Integer auditNum() {
+    public long auditNum() {
         LambdaQueryWrapper<Store> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(Store::getStoreDisable, StoreStatusEnum.APPLYING.name());
         return this.count(queryWrapper);
     }
 
     @Override
-    public Integer storeNum() {
+    public long storeNum() {
         LambdaQueryWrapper<Store> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(Store::getStoreDisable, StoreStatusEnum.OPEN.name());
         return this.count(queryWrapper);
     }
 
     @Override
-    public Integer todayStoreNum() {
+    public long todayStoreNum() {
         LambdaQueryWrapper<Store> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(Store::getStoreDisable, StoreStatusEnum.OPEN.name());
         queryWrapper.ge(Store::getCreateTime, DateUtil.beginOfDay(new DateTime()));
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java
index c9e4c359..11a21162 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java
@@ -8,7 +8,6 @@ import cn.lili.common.validation.Phone;
 import cn.lili.modules.store.entity.dto.AdminStoreApplyDTO;
 import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -38,11 +37,6 @@ public class StoreDetail extends BaseIdEntity {
 
     private static final long serialVersionUID = 4949782642253898816L;
 
-    @TableId
-    @TableField
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
     @NotBlank(message = "店铺不能为空")
     @ApiModelProperty(value = "店铺id")
     private String storeId;
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreSearchParams.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreSearchParams.java
index 617332b9..d8050ec9 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreSearchParams.java
@@ -2,6 +2,7 @@ package cn.lili.modules.store.entity.vos;
 
 import cn.hutool.core.date.DateUtil;
 import cn.lili.common.utils.StringUtils;
+import cn.lili.common.vo.PageVO;
 import cn.lili.modules.store.entity.enums.StoreStatusEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +17,7 @@ import java.io.Serializable;
  * @since 2020-03-07 17:02:05
  */
 @Data
-public class StoreSearchParams implements Serializable {
+public class StoreSearchParams extends PageVO implements Serializable {
 
     private static final long serialVersionUID = 6916054310764833369L;
 
diff --git a/framework/src/main/java/cn/lili/modules/store/service/StoreService.java b/framework/src/main/java/cn/lili/modules/store/service/StoreService.java
index d25a618d..95632b0d 100644
--- a/framework/src/main/java/cn/lili/modules/store/service/StoreService.java
+++ b/framework/src/main/java/cn/lili/modules/store/service/StoreService.java
@@ -22,7 +22,6 @@ public interface StoreService extends IService<Store> {
      * 用于展示店铺列表
      *
      * @param entity
-     * @param page
      * @return
      */
     IPage<StoreVO> findByConditionPage(StoreSearchParams entity, PageVO page);
diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
index 85adaf58..0cc64d26 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
@@ -266,10 +266,11 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
         store.setStoreLogo(storeOtherInfoDTO.getStoreLogo());
         return this.updateById(store);
     }
+
     @Override
     public void updateStoreGoodsNum(String storeId) {
         //获取店铺已上架已审核通过商品数量
-        Integer goodsNum = goodsService.countStoreGoodsNum(storeId);
+        long goodsNum = goodsService.countStoreGoodsNum(storeId);
         //修改店铺商品数量
         this.update(new LambdaUpdateWrapper<Store>()
                 .set(Store::getGoodsNum, goodsNum)
@@ -287,10 +288,11 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
      * @return 店铺信息
      */
     private Store getStoreByMember() {
-        AuthUser authUser = Objects.requireNonNull(UserContext.getCurrentUser());
-        LambdaQueryWrapper<Store> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(Store::getMemberId, authUser.getId());
-        return this.getOne(lambdaQueryWrapper);
+        LambdaQueryWrapper<Store> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if (UserContext.getCurrentUser() != null) {
+            lambdaQueryWrapper.eq(Store::getMemberId, UserContext.getCurrentUser().getId());
+        }
+        return this.getOne(lambdaQueryWrapper, false);
     }
 
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/mybatis/BaseEntity.java b/framework/src/main/java/cn/lili/mybatis/BaseEntity.java
index 07cb838d..44dbf740 100644
--- a/framework/src/main/java/cn/lili/mybatis/BaseEntity.java
+++ b/framework/src/main/java/cn/lili/mybatis/BaseEntity.java
@@ -36,7 +36,6 @@ public abstract class BaseEntity implements Serializable {
 
 
     @TableId
-    @TableField
     @ApiModelProperty(value = "唯一标识", hidden = true)
     private String id;
 
diff --git a/framework/src/main/java/cn/lili/mybatis/BaseIdEntity.java b/framework/src/main/java/cn/lili/mybatis/BaseIdEntity.java
index cab38ce6..9b926c74 100644
--- a/framework/src/main/java/cn/lili/mybatis/BaseIdEntity.java
+++ b/framework/src/main/java/cn/lili/mybatis/BaseIdEntity.java
@@ -1,6 +1,5 @@
 package cn.lili.mybatis;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModelProperty;
@@ -28,7 +27,6 @@ public abstract class BaseIdEntity implements Serializable {
 
 
     @TableId
-    @TableField
     @ApiModelProperty(value = "唯一标识", hidden = true)
     private String id;
 
diff --git a/framework/src/main/java/cn/lili/mybatis/mybatisplus/MybatisPlusConfig.java b/framework/src/main/java/cn/lili/mybatis/mybatisplus/MybatisPlusConfig.java
index de13d972..87bb2f2c 100644
--- a/framework/src/main/java/cn/lili/mybatis/mybatisplus/MybatisPlusConfig.java
+++ b/framework/src/main/java/cn/lili/mybatis/mybatisplus/MybatisPlusConfig.java
@@ -1,6 +1,8 @@
 package cn.lili.mybatis.mybatisplus;
 
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,9 +17,10 @@ public class MybatisPlusConfig {
      * 分页插件，自动识别数据库类型
      */
     @Bean
-    public PaginationInterceptor paginationInterceptor() {
-
-        return new PaginationInterceptor();
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
 
         //阻断解析器，测试环境使用
 //       PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java
index 86458e63..3561f45e 100644
--- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java
@@ -100,7 +100,7 @@ public class CategoryManagerController {
 
         }
         //查询某商品分类的商品数量
-        Integer count = goodsService.getGoodsCountByCategory(id);
+        long count = goodsService.getGoodsCountByCategory(id);
         if (count > 0) {
             throw new ServiceException(ResultCode.CATEGORY_HAS_GOODS);
         }
diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
index d6b6cc8e..307306d4 100644
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
@@ -78,7 +78,7 @@ public class MemberManagerController {
 
     @ApiOperation(value = "根据条件查询会员总数")
     @GetMapping("/num")
-    public ResultMessage<Integer> getByPage(MemberSearchVO memberSearchVO) {
+    public ResultMessage<Long> getByPage(MemberSearchVO memberSearchVO) {
         return ResultUtil.data(memberService.getMemberNum(memberSearchVO));
     }
 
diff --git a/pom.xml b/pom.xml
index a81e6fcd..ba666989 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
         <images-version>1</images-version>
         <alipay-sdk-version>4.13.40.ALL</alipay-sdk-version>
         <mysql-connector-version>5.1.48</mysql-connector-version>
-        <mybatis-plus-version>3.3.1.tmp</mybatis-plus-version>
-        <Hutool-version>5.5.8</Hutool-version>
+        <mybatis-plus-version>3.4.3.4</mybatis-plus-version>
+        <Hutool-version>5.7.16</Hutool-version>
         <TinyPinyin-verions>2.0.3.RELEASE</TinyPinyin-verions>
         <jasypt-version>3.0.0</jasypt-version>
         <neetl-version>2.9.10</neetl-version>
-        <lombok-version>1.18.20</lombok-version>
+        <lombok-version>1.18.22</lombok-version>
         <aliyun-version>4.5.18</aliyun-version>
         <aliyun-sdk-oss-version>3.11.1</aliyun-sdk-oss-version>
         <aliyun-sdk-dysms-version>2.0.1</aliyun-sdk-dysms-version>