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
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
37 additions
and
32 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
This diff is collapsed.
Click to expand it.
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