Browse Source

内容库V1.0.0

kaick 1 năm trước cách đây
mục cha
commit
31d1e12427

+ 8 - 1
src/main/java/com/caimei365/user/service/impl/SellerServiceImpl.java

@@ -348,8 +348,12 @@ public class SellerServiceImpl implements SellerService {
             return ResponseJson.error("请输入微信unionId", null);
             return ResponseJson.error("请输入微信unionId", null);
         }
         }
         UserLoginVo seller = sellerMapper.getLoginSellerByMobile(mobile);
         UserLoginVo seller = sellerMapper.getLoginSellerByMobile(mobile);
+
         if (null == seller || !Md5Util.md5(password).equals(seller.getPassword())) {
         if (null == seller || !Md5Util.md5(password).equals(seller.getPassword())) {
-            return ResponseJson.error("密码和账户名不匹配", null);
+            return ResponseJson.error("账号密码不正确", null);
+        }
+        if (null == seller || 90!=seller.getServiceStatus()) {
+            return ResponseJson.error("登录账号已下线,请联系客服", null);
         }
         }
         // 生成token
         // 生成token
         String token = JwtUtil.createToken(seller.getUserId());
         String token = JwtUtil.createToken(seller.getUserId());
@@ -402,6 +406,9 @@ public class SellerServiceImpl implements SellerService {
                     redisService.remove("code:" + mobile);
                     redisService.remove("code:" + mobile);
                     // 根据手机号获取协销
                     // 根据手机号获取协销
                     UserLoginVo seller = sellerMapper.getLoginSellerByMobile(mobile);
                     UserLoginVo seller = sellerMapper.getLoginSellerByMobile(mobile);
+                    if (null == seller || 90!=seller.getServiceStatus()) {
+                        return ResponseJson.error("登录账号已下线,请联系客服", null);
+                    }
                     // 生成token
                     // 生成token
                     String token = JwtUtil.createToken(seller.getUserId());
                     String token = JwtUtil.createToken(seller.getUserId());
                     // 为了过期续签,将token存入redis,并设置超时时间
                     // 为了过期续签,将token存入redis,并设置超时时间

+ 0 - 1
src/main/resources/mapper/SellerMapper.xml

@@ -18,7 +18,6 @@
         from user u
         from user u
         where u.mobile = #{mobile}
         where u.mobile = #{mobile}
           and u.userIdentity = 1
           and u.userIdentity = 1
-          and u.validFlag = 1
     </select>
     </select>
     <update id="updateServiceProviderByUserId">
     <update id="updateServiceProviderByUserId">
         update serviceprovider
         update serviceprovider