机构资质升级暂不强制要求营业执照

src/main/java/com/caimei365/user/service/impl/SellerServiceImpl.java

@@ -100,7 +100,7 @@ public class SellerServiceImpl implements SellerService {
         } else if (2 == type) {
             if (null != groupServiceId && groupServiceId > 0) {
                 PageHelper.startPage(pageNum, pageSize);
-                clubList = sellerMapper.findClubs(groupServiceId, status, name, userIdentity, 1,  startTime, endTime, activeState, customerValue, null);
+                clubList = sellerMapper.findClubs(groupServiceId, status, name, userIdentity, 1, startTime, endTime, activeState, customerValue, null);
             } else {
                 Integer leaderId = sellerMapper.findLeaderIdByServiceId(serviceProviderId);
                 Integer managerId = sellerMapper.findmanagerIdByServiceId(serviceProviderId);
@@ -147,13 +147,13 @@ public class SellerServiceImpl implements SellerService {
     @Override
     public ResponseJson<PaginationVo<ClubVo>> getLivelyClubList(Integer serviceProviderId, Integer status, Integer type, String name, Integer userIdentity, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<ClubVo> clubList = sellerMapper.findClubs(serviceProviderId, status, name, userIdentity, type, null, null, null, null,null);
+        List<ClubVo> clubList = sellerMapper.findClubs(serviceProviderId, status, name, userIdentity, type, null, null, null, null, null);
         if (null != clubList) {
             for (ClubVo club : clubList) {
                 // 添加编号
                 String newClubId = club.getClubId().toString();
                 if (newClubId.length() <= 6) {
-                    for (int i = 0; i <= 6 - newClubId.length(); i ++ ){
+                    for (int i = 0; i <= 6 - newClubId.length(); i++) {
                         newClubId = "0" + newClubId;
                     }
                 }
@@ -204,7 +204,7 @@ public class SellerServiceImpl implements SellerService {
         PageHelper.startPage(pageNum, pageSize);
         List<RemarksVo> clubAllRemark = sellerMapper.getClubAllRemark(clubId, search);
 
-        clubAllRemark.forEach( remark -> {
+        clubAllRemark.forEach(remark -> {
             // 标签集合
             List<Map<String, String>> labelMap = new ArrayList<>();
             Map<String, String> map;
@@ -287,6 +287,9 @@ public class SellerServiceImpl implements SellerService {
                 }
             }
             total = activeNumber + unActiveNumber;
+            if (0 == total) {
+                return ResponseJson.success(null);
+            }
             // 机构活跃
             PortraitMap portrait = new PortraitMap();
             String per = MathUtil.mul(MathUtil.div(activeNumber, total, 2), 100).toString();
@@ -352,7 +355,7 @@ public class SellerServiceImpl implements SellerService {
         if (null == seller || !Md5Util.md5(password).equals(seller.getPassword())) {
             return ResponseJson.error("账号密码不正确", null);
         }
-        if (null == seller || 90!=seller.getServiceStatus()) {
+        if (null == seller || 90 != seller.getServiceStatus()) {
             return ResponseJson.error("登录账号已下线，请联系客服", null);
         }
         // 生成token
@@ -406,7 +409,7 @@ public class SellerServiceImpl implements SellerService {
                     redisService.remove("code:" + mobile);
                     // 根据手机号获取协销
                     UserLoginVo seller = sellerMapper.getLoginSellerByMobile(mobile);
-                    if (null == seller || 90!=seller.getServiceStatus()) {
+                    if (null == seller || 90 != seller.getServiceStatus()) {
                         return ResponseJson.error("登录账号已下线，请联系客服", null);
                     }
                     // 生成token

src/main/java/com/caimei365/user/utils/JwtUtil.java

@@ -27,9 +27,9 @@ import java.util.Map;
  */
 public class JwtUtil {
     /**
-     * 设置过期时间: 2*60分钟
+     * 设置过期时间: 5*60分钟
      */
-    private static final long EXPIRE_TIME = 2 * 60 * 60 * 1000;
+    private static final long EXPIRE_TIME = 5 * 60 * 60 * 1000;
     /**
      * 服务端的私钥secret,在任何场景都不应该流露出去
      */