Merge branch 'refs/heads/dev' into test

share-system/src/main/java/share/system/service/impl/SConsumerServiceImpl.java

@@ -26,18 +26,14 @@ import share.system.domain.*;
 import share.system.domain.vo.FrontTokenComponent;
 import share.system.domain.vo.MemberConfigVo;
 import share.system.domain.vo.SConsumerVo;
-import share.system.mapper.ConsumerMemberMapper;
 import share.system.mapper.SConsumerMapper;
 import share.system.mapper.SStoreConsumerMapper;
 import share.system.request.RegisterThirdSConsumerRequest;
 import share.system.service.*;
 
 import java.math.BigDecimal;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -200,6 +196,9 @@ public class SConsumerServiceImpl extends ServiceImpl<SConsumerMapper, SConsumer
     @Override
     public SConsumerVo getSConsumer() {
         SConsumer currentUser = getInfo();
+        if (ObjectUtil.isNull(currentUser)) {
+            throw new BaseException("您的登录已过期，请先登录");
+        }
         SConsumerCoupon sConsumerCoupon = new SConsumerCoupon();
         sConsumerCoupon.setConsumerId(currentUser.getId());
         sConsumerCoupon.setUseStatus(ConsumerCouponUseStatusEnum.WAIT_USE.getCode());
@@ -265,11 +264,6 @@ public class SConsumerServiceImpl extends ServiceImpl<SConsumerMapper, SConsumer
         } else {
             vo.setIsManage(true);
         }
-
-
-        if (ObjectUtil.isNull(currentUser)) {
-            throw new BaseException("您的登录已过期，请先登录");
-        }
         return vo;
     }