|
@@ -116,10 +116,6 @@ public class LoginServiceImpl implements LoginService {
|
|
}
|
|
}
|
|
// 如果前端传入unionId,则存入返回前端
|
|
// 如果前端传入unionId,则存入返回前端
|
|
baseUser.setUnionId(unionId);
|
|
baseUser.setUnionId(unionId);
|
|
-
|
|
|
|
- Integer clubId = messageCenterMapper.clubIdCule(baseUser.getUserId());
|
|
|
|
- Integer savedCount = null;
|
|
|
|
-
|
|
|
|
// 比对密码
|
|
// 比对密码
|
|
String md5Password = Md5Util.md5(password);
|
|
String md5Password = Md5Util.md5(password);
|
|
String dbPassword = baseUser.getPassword();
|
|
String dbPassword = baseUser.getPassword();
|
|
@@ -196,8 +192,6 @@ public class LoginServiceImpl implements LoginService {
|
|
// 协销授权登录
|
|
// 协销授权登录
|
|
UserLoginVo seller = loginMapper.getServiceProviderUserByOpenId(openId);
|
|
UserLoginVo seller = loginMapper.getServiceProviderUserByOpenId(openId);
|
|
Integer userID = messageCenterMapper.userId(openId);
|
|
Integer userID = messageCenterMapper.userId(openId);
|
|
- Integer clubId = messageCenterMapper.clubIdCule(userID);
|
|
|
|
- Integer savedCount = null;
|
|
|
|
if (userID != null) {
|
|
if (userID != null) {
|
|
Integer shopID = messageCenterMapper.shopID(userID);
|
|
Integer shopID = messageCenterMapper.shopID(userID);
|
|
log.info(">>>>>" + shopID);
|
|
log.info(">>>>>" + shopID);
|
|
@@ -225,7 +219,6 @@ public class LoginServiceImpl implements LoginService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public ResponseJson<Map<String, Object>> ClubMessageCount(Integer messageType, Integer commonId) {
|
|
public ResponseJson<Map<String, Object>> ClubMessageCount(Integer messageType, Integer commonId) {
|
|
-
|
|
|
|
Integer count = messageCenterMapper.Count(1, commonId);
|
|
Integer count = messageCenterMapper.Count(1, commonId);
|
|
Integer tradeCount = messageCenterMapper.MessageCount(1, 1, commonId);
|
|
Integer tradeCount = messageCenterMapper.MessageCount(1, 1, commonId);
|
|
Integer accountCount = messageCenterMapper.MessageCount(1, 2, commonId);
|
|
Integer accountCount = messageCenterMapper.MessageCount(1, 2, commonId);
|