Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
向汉
/
uc-engine
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Commit
e6a0d117
...
e6a0d117ced9295ad3a3dcc5c878cea47244a9ea
authored
2022-03-22 22:46:30 +0800
by
xianghan
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
1.优化
1 parent
48409765
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
141 additions
and
96 deletions
member-service-impl/src/main/java/com/topdraw/business/module/member/address/rest/MemberAddressController.java
member-service-impl/src/main/java/com/topdraw/business/module/member/domain/MemberBuilder.java
member-service-impl/src/main/java/com/topdraw/business/module/member/profile/rest/MemberProfileController.java
member-service-impl/src/main/java/com/topdraw/business/module/member/profile/service/impl/MemberProfileServiceImpl.java
member-service-impl/src/main/java/com/topdraw/business/module/member/relatedinfo/rest/MemberRelatedInfoController.java
member-service-impl/src/main/java/com/topdraw/business/module/member/rest/MemberController.java
member-service-impl/src/main/java/com/topdraw/business/module/member/viphistory/rest/MemberVipHistoryController.java
member-service-impl/src/main/java/com/topdraw/business/module/member/viphistory/service/impl/MemberVipHistoryServiceImpl.java
member-service-impl/src/main/java/com/topdraw/business/module/user/iptv/service/UserTvService.java
member-service-impl/src/main/java/com/topdraw/business/module/user/iptv/service/impl/UserTvServiceImpl.java
member-service-impl/src/main/java/com/topdraw/business/module/user/weixin/service/UserWeixinService.java
member-service-impl/src/main/java/com/topdraw/business/module/user/weixin/service/impl/UserWeixinServiceImpl.java
member-service-impl/src/main/java/com/topdraw/business/process/rest/UserOperationController.java
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/member/MemberOperationServiceImpl.java
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/member/MemberProfileOperationServiceImpl.java
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/member/MemberRelatedInfoOperationServiceImpl.java
member-service-impl/src/main/java/com/topdraw/business/module/member/address/rest/MemberAddressController.java
View file @
e6a0d11
...
...
@@ -20,7 +20,7 @@ import io.swagger.annotations.*;
*/
@Api
(
tags
=
"会员地址管理"
)
@RestController
@RequestMapping
(
"/ucEngine/memberAddress"
)
@RequestMapping
(
"/ucEngine/
api/
memberAddress"
)
@CrossOrigin
@Slf4j
public
class
MemberAddressController
{
...
...
member-service-impl/src/main/java/com/topdraw/business/module/member/domain/MemberBuilder.java
View file @
e6a0d11
package
com
.
topdraw
.
business
.
module
.
member
.
domain
;
import
com.topdraw.business.module.member.service.dto.MemberDTO
;
import
com.topdraw.util.IdWorker
;
import
org.apache.commons.lang3.StringUtils
;
...
...
member-service-impl/src/main/java/com/topdraw/business/module/member/profile/rest/MemberProfileController.java
View file @
e6a0d11
...
...
@@ -20,7 +20,7 @@ import io.swagger.annotations.*;
*/
@Api
(
tags
=
"会员属性管理"
)
@RestController
@RequestMapping
(
"/ucEngine/memberProfile"
)
@RequestMapping
(
"/ucEngine/
api/
memberProfile"
)
@CrossOrigin
@Slf4j
public
class
MemberProfileController
{
...
...
member-service-impl/src/main/java/com/topdraw/business/module/member/profile/service/impl/MemberProfileServiceImpl.java
View file @
e6a0d11
...
...
@@ -2,6 +2,7 @@ package com.topdraw.business.module.member.profile.service.impl;
import
com.topdraw.aspect.AsyncMqSend
;
import
com.topdraw.business.module.member.domain.Member
;
import
com.topdraw.business.module.member.domain.MemberBuilder
;
import
com.topdraw.business.module.member.profile.domain.MemberProfile
;
import
com.topdraw.business.module.member.profile.domain.MemberProfileBuilder
;
import
com.topdraw.business.module.member.service.MemberService
;
...
...
member-service-impl/src/main/java/com/topdraw/business/module/member/relatedinfo/rest/MemberRelatedInfoController.java
View file @
e6a0d11
...
...
@@ -19,7 +19,7 @@ import io.swagger.annotations.*;
*/
@Api
(
tags
=
"相关人员管理"
)
@RestController
@RequestMapping
(
"/ucEngine/memberRelatedInfo"
)
@RequestMapping
(
"/ucEngine/
api/
memberRelatedInfo"
)
@CrossOrigin
@Slf4j
public
class
MemberRelatedInfoController
{
...
...
member-service-impl/src/main/java/com/topdraw/business/module/member/rest/MemberController.java
View file @
e6a0d11
...
...
@@ -26,8 +26,7 @@ import java.util.Objects;
*/
@Api
(
tags
=
"会员管理"
)
@RestController
//@RequestMapping("/ucEngine/api/member")
@RequestMapping
(
"/ucEngine/member"
)
@RequestMapping
(
"/ucEngine/api/member"
)
@CrossOrigin
@Slf4j
public
class
MemberController
{
...
...
member-service-impl/src/main/java/com/topdraw/business/module/member/viphistory/rest/MemberVipHistoryController.java
View file @
e6a0d11
...
...
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
*/
@Api
(
tags
=
"会员vip历史管理"
)
@RestController
@RequestMapping
(
"/ucEngine/memberVipHistory"
)
@RequestMapping
(
"/ucEngine/
api/
memberVipHistory"
)
public
class
MemberVipHistoryController
{
@Autowired
...
...
member-service-impl/src/main/java/com/topdraw/business/module/member/viphistory/service/impl/MemberVipHistoryServiceImpl.java
View file @
e6a0d11
package
com
.
topdraw
.
business
.
module
.
member
.
viphistory
.
service
.
impl
;
import
com.topdraw.aspect.AsyncMqSend
;
import
com.topdraw.business.module.member.domain.Member
;
import
com.topdraw.business.module.member.service.MemberService
;
import
com.topdraw.business.module.member.service.dto.MemberDTO
;
...
...
@@ -49,6 +50,7 @@ public class MemberVipHistoryServiceImpl implements MemberVipHistoryService {
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
@AsyncMqSend
public
void
create
(
MemberVipHistory
resources
)
{
log
.
info
(
"MemberVipHistoryServiceImpl ==>> MemberVipHistoryServiceImpl ==>> param ==>> [{}]"
,
resources
);
this
.
checkMember
(
resources
);
...
...
member-service-impl/src/main/java/com/topdraw/business/module/user/iptv/service/UserTvService.java
View file @
e6a0d11
...
...
@@ -34,7 +34,7 @@ public interface UserTvService {
*
* @param resources
*/
void
unbindPriorityMemberCode
(
UserTv
resources
);
UserTvDTO
unbindPriorityMemberCode
(
UserTv
resources
);
/**
*
...
...
member-service-impl/src/main/java/com/topdraw/business/module/user/iptv/service/impl/UserTvServiceImpl.java
View file @
e6a0d11
...
...
@@ -104,20 +104,21 @@ public class UserTvServiceImpl implements UserTvService {
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
unbindPriorityMemberCode
(
UserTv
resources
)
{
UserTv
UserTv
=
this
.
userTvRepository
.
findById
(
resources
.
getId
()).
orElseGet
(
UserTv:
:
new
);
ValidationUtil
.
isNull
(
UserTv
.
getId
(),
"UserTv"
,
"id"
,
resources
.
getId
());
UserTv
.
copy
(
resources
);
this
.
userTvRepository
.
save
(
UserTv
);
public
UserTvDTO
unbindPriorityMemberCode
(
UserTv
resources
)
{
UserTv
userTv
=
this
.
userTvRepository
.
findById
(
resources
.
getId
()).
orElseGet
(
UserTv:
:
new
);
ValidationUtil
.
isNull
(
userTv
.
getId
(),
"UserTv"
,
"id"
,
resources
.
getId
());
userTv
.
copy
(
resources
);
UserTv
_userTv
=
this
.
userTvRepository
.
save
(
userTv
);
return
this
.
userTvMapper
.
toDto
(
_userTv
);
}
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
delete
(
Long
id
)
{
Assert
.
notNull
(
id
,
"The given id must not be null!"
);
UserTv
U
serTv
=
this
.
userTvRepository
.
findById
(
id
).
orElseThrow
(
UserTv
u
serTv
=
this
.
userTvRepository
.
findById
(
id
).
orElseThrow
(
()
->
new
EmptyResultDataAccessException
(
String
.
format
(
"No %s entity "
+
"with id %s "
+
"exists!"
,
UserTv
.
class
,
id
),
1
));
this
.
userTvRepository
.
delete
(
U
serTv
);
this
.
userTvRepository
.
delete
(
u
serTv
);
}
@Override
...
...
member-service-impl/src/main/java/com/topdraw/business/module/user/weixin/service/UserWeixinService.java
View file @
e6a0d11
...
...
@@ -21,13 +21,13 @@ public interface UserWeixinService {
* @param resources
* @return
*/
UserWeixin
create
(
UserWeixin
resources
);
UserWeixin
DTO
create
(
UserWeixin
resources
);
/**
*
* @param resources
*/
void
update
(
UserWeixin
resources
);
UserWeixinDTO
update
(
UserWeixin
resources
);
/**
*
...
...
member-service-impl/src/main/java/com/topdraw/business/module/user/weixin/service/impl/UserWeixinServiceImpl.java
View file @
e6a0d11
...
...
@@ -37,19 +37,20 @@ public class UserWeixinServiceImpl implements UserWeixinService {
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
UserWeixin
create
(
UserWeixin
resources
)
{
public
UserWeixin
DTO
create
(
UserWeixin
resources
)
{
UserWeixin
build
=
UserWeixinBuilder
.
build
(
resources
);
this
.
userWeixinRepository
.
save
(
build
);
return
resources
;
UserWeixin
userWeixin
=
this
.
userWeixinRepository
.
save
(
build
);
return
this
.
userWeixinMapper
.
toDto
(
userWeixin
)
;
}
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
update
(
UserWeixin
resources
)
{
UserWeixin
UserWeixin
=
this
.
userWeixinRepository
.
findById
(
resources
.
getId
()).
orElseGet
(
UserWeixin:
:
new
);
ValidationUtil
.
isNull
(
UserWeixin
.
getId
(),
"UserWeixin"
,
"id"
,
resources
.
getId
());
UserWeixin
.
copy
(
resources
);
this
.
userWeixinRepository
.
save
(
UserWeixin
);
public
UserWeixinDTO
update
(
UserWeixin
resources
)
{
UserWeixin
userWeixin
=
this
.
userWeixinRepository
.
findById
(
resources
.
getId
()).
orElseGet
(
UserWeixin:
:
new
);
ValidationUtil
.
isNull
(
userWeixin
.
getId
(),
"UserWeixin"
,
"id"
,
resources
.
getId
());
userWeixin
.
copy
(
resources
);
UserWeixin
_userWeixin
=
this
.
userWeixinRepository
.
save
(
userWeixin
);
return
this
.
userWeixinMapper
.
toDto
(
_userWeixin
);
}
@Override
...
...
member-service-impl/src/main/java/com/topdraw/business/process/rest/UserOperationController.java
View file @
e6a0d11
...
...
@@ -264,7 +264,6 @@ public class UserOperationController {
String
nicknameEncode
=
Base64Util
.
encode
(
nicknameDecode
);
memberDTO
.
setNickname
(
nicknameEncode
);
}
if
(
StringUtils
.
isNotBlank
(
headimgurl
))
{
String
headimgurlDecode
=
URLDecoder
.
decode
(
headimgurl
,
"UTF-8"
);
String
imageEncode
=
Base64Util
.
encode
(
headimgurlDecode
);
...
...
@@ -272,7 +271,7 @@ public class UserOperationController {
memberDTO
.
setAvatarUrl
(
StringUtils
.
isNotBlank
(
image
)
==
true
?
image:
headimgurlDecode
);
}
}
catch
(
Exception
e
)
{
log
.
info
(
"
headimgurl , nickname ===>> encode error!
"
);
log
.
info
(
"
头像解析失败!!!
"
);
e
.
printStackTrace
();
}
...
...
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
View file @
e6a0d11
...
...
@@ -94,6 +94,18 @@ public class UserOperationServiceImpl implements UserOperationService {
@Value
(
"${uc.app.appletAppid:wxc57d42de3d351cec}"
)
private
String
appletAppid
;
@AsyncMqSend
public
void
asyncWeixinMemberAndUserWeixin4Iptv
(
MemberDTO
memberDTO
,
UserWeixinDTO
weixinDTO
)
{}
@AsyncMqSend
public
void
asyncMemberAndUserTv4Iptv
(
MemberDTO
memberDTO
,
UserTvDTO
userTvDTO
)
{}
@AsyncMqSend
public
void
asyncWeixin
(
UserWeixinDTO
weixinDTO
)
{}
@AsyncMqSend
public
void
asyncUserTv
(
UserTvDTO
userTvDTO
)
{}
@AsyncMqSend
public
void
asyncMember
(
MemberDTO
memberDTO
)
{}
/**
* 创建大屏账户同时创建会员
*
...
...
@@ -101,8 +113,7 @@ public class UserOperationServiceImpl implements UserOperationService {
* @return UserTvDTO
*/
@Override
@Transactional
@AsyncMqSend
@Transactional
(
propagation
=
Propagation
.
SUPPORTS
,
readOnly
=
true
,
rollbackFor
=
Exception
.
class
)
public
UserTvDTO
createTvUserAndMember
(
UserTv
resources
)
{
// 大屏账户
String
platformAccount
=
resources
.
getPlatformAccount
();
...
...
@@ -121,8 +132,11 @@ public class UserOperationServiceImpl implements UserOperationService {
UserTv
userTv
=
UserTvBuilder
.
build
(
memberDTO
.
getId
(),
memberDTO
.
getCode
(),
resources
);
// 创建大屏账户
UserTvDTO
tvUser
=
this
.
createTvUser
(
userTv
,
memberDTO
.
getId
(),
memberDTO
.
getCode
());
return
tvUser
;
UserTvDTO
tvUserDTO
=
this
.
createTvUser
(
userTv
,
memberDTO
.
getId
(),
memberDTO
.
getCode
());
this
.
asyncMemberAndUserTv4Iptv
(
memberDTO
,
tvUserDTO
);
return
tvUserDTO
;
}
...
...
@@ -141,7 +155,6 @@ public class UserOperationServiceImpl implements UserOperationService {
*/
@Override
@Transactional
(
propagation
=
Propagation
.
SUPPORTS
,
readOnly
=
true
,
rollbackFor
=
Exception
.
class
)
@AsyncMqSend
public
UserWeixinDTO
createWeixinUserAndMember
(
UserWeixin
resources
)
{
String
appId
=
resources
.
getAppid
();
...
...
@@ -166,7 +179,12 @@ public class UserOperationServiceImpl implements UserOperationService {
if
(
Objects
.
nonNull
(
memberDTO
))
{
resources
.
setMemberId
(
_userWeixinDTO
.
getMemberId
());
UserWeixin
userWeixin
=
UserWeixinBuilder
.
build
(
resources
);
return
this
.
createWeixinUser
(
userWeixin
,
memberDTO
.
getId
(),
memberDTO
.
getCode
());
UserWeixinDTO
weixinDTO
=
this
.
createWeixinUser
(
userWeixin
,
memberDTO
.
getId
(),
memberDTO
.
getCode
());
// 同步至iptv
this
.
asyncWeixinMemberAndUserWeixin4Iptv
(
memberDTO
,
weixinDTO
);
return
weixinDTO
;
}
throw
new
EntityNotFoundException
(
MemberDTO
.
class
,
"code"
,
GlobeExceptionMsg
.
MEMBER_CODE_IS_NULL
);
...
...
@@ -181,7 +199,12 @@ public class UserOperationServiceImpl implements UserOperationService {
if
(
Objects
.
nonNull
(
memberDTO
))
{
UserWeixin
userWeixin
=
UserWeixinBuilder
.
build
(
memberDTO
.
getId
(),
resources
);
return
this
.
createWeixinUser
(
userWeixin
,
memberDTO
.
getId
(),
memberDTO
.
getCode
());
UserWeixinDTO
_userWeixinDTO1
=
this
.
createWeixinUser
(
userWeixin
,
memberDTO
.
getId
(),
memberDTO
.
getCode
());
// 同步至iptv
this
.
asyncWeixinMemberAndUserWeixin4Iptv
(
memberDTO
,
_userWeixinDTO1
);
return
_userWeixinDTO1
;
}
throw
new
EntityNotFoundException
(
MemberDTO
.
class
,
"code"
,
GlobeExceptionMsg
.
MEMBER_CODE_IS_NULL
);
...
...
@@ -190,6 +213,7 @@ public class UserOperationServiceImpl implements UserOperationService {
}
/**
* 服务号登录
* @param resources
...
...
@@ -256,8 +280,10 @@ public class UserOperationServiceImpl implements UserOperationService {
}
else
{
// 修改微信账户关注状态
this
.
doUpdateUserWeiXinStatus
(
userWeixinDTO
,
SUBSCRIBE_STATUS
);
UserWeixinDTO
_userWeixinDTO
=
this
.
doUpdateUserWeiXinStatus
(
userWeixinDTO
,
SUBSCRIBE_STATUS
);
// 同步至iptv
this
.
asyncWeixin
(
_userWeixinDTO
);
}
// 大屏信息
...
...
@@ -310,7 +336,10 @@ public class UserOperationServiceImpl implements UserOperationService {
MemberDTO
memberDTO
=
this
.
findMemberByUserWeixinDTO
(
userWeixinDTO
);
// 修改会员vip,如果没有购买会员则取消团粉
this
.
doUpdateMemberVip
(
memberDTO
,
0
);
MemberDTO
_memberDTO
=
this
.
doUpdateMemberVip
(
memberDTO
,
0
);
// 同步至iptv
this
.
asyncWeixinMemberAndUserWeixin4Iptv
(
_memberDTO
,
userWeixinDTO
);
return
true
;
}
...
...
@@ -379,8 +408,10 @@ public class UserOperationServiceImpl implements UserOperationService {
}
// 设置主会员
this
.
bondPriorityMember
(
userTvDTO
,
memberCode
,
"manual"
);
UserTvDTO
_userTvDTO
=
this
.
bondPriorityMember
(
userTvDTO
,
memberCode
,
"manual"
);
// 同步至iptv
this
.
asyncUserTv
(
_userTvDTO
);
}
/**
...
...
@@ -398,14 +429,16 @@ public class UserOperationServiceImpl implements UserOperationService {
throw
new
EntityNotFoundException
(
UserTvDTO
.
class
,
"PlatformAccount"
,
GlobeExceptionMsg
.
IPTV_IS_NULL
);
// 解绑(置空大屏信息)
this
.
resetIptvColumn
(
this
.
findMemberByCode
(
memberCode
));
MemberDTO
_memberDTO
=
this
.
resetIptvColumn
(
this
.
findMemberByCode
(
memberCode
));
// 置空主账号
this
.
resetMainAccount
(
memberCode
,
userTvDTO
.
getId
());
UserTvDTO
_userTvDTO
=
this
.
resetMainAccount
(
memberCode
,
userTvDTO
.
getId
());
// 同步至iptv
this
.
asyncMemberAndUserTv4Iptv
(
_memberDTO
,
_userTvDTO
);
}
@Override
@AsyncMqSend
public
boolean
deleteAllCollection
(
String
content
)
{
try
{
...
...
@@ -432,7 +465,6 @@ public class UserOperationServiceImpl implements UserOperationService {
}
@Override
@AsyncMqSend
public
boolean
deleteCollection
(
String
content
)
{
try
{
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
content
);
...
...
@@ -494,7 +526,6 @@ public class UserOperationServiceImpl implements UserOperationService {
}
@Override
@AsyncMqSend
public
boolean
addCollection
(
String
content
)
{
try
{
//处理接口调用 中文不显示问题
...
...
@@ -569,7 +600,6 @@ public class UserOperationServiceImpl implements UserOperationService {
}
@Override
@AsyncMqSend
public
boolean
appletBind
(
BindBean
resources
)
{
Long
id
=
resources
.
getId
();
...
...
@@ -647,14 +677,21 @@ public class UserOperationServiceImpl implements UserOperationService {
memberDTO
.
setPlatformAccount
(
platformAccount
);
// 更新大屏账户
this
.
doUpdateUserTv
(
userTvDTO
);
UserTvDTO
_userTvDTO
=
this
.
doUpdateUserTv
(
userTvDTO
);
// 修改会员信息
this
.
doUpdateMemberByMemberDTO
(
memberDTO
);
MemberDTO
_memberDTO
=
this
.
doUpdateMemberByMemberDTO
(
memberDTO
);
// 同步至iptv
this
.
asyncMemberAndUserTv4Iptv
(
_memberDTO
,
_userTvDTO
);
return
true
;
}
/**
*
* @param memberCode
* @param platformAccount
*/
@Override
@Transactional
(
propagation
=
Propagation
.
SUPPORTS
,
readOnly
=
true
,
rollbackFor
=
Exception
.
class
)
public
void
bind
(
String
memberCode
,
String
platformAccount
)
{
...
...
@@ -699,9 +736,6 @@ public class UserOperationServiceImpl implements UserOperationService {
// mq同步数据时使用
memberDTO
.
setPlatformAccount
(
platformAccount
);
// 大屏是否绑定主账号,如果绑定了主账户则不操作大屏账户表
this
.
bondPriorityMember
(
userTvDTO
,
memberDTO
.
getCode
(),
"auto"
);
// 构建小屏会员对象,绑定user_iptv_id字段
String
platform
=
userTvDTO
.
getPlatform
();
// 绑定IPTV平台 0:未知;1:电信;2:移动;3:联通
...
...
@@ -723,8 +757,13 @@ public class UserOperationServiceImpl implements UserOperationService {
memberDTO
.
setBindIptvPlatformType
(
bindIptvPlatformType
);
memberDTO
.
setPlatformAccount
(
platformAccount
);
// 大屏是否绑定主账号,如果绑定了主账户则不操作大屏账户表
UserTvDTO
_userTvDTO
=
this
.
bondPriorityMember
(
userTvDTO
,
memberDTO
.
getCode
(),
"auto"
);
// 修改会员
this
.
doUpdateMemberByMemberDTO
(
memberDTO
);
MemberDTO
_memberDTO
=
this
.
doUpdateMemberByMemberDTO
(
memberDTO
);
// 同步至iptv
this
.
asyncMemberAndUserTv4Iptv
(
_memberDTO
,
_userTvDTO
);
return
null
;
}
...
...
@@ -742,7 +781,7 @@ public class UserOperationServiceImpl implements UserOperationService {
/**
* 修改会员vip状态
*/
private
void
doUpdateMemberVip
(
MemberDTO
memberDTO
,
Integer
vip1
)
{
private
MemberDTO
doUpdateMemberVip
(
MemberDTO
memberDTO
,
Integer
vip1
)
{
if
(
memberDTO
!=
null
)
{
Integer
vip
=
memberDTO
.
getVip
();
vip
=
(
vip
==
null
?
0
:
vip
);
...
...
@@ -754,8 +793,12 @@ public class UserOperationServiceImpl implements UserOperationService {
Member
member
=
new
Member
();
BeanUtils
.
copyProperties
(
memberDTO
,
member
);
this
.
memberService
.
update
(
member
);
return
memberDTO
;
}
}
return
null
;
}
/**
...
...
@@ -799,7 +842,7 @@ public class UserOperationServiceImpl implements UserOperationService {
* 修改微信公众号关注状态
* @param status 0:取消关注 1:关注
*/
p
rivate
UserWeixinDTO
doUpdateUserWeiXinStatus
(
UserWeixinDTO
userWeixinDTO
,
Integer
status
)
{
p
ublic
UserWeixinDTO
doUpdateUserWeiXinStatus
(
UserWeixinDTO
userWeixinDTO
,
Integer
status
)
{
userWeixinDTO
.
setStatus
(
status
);
...
...
@@ -808,7 +851,6 @@ public class UserOperationServiceImpl implements UserOperationService {
this
.
userWeixinService
.
update
(
userWeixin
);
return
userWeixinDTO
;
}
...
...
@@ -855,13 +897,13 @@ public class UserOperationServiceImpl implements UserOperationService {
* @param memberCode
* @param auto manual:手动 auto:自动
*/
private
void
bondPriorityMember
(
UserTvDTO
userTvDTO
,
String
memberCode
,
String
auto
)
{
private
UserTvDTO
bondPriorityMember
(
UserTvDTO
userTvDTO
,
String
memberCode
,
String
auto
)
{
if
(
auto
.
equalsIgnoreCase
(
"auto"
))
{
// 主账户
String
priorityMemberCode
=
userTvDTO
.
getPriorityMemberCode
();
if
(
StringUtils
.
isNotEmpty
(
priorityMemberCode
))
{
return
;
return
null
;
}
}
...
...
@@ -869,15 +911,25 @@ public class UserOperationServiceImpl implements UserOperationService {
UserTv
userTv
=
new
UserTv
();
BeanUtils
.
copyProperties
(
userTvDTO
,
userTv
);
this
.
userTvService
.
update
(
userTv
);
UserTvDTO
_userTvDTO
=
this
.
updateUserTv
(
userTv
);
return
_userTvDTO
;
}
/**
*
* @param userTv
* @return
*/
private
UserTvDTO
updateUserTv
(
UserTv
userTv
){
return
this
.
userTvService
.
update
(
userTv
);
}
/**
* 重置主账号
* @param memberCode
*/
private
void
resetMainAccount
(
String
memberCode
,
Long
id
)
{
private
UserTvDTO
resetMainAccount
(
String
memberCode
,
Long
id
)
{
UserTvDTO
userTvDTO
=
this
.
userTvService
.
findByPriorityMemberCode
(
memberCode
);
if
(
Objects
.
nonNull
(
userTvDTO
))
{
...
...
@@ -900,8 +952,9 @@ public class UserOperationServiceImpl implements UserOperationService {
});
// 绑定新的主账号
this
.
bondPriorityMember
(
userTvDTO
,
memberDTOS
.
get
(
0
).
getCode
()
,
"manual"
);
UserTvDTO
_userTvDTO
=
this
.
bondPriorityMember
(
userTvDTO
,
memberDTOS
.
get
(
0
).
getCode
()
,
"manual"
);
return
_userTvDTO
;
}
}
else
{
...
...
@@ -911,30 +964,33 @@ public class UserOperationServiceImpl implements UserOperationService {
UserTv
userTv
=
new
UserTv
();
BeanUtils
.
copyProperties
(
userTvDTO
,
userTv
);
this
.
userTvService
.
unbindPriorityMemberCode
(
userTv
);
UserTvDTO
_userTvDTO
=
this
.
userTvService
.
unbindPriorityMemberCode
(
userTv
);
return
_userTvDTO
;
}
}
return
userTvDTO
;
}
/**
* 解绑(置空大屏信息)
* @param memberDTOS
*/
private
void
resetIptvColumn
(
MemberDTO
memberDTOS
)
{
private
MemberDTO
resetIptvColumn
(
MemberDTO
memberDTOS
)
{
// 若无关系,不做处理
if
(
Objects
.
nonNull
(
memberDTOS
)
&&
Objects
.
isNull
(
memberDTOS
.
getUserIptvId
()))
return
;
return
null
;
Member
member
=
new
Member
();
memberDTOS
.
setBindIptvTime
(
null
);
memberDTOS
.
setUserIptvId
(
null
);
memberDTOS
.
setBindIptvPlatformType
(
null
);
BeanUtils
.
copyProperties
(
memberDTOS
,
member
);
this
.
memberService
.
update
(
member
);
return
this
.
memberService
.
update
(
member
);
}
/**
...
...
@@ -966,19 +1022,6 @@ public class UserOperationServiceImpl implements UserOperationService {
return
this
.
memberService
.
update
(
member
);
}
/**
* 更新微信用户修改的时间
* @param userWeixinDTO
*/
private
void
doUpdateUserWeiXinUpdateTime
(
UserWeixinDTO
userWeixinDTO
)
{
UserWeixin
userWeixin
=
new
UserWeixin
();
userWeixin
.
setAppid
(
userWeixinDTO
.
getAppid
());
userWeixin
.
setOpenid
(
userWeixinDTO
.
getOpenid
());
userWeixin
.
setUpdateTime
(
TimestampUtil
.
now
());
this
.
userWeixinService
.
updateTime
(
userWeixin
);
}
/**
*
* @param unionId
...
...
@@ -989,24 +1032,14 @@ public class UserOperationServiceImpl implements UserOperationService {
}
/**
* 通过id检索大屏信息
* @param userIptvId
* @return
*/
private
UserTvDTO
findUserIptvById
(
Long
userIptvId
)
{
UserTvDTO
userTvDTO
=
this
.
userTvService
.
findById
(
userIptvId
);
return
userTvDTO
;
}
/**
* 更新大屏
* @param userTvDTO
*/
private
void
doUpdateUserTv
(
UserTvDTO
userTvDTO
)
{
private
UserTvDTO
doUpdateUserTv
(
UserTvDTO
userTvDTO
)
{
UserTv
userTv
=
new
UserTv
();
BeanUtils
.
copyProperties
(
userTvDTO
,
userTv
);
userTv
.
setUpdateTime
(
TimestampUtil
.
now
());
this
.
userTvService
.
update
(
userTv
);
return
this
.
userTvService
.
update
(
userTv
);
}
/**
...
...
@@ -1102,14 +1135,16 @@ public class UserOperationServiceImpl implements UserOperationService {
if
(
Objects
.
nonNull
(
memberId
))
resource
.
setMemberId
(
memberId
);
if
(
StringUtils
.
isNotBlank
(
memberCode
))
resource
.
setMemberCode
(
memberCode
);
UserWeixin
userWeixin
=
this
.
userWeixinService
.
create
(
resource
);
UserWeixin
DTO
userWeixinDTO
=
this
.
userWeixinService
.
create
(
resource
);
UserWeixinDTO
userWeixinDTO
=
new
UserWeixinDTO
();
BeanUtils
.
copyProperties
(
userWeixin
,
userWeixinDTO
);
return
userWeixinDTO
;
}
/**
*
* @param memberDTO
* @return
*/
@Override
public
UserTvDTO
checkBind
(
MemberDTO
memberDTO
)
{
MemberDTO
memberDTO1
=
this
.
memberService
.
findByCode
(
memberDTO
.
getCode
());
...
...
@@ -1120,6 +1155,11 @@ public class UserOperationServiceImpl implements UserOperationService {
return
null
;
}
/**
*
* @param platformAccount
* @return
*/
@Override
public
UserTvDTO
findByPlatformAccount
(
String
platformAccount
)
{
return
this
.
userTvService
.
findByPlatformAccount
(
platformAccount
);
...
...
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/member/MemberOperationServiceImpl.java
View file @
e6a0d11
...
...
@@ -45,7 +45,6 @@ public class MemberOperationServiceImpl implements MemberOperationService {
@Autowired
private
ThreadPoolTaskExecutor
threadPoolTaskExecutor
;
@AsyncMqSend
@CachePut
(
key
=
"#resources.memberId"
)
@Override
public
MemberDTO
buyVip
(
BuyVipBean
resources
)
{
...
...
@@ -101,7 +100,6 @@ public class MemberOperationServiceImpl implements MemberOperationService {
return
memberDTO
;
}
@AsyncMqSend
@Override
public
void
createVipHistory
(
MemberVipHistory
memberVipHistory
){
this
.
memberVipHistoryService
.
create
(
memberVipHistory
);
...
...
@@ -166,7 +164,6 @@ public class MemberOperationServiceImpl implements MemberOperationService {
return
this
.
update
(
member
);
}
@AsyncMqSend
@Override
public
MemberProfileDTO
getMemberProfileAndCheckVip
(
Long
memberId
,
String
appid
)
{
...
...
@@ -205,7 +202,7 @@ public class MemberOperationServiceImpl implements MemberOperationService {
this
.
threadPoolTaskExecutor
.
execute
(()->{
Member
member
=
new
Member
();
BeanUtils
.
copyProperties
(
memberDTO1
,
member
);
this
.
memberService
.
update
(
member
);
this
.
update
(
member
);
});
vip
=
memberDTO1
.
getVip
();
...
...
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/member/MemberProfileOperationServiceImpl.java
View file @
e6a0d11
...
...
@@ -37,6 +37,7 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation
}
@Override
@AsyncMqSend
public
MemberProfile
create
(
MemberProfile
resources
)
{
return
this
.
memberProfileService
.
create
(
resources
);
}
...
...
@@ -83,8 +84,7 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation
String
memberCode
=
resources
.
getMemberCode
();
MemberDTO
memberDTO
=
null
;
if
(
StringUtils
.
isEmpty
(
memberCode
))
{
Long
memberId
=
resources
.
getMemberId
();
memberDTO
=
this
.
memberOperationService
.
findById
(
memberId
);
memberDTO
=
this
.
memberOperationService
.
findByCode
(
memberCode
);
resources
.
setMemberCode
(
memberDTO
.
getCode
());
}
...
...
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/member/MemberRelatedInfoOperationServiceImpl.java
View file @
e6a0d11
package
com
.
topdraw
.
business
.
process
.
service
.
impl
.
member
;
import
com.topdraw.aspect.AsyncMqSend
;
import
com.topdraw.business.module.member.domain.Member
;
import
com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo
;
import
com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService
;
...
...
@@ -29,16 +30,19 @@ public class MemberRelatedInfoOperationServiceImpl implements MemberRelatedInfoO
}
@Override
@AsyncMqSend
public
MemberRelatedInfoDTO
create
(
MemberRelatedInfo
resources
)
{
return
this
.
memberRelatedInfoService
.
create
(
resources
);
}
@Override
@AsyncMqSend
public
MemberRelatedInfoDTO
update
(
MemberRelatedInfo
resources
)
{
return
this
.
memberRelatedInfoService
.
update
(
resources
);
}
@Override
@AsyncMqSend
public
void
delete
(
Long
id
)
{
this
.
memberRelatedInfoService
.
delete
(
id
);
}
...
...
Please
register
or
sign in
to post a comment