Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
head_group
xyqb-user2
Commits
6f54c95e
Commit
6f54c95e
authored
Jul 19, 2023
by
王亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix some issues.
parent
1dab4e9b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
AppletServiceImpl.java
...b/service/middleoffice/applet/impl/AppletServiceImpl.java
+5
-0
WechatServiceImpl.java
...uantgroup/xyqb/service/wechat/impl/WechatServiceImpl.java
+4
-0
No files found.
src/main/java/cn/quantgroup/xyqb/service/middleoffice/applet/impl/AppletServiceImpl.java
View file @
6f54c95e
package
cn
.
quantgroup
.
xyqb
.
service
.
middleoffice
.
applet
.
impl
;
package
cn
.
quantgroup
.
xyqb
.
service
.
middleoffice
.
applet
.
impl
;
import
cn.quantgroup.xyqb.constant.UserConstant
;
import
cn.quantgroup.xyqb.controller.middleoffice.login.ILoginModule
;
import
cn.quantgroup.xyqb.controller.middleoffice.login.ILoginModule
;
import
cn.quantgroup.xyqb.controller.middleoffice.login.LoginVo
;
import
cn.quantgroup.xyqb.controller.middleoffice.login.LoginVo
;
import
cn.quantgroup.xyqb.entity.User
;
import
cn.quantgroup.xyqb.entity.User
;
...
@@ -54,6 +55,9 @@ public class AppletServiceImpl implements IAppletService {
...
@@ -54,6 +55,9 @@ public class AppletServiceImpl implements IAppletService {
public
Long
relevance
(
AppletParamEntry
appletParamEntry
)
{
public
Long
relevance
(
AppletParamEntry
appletParamEntry
)
{
WechatUserInfo
wechatUserInfo
=
iWeChatUserRepository
.
findByOpenIdAndAppNameAndAppIdAndTenantId
(
appletParamEntry
.
getOpenId
(),
appletParamEntry
.
getAppName
(),
appletParamEntry
.
getAppId
(),
appletParamEntry
.
getTenantId
());
WechatUserInfo
wechatUserInfo
=
iWeChatUserRepository
.
findByOpenIdAndAppNameAndAppIdAndTenantId
(
appletParamEntry
.
getOpenId
(),
appletParamEntry
.
getAppName
(),
appletParamEntry
.
getAppId
(),
appletParamEntry
.
getTenantId
());
//这个接口先不考虑更换手机号的情况
//这个接口先不考虑更换手机号的情况
if
(
appletParamEntry
.
getTenantId
()==
null
){
appletParamEntry
.
setTenantId
(
UserConstant
.
defaultTenantId
);
}
wechatUserInfo
=
(
wechatUserInfo
==
null
?
new
WechatUserInfo
()
:
wechatUserInfo
);
wechatUserInfo
=
(
wechatUserInfo
==
null
?
new
WechatUserInfo
()
:
wechatUserInfo
);
wechatUserInfo
.
setNickName
(
appletParamEntry
.
getNickName
());
wechatUserInfo
.
setNickName
(
appletParamEntry
.
getNickName
());
...
@@ -69,6 +73,7 @@ public class AppletServiceImpl implements IAppletService {
...
@@ -69,6 +73,7 @@ public class AppletServiceImpl implements IAppletService {
wechatUserInfo
.
setPhoneNo
(
appletParamEntry
.
getMobile
());
wechatUserInfo
.
setPhoneNo
(
appletParamEntry
.
getMobile
());
wechatUserInfo
.
setEncryptedPhoneNo
(
appletParamEntry
.
getMobile
());
wechatUserInfo
.
setEncryptedPhoneNo
(
appletParamEntry
.
getMobile
());
wechatUserInfo
.
setUtmSource
(
appletParamEntry
.
getUtmSource
());
wechatUserInfo
.
setUtmSource
(
appletParamEntry
.
getUtmSource
());
wechatUserInfo
.
setTenantId
(
appletParamEntry
.
getTenantId
());
if
(
null
==
wechatUserInfo
.
getUserId
())
{
//只要存在userid 就说明已经在用户表里了 不考虑小程序这边换手机号了
if
(
null
==
wechatUserInfo
.
getUserId
())
{
//只要存在userid 就说明已经在用户表里了 不考虑小程序这边换手机号了
User
user
=
userService
.
findByPhoneInDb
(
appletParamEntry
.
getMobile
(),
appletParamEntry
.
getTenantId
());
User
user
=
userService
.
findByPhoneInDb
(
appletParamEntry
.
getMobile
(),
appletParamEntry
.
getTenantId
());
//如果不存在就去注册一下
//如果不存在就去注册一下
...
...
src/main/java/cn/quantgroup/xyqb/service/wechat/impl/WechatServiceImpl.java
View file @
6f54c95e
...
@@ -140,6 +140,10 @@ public class WechatServiceImpl implements IWechatService {
...
@@ -140,6 +140,10 @@ public class WechatServiceImpl implements IWechatService {
@Override
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
WechatUserInfo
saveWechatUserInfo
(
WechatUserInfo
userInfo
)
{
public
WechatUserInfo
saveWechatUserInfo
(
WechatUserInfo
userInfo
)
{
if
(
userInfo
.
getTenantId
()==
null
){
userInfo
.
setTenantId
(
UserConstant
.
defaultTenantId
);
}
log
.
info
(
"微信信息保存开始:{}"
,
JSON
.
toJSONString
(
userInfo
));
log
.
info
(
"微信信息保存开始:{}"
,
JSON
.
toJSONString
(
userInfo
));
if
(
Objects
.
isNull
(
userInfo
)
||
Objects
.
isNull
(
userInfo
.
getOpenId
()))
{
if
(
Objects
.
isNull
(
userInfo
)
||
Objects
.
isNull
(
userInfo
.
getOpenId
()))
{
return
null
;
return
null
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment