From cac27832017a377cd086e10d33f7f4c9b3240bcd Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Wed, 22 Aug 2018 10:46:00 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E7=A4=BA][=E4=BF=AE=E5=A4=8D]:=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMerchantBUserController.java | 67 ++++++++++++------- .../com/simple/enums/EnumMerchantStatus.java | 36 ++++++++++ .../java/com/simple/enums/EnumTJDCode.java | 35 ++++++++++ 3 files changed, 113 insertions(+), 25 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/enums/EnumMerchantStatus.java create mode 100644 mallinkService/src/main/java/com/simple/enums/EnumTJDCode.java diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java index d57d13ff9..9dc38f783 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java +++ b/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.WxMerchant; import com.simple.domain.po.WxMerchantBUser; +import com.simple.enums.EnumMerchantStatus; import com.simple.service.WxMallService; import com.simple.service.WxMerchantBUserService; import com.simple.service.WxMerchantService; @@ -114,38 +115,54 @@ public class WxMerchantBUserController extends BaseController user.setPhone(phone); Date currentDate = new Date(); + WxMerchantBUser user1 = null; 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); - 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 { - 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 diff --git a/mallinkService/src/main/java/com/simple/enums/EnumMerchantStatus.java b/mallinkService/src/main/java/com/simple/enums/EnumMerchantStatus.java new file mode 100644 index 000000000..66893e7eb --- /dev/null +++ b/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; + } +} diff --git a/mallinkService/src/main/java/com/simple/enums/EnumTJDCode.java b/mallinkService/src/main/java/com/simple/enums/EnumTJDCode.java new file mode 100644 index 000000000..427bea0b5 --- /dev/null +++ b/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; + } +}