loser/dongfeng-pay
1
1
Fork 0
mirror of https://github.com/kongyuebin1/dongfeng-pay.git synced 2025-09-18 06:39:12 +08:00
Code Issues Projects Releases Wiki Activity

修改传奇充值商户的账户显示

Browse Source
This commit is contained in:
kongyuebin
2021-04-30 15:55:02 +08:00
parent 5ee1450a21
commit c48d2f3e2c
15 changed files with 197 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
legend/service/accountService.go
View File

@@ -1,15 +1,18 @@
package service
import "legend/models/fast"
import (
"legend/models/fast"
)
type AccountService struct {
BaseService
}
func (c *AccountService) GetAccountInfo(userName string) *fast.RpAccount {
userInfo := fast.GetUserInfoByUserName(userName)
func (c *AccountService) GetAccountInfo(userName string) *fast.AccountInfo {
accountInfo := fast.GetAccontInfo(userInfo.UserNo)
merchantInfo := fast.GetMerchantInfoByUserName(userName)
accountInfo := fast.GetAccountInfo(merchantInfo.MerchantUid)
return accountInfo
}

19
legend/service/loginService.go
View File

@@ -19,24 +19,25 @@ type LoginJsonData struct {
}
func (c *LoginService) Login(userName, password string) *LoginJsonData {
loginJsonData := new(LoginJsonData)
loginJsonData.Code = 200
userInfo := fast.GetUserInfoByUserName(userName)
userInfo := fast.GetMerchantInfoByUserName(userName)
logs.Info("登录账户信息：", fmt.Sprintf("%+v", userInfo))
if nil == userInfo || userInfo.Mobile == "" {
if nil == userInfo || userInfo.LoginAccount == "" {
logs.Error("用户不存在，账户：", userName)
loginJsonData.Code = 404
loginJsonData.Msg = "用户不存在"
} else {
if userInfo.Status == common.UNACTIVE {
if strings.ToLower(userInfo.Status) == strings.ToLower(common.UNACTIVE) {
logs.Warn("账号异常，请联系管理员，账号：", userName)
loginJsonData.Code = 503
loginJsonData.Msg = "账户已经被冻结"
} else {
md5Password := utils.EncodeMd5(password)
logs.Info("账户密码md5后：", md5Password, "；数据库保存的为：", userInfo.Password)
if strings.ToLower(utils.EncodeMd5(password)) != strings.ToLower(userInfo.Password) {
logs.Info("账户密码md5后：", md5Password, "；数据库保存的为：", userInfo.LoginPassword)
if strings.ToLower(utils.EncodeMd5(password)) != strings.ToLower(userInfo.LoginPassword) {
logs.Error("密码错误，账户:", userName)
loginJsonData.Code = -1
loginJsonData.Msg = "密码错误"
@@ -57,15 +58,15 @@ func (c *LoginService) PersonPassword(newPassword, oldPassword, repeatPassword,
logoutJsonData := new(LoginJsonData)
logoutJsonData.Code = -1
userInfo := fast.GetUserInfoByUserName(userName)
if userInfo.Password != utils.EncodeMd5(oldPassword) {
userInfo := fast.GetMerchantInfoByUserName(userName)
if userInfo.LoginPassword != utils.EncodeMd5(oldPassword) {
logoutJsonData.Msg = "旧密码输入不正确"
} else if newPassword != repeatPassword {
logoutJsonData.Msg = "2次密码不一致"
} else {
passwordMd5 := utils.EncodeMd5(newPassword)
userInfo.Password = passwordMd5
if !fast.UpdateUserInfo(userInfo) {
userInfo.LoginPassword = passwordMd5
if !fast.UpdateMerchantInfo(userInfo) {
logoutJsonData.Msg = "密码更新失败"
} else {

20
legend/service/merchantService.go
View File

@@ -9,11 +9,11 @@ type MerchantService struct {
BaseService
}
func (c *MerchantService) GetMerchantBankInfo(mobile string) (*fast.RpUserInfo, *fast.RpUserBankAccount, *fast.RpUserPayConfig) {
func (c *MerchantService) GetMerchantBankInfo(mobile string) (*fast.MerchantInfo, *fast.RpUserBankAccount, *fast.RpUserPayConfig) {
userInfo := fast.GetUserInfoByUserName(mobile)
bankInfo := fast.GetBankInfoByUserNo(userInfo.UserNo)
userPayConfig := fast.GetUserPayConfigByUserNo(userInfo.UserNo)
userInfo := fast.GetMerchantInfoByUserName(mobile)
bankInfo := fast.GetBankInfoByUserNo(userInfo.LoginAccount)
userPayConfig := fast.GetUserPayConfigByUserNo(userInfo.LoginAccount)
return userInfo, bankInfo, userPayConfig
}
@@ -25,13 +25,13 @@ func (c *MerchantService) UserPayConfig(userName string) map[string]string {
merchantMapData := make(map[string]string)
userInfo := fast.GetUserInfoByUserName(userName)
userInfo := fast.GetMerchantInfoByUserName(userName)
if userInfo == nil || userInfo.Mobile == "" {
if userInfo == nil || userInfo.LoginAccount == "" {
return merchantMapData
}
userNo := userInfo.UserNo
userNo := userInfo.LoginAccount
userPayConfig := fast.GetUserPayConfigByUserNo(userNo)
if nil == userPayConfig || userPayConfig.UserNo == "" {
@@ -44,9 +44,9 @@ func (c *MerchantService) UserPayConfig(userName string) map[string]string {
/**
** 获取商户信息
*/
func (c *MerchantService) MerchantInfo(mobile string) *fast.RpUserInfo {
userInfo := fast.GetUserInfoByUserName(mobile)
if nil == userInfo || userInfo.UserNo == "" {
func (c *MerchantService) MerchantInfo(mobile string) *fast.MerchantInfo {
userInfo := fast.GetMerchantInfoByUserName(mobile)
if nil == userInfo || userInfo.LoginAccount == "" {
logs.Error("获取用户信息失败")
}