Просмотр исходного кода

[B端用户密码提示][修复]:密码提示问题修复

release_toaliyun_real
Stormeye.Wu 7 лет назад
Родитель
Сommit
cac2783201
3 измененных файлов: 113 добавлений и 25 удалений
  1. +42
    -25
      mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java
  2. +36
    -0
      mallinkService/src/main/java/com/simple/enums/EnumMerchantStatus.java
  3. +35
    -0
      mallinkService/src/main/java/com/simple/enums/EnumTJDCode.java

+ 42
- 25
mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java Просмотреть файл

@@ -8,6 +8,7 @@ import com.simple.common.ResultData;
import com.simple.domain.po.WxMall; import com.simple.domain.po.WxMall;
import com.simple.domain.po.WxMerchant; import com.simple.domain.po.WxMerchant;
import com.simple.domain.po.WxMerchantBUser; import com.simple.domain.po.WxMerchantBUser;
import com.simple.enums.EnumMerchantStatus;
import com.simple.service.WxMallService; import com.simple.service.WxMallService;
import com.simple.service.WxMerchantBUserService; import com.simple.service.WxMerchantBUserService;
import com.simple.service.WxMerchantService; import com.simple.service.WxMerchantService;
@@ -114,38 +115,54 @@ public class WxMerchantBUserController extends BaseController
user.setPhone(phone); user.setPhone(phone);


Date currentDate = new Date(); Date currentDate = new Date();
WxMerchantBUser user1 = null;


try { try {
WxMerchantBUser user1 = wxMerchantBUserService.getBUserByAppId(user);
if (user1 != null) {
// check merchant 状态
WxMerchant merchant = wxMerchantService.getById(user1.getMerchantId());
if (merchant == null) {
logger.error(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage( ) + ": " + user1.getMerchantId());
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND);
}
if (merchant.getStatus() == 0) { // 0:不可用
logger.error(ErrorCode.MERCHANT_INFO_NOT_VALID.getMessage( ) + ": " + user1.getMerchantId());
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID);
}
// check password
if (user1.getBUserPwd().equalsIgnoreCase(password)) {
user1.createToken(currentDate);
token = user1.getToken();
user1 = wxMerchantBUserService.getBUserByAppId(user);
} catch (Exception e) {
logger.error(e.getMessage());
logger.error("B端用户不存在, phone: " + phone);
return new ResultData(ErrorCode.USER_IS_EMPTY);
}

if (user1 != null) {
// check merchant 状态
WxMerchant merchant = null;
try {
merchant = wxMerchantService.getById(user1.getMerchantId());
} catch (Exception e) {
logger.error(ErrorCode.DB_FAIL.getMessage( ) + ": " + user1.getMerchantId());
return new ResultData(ErrorCode.DB_FAIL);
}
if (merchant == null) {
logger.error(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage( ) + ": " + user1.getMerchantId());
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND);
}
if (merchant.getStatus() == EnumMerchantStatus.NOT_VALID.getCode()) {
logger.error(ErrorCode.MERCHANT_INFO_NOT_VALID.getMessage( ) + ": " + user1.getMerchantId());
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID);
}
// check password
if (user1.getBUserPwd().equalsIgnoreCase(password)) {
user1.createToken(currentDate);
token = user1.getToken();
try {
wxMerchantBUserService.saveOrUpdate(user1); wxMerchantBUserService.saveOrUpdate(user1);
resultMap.put("token", token);
} else {
return new ResultData(ErrorCode.PASSWORD_ERROR);
} catch (Exception e) {
logger.error("B端用户更新用户信息失败, e:" + e.getMessage());
return new ResultData(ErrorCode.DB_FAIL.getCode(), "数据库保存失败,e:" + e.getMessage());
} }

resultMap.put("token", token);
return new ResultData(resultMap);
} else { } else {
logger.error("B端用户不存在, phone: " + phone);
return new ResultData(ErrorCode.USER_IS_EMPTY);
return new ResultData(ErrorCode.PASSWORD_ERROR);
} }
} catch (Exception e) {
logger.error(e.getMessage());
return new ResultData(ErrorCode.DB_FAIL.getCode(), "B端用户数据库更新出错", resultMap);
} else {
logger.error("B端用户不存在, phone: " + phone);
return new ResultData(ErrorCode.USER_IS_EMPTY);
} }
return new ResultData(resultMap);
} }


@AuthIgnore @AuthIgnore


+ 36
- 0
mallinkService/src/main/java/com/simple/enums/EnumMerchantStatus.java Просмотреть файл

@@ -0,0 +1,36 @@
package com.simple.enums;

/**
* Created by Stormeye on 2018/08/09.
*/
public enum EnumMerchantStatus {

NOT_VALID(0, "已停用"),
VALID(1, "可用"),
;

public static EnumMerchantStatus getEnum(Integer code) {
for (EnumMerchantStatus value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumMerchantStatus(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 35
- 0
mallinkService/src/main/java/com/simple/enums/EnumTJDCode.java Просмотреть файл

@@ -0,0 +1,35 @@
package com.simple.enums;

/**
* Created by Stormeye on 2018/08/09.
*/
public enum EnumTJDCode {

SUCCESS(0, "T"),
;

public static EnumTJDCode getEnum(Integer code) {
for (EnumTJDCode value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumTJDCode(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

Загрузка…
Отмена
Сохранить