|
|
@@ -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 |
|
|
|