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
1432c3cf
...
1432c3cf9ce4d3324a4dead3fa4fb1abb2cdb71c
authored
2022-04-07 10:57:19 +0800
by
xianghan
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
1.优化
1 parent
0509ec16
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
173 additions
and
12 deletions
member-service-impl/src/main/java/com/topdraw/business/module/common/domain/AsyncMqModule.java
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/address/service/dto/BasicMemberAddressDTO.java
member-service-impl/src/main/java/com/topdraw/business/module/member/service/dto/BasicMemberDTO.java
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/member/MemberAddressOperationServiceImpl.java
member-service-impl/src/main/java/com/topdraw/business/process/service/member/MemberAddressOperationService.java
member-service-impl/src/main/java/com/topdraw/business/module/common/domain/AsyncMqModule.java
View file @
1432c3c
package
com
.
topdraw
.
business
.
module
.
common
.
domain
;
import
com.topdraw.business.module.common.validated.UpdateGroup
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
javax.persistence.Transient
;
import
javax.validation.constraints.NotNull
;
/**
* @author :
...
...
@@ -21,7 +19,6 @@ import javax.validation.constraints.NotNull;
public
class
AsyncMqModule
{
@Transient
@NotNull
(
message
=
"memberCode can't be null"
,
groups
=
{
UpdateGroup
.
class
})
private
String
memberCode
;
/** 运营商平台账号 */
...
...
member-service-impl/src/main/java/com/topdraw/business/module/member/address/rest/MemberAddressController.java
View file @
1432c3c
...
...
@@ -4,6 +4,7 @@ import com.topdraw.annotation.AnonymousAccess;
import
com.topdraw.aop.log.Log
;
import
com.topdraw.business.module.common.validated.CreateGroup
;
import
com.topdraw.business.module.common.validated.UpdateGroup
;
import
com.topdraw.business.module.member.address.service.dto.BasicMemberAddressDTO
;
import
com.topdraw.business.module.member.address.service.dto.MemberAddressDTO
;
import
com.topdraw.business.process.service.member.MemberAddressOperationService
;
import
com.topdraw.common.ResultInfo
;
...
...
@@ -34,7 +35,7 @@ public class MemberAddressController {
@AnonymousAccess
public
ResultInfo
create
(
@Validated
(
value
=
{
CreateGroup
.
class
})
@RequestBody
MemberAddress
resources
)
{
log
.
info
(
"memberAddress ==>> create ==> param ==>> [{}]"
,
resources
);
MemberAddressDTO
memberAddressDTO
=
this
.
memberAddressOperationService
.
create
(
resources
);
Basic
MemberAddressDTO
memberAddressDTO
=
this
.
memberAddressOperationService
.
create
(
resources
);
log
.
info
(
"memberAddress ==>> create ==> result ==>> [{}]"
,
resources
);
return
ResultInfo
.
success
(
memberAddressDTO
);
}
...
...
@@ -45,7 +46,7 @@ public class MemberAddressController {
@AnonymousAccess
public
ResultInfo
update
(
@Validated
(
value
=
{
UpdateGroup
.
class
})
@RequestBody
MemberAddress
resources
)
{
log
.
info
(
"memberAddress ==>> update ==> param ==>> [{}]"
,
resources
);
MemberAddressDTO
memberAddressDTO
=
this
.
memberAddressOperationService
.
update
(
resources
);
Basic
MemberAddressDTO
memberAddressDTO
=
this
.
memberAddressOperationService
.
update
(
resources
);
log
.
info
(
"memberAddress ==>> update ==> result ==>> [{}]"
,
resources
);
return
ResultInfo
.
success
(
memberAddressDTO
);
}
...
...
member-service-impl/src/main/java/com/topdraw/business/module/member/address/service/dto/BasicMemberAddressDTO.java
0 → 100644
View file @
1432c3c
package
com
.
topdraw
.
business
.
module
.
member
.
address
.
service
.
dto
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* @author XiangHan
* @date 2021-10-22
*/
@Data
public
class
BasicMemberAddressDTO
implements
Serializable
{
/** 主键 */
private
Long
id
;
/** 会员id */
private
Long
memberId
;
/** 类型 1:家;2:公司;3:学校 */
private
Integer
type
;
/** 是否默认地址 */
private
Integer
isDefault
;
/** 显示顺序 */
private
Integer
sequence
;
/** 状态 0:不可用;1-可用 */
private
Integer
status
;
/** 联系人姓名 */
private
String
contactor
;
/** 联系人电话 */
private
String
cellphone
;
/** 国家 */
private
String
country
;
/** 省份 */
private
String
province
;
/** 城市 */
private
String
city
;
/** 区县 */
private
String
district
;
/** 地址 */
private
String
address
;
/** 邮编 */
private
String
zipCode
;
}
member-service-impl/src/main/java/com/topdraw/business/module/member/service/dto/BasicMemberDTO.java
0 → 100644
View file @
1432c3c
package
com
.
topdraw
.
business
.
module
.
member
.
service
.
dto
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* @author XiangHan
* @date 2021-10-22
*/
@Data
public
class
BasicMemberDTO
implements
Serializable
{
private
String
platformAccount
;
/** iptv绑定的主会员 0:否 1:是 */
private
Integer
iptvMajor
;
/** vip过期时间 */
private
LocalDateTime
vipExpireTime
;
/** 主键 */
private
Long
id
;
/** 标识 */
private
String
code
;
/** 类型 1:大屏;2:小屏 */
private
Integer
type
;
/** 状态 0:不可用;1:可用 */
private
Integer
status
;
/** 昵称 base64 */
private
String
nickname
;
/** 描述 */
private
String
description
;
/** 性别 0:女;1:男;-1:未知 */
private
Integer
gender
;
/** 生日 */
private
String
birthday
;
/** 头像 */
private
String
avatarUrl
;
/** 分组信息 */
private
String
groups
;
/** 标签 */
private
String
tags
;
/** 是否会员 0:非会员;1:会员 */
private
Integer
vip
;
/** 会员等级(对应level表的level字段,非id) */
private
Integer
level
;
/** 成长值 */
private
Long
exp
;
/** 当前积分 */
private
Long
points
;
/** 即将到期积分(一个月内) */
private
Long
duePoints
;
/** 优惠券数量 */
private
Long
couponAmount
;
/** 即将过期优惠券数量 */
private
Long
dueCouponAmount
;
/** iptv账号id */
private
Long
userIptvId
;
/** 绑定IPTV平台 0:未知;1:电信;2:移动;3:联通 */
private
Integer
bindIptvPlatformType
;
/** iptv账号绑定时间 */
private
LocalDateTime
bindIptvTime
;
/** 创建时间 */
private
LocalDateTime
createTime
;
/** 更新时间 */
private
LocalDateTime
updateTime
;
/** 是否在黑名单 1:是;0否 */
private
Long
blackStatus
;
}
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/member/MemberAddressOperationServiceImpl.java
View file @
1432c3c
...
...
@@ -3,6 +3,7 @@ package com.topdraw.business.process.service.impl.member;
import
com.topdraw.aspect.AsyncMqSend
;
import
com.topdraw.business.module.member.address.domain.MemberAddress
;
import
com.topdraw.business.module.member.address.service.MemberAddressService
;
import
com.topdraw.business.module.member.address.service.dto.BasicMemberAddressDTO
;
import
com.topdraw.business.module.member.address.service.dto.MemberAddressDTO
;
import
com.topdraw.business.module.member.service.MemberService
;
import
com.topdraw.business.module.member.service.dto.MemberDTO
;
...
...
@@ -11,6 +12,7 @@ import com.topdraw.exception.BadRequestException;
import
com.topdraw.exception.GlobeExceptionMsg
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.aop.framework.AopContext
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Propagation
;
...
...
@@ -42,7 +44,7 @@ public class MemberAddressOperationServiceImpl implements MemberAddressOperation
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
MemberAddressDTO
create
(
MemberAddress
resources
)
{
public
Basic
MemberAddressDTO
create
(
MemberAddress
resources
)
{
log
.
info
(
"MemberAddressOperationServiceImpl ==>> create ==>> param ==>> [{}]"
,
resources
);
int
maxSequence
=
this
.
memberAddressService
.
findMaxSequenceByMemberId
(
resources
.
getMemberId
());
if
(
maxSequence
<
6
)
{
...
...
@@ -51,7 +53,10 @@ public class MemberAddressOperationServiceImpl implements MemberAddressOperation
MemberDTO
memberDTO
=
this
.
memberService
.
findById
(
resources
.
getMemberId
());
memberAddressDTO
.
setMemberCode
(
memberDTO
.
getCode
());
((
MemberAddressOperationServiceImpl
)
AopContext
.
currentProxy
()).
asyncMemberAddress
(
memberAddressDTO
);
return
memberAddressDTO
;
BasicMemberAddressDTO
basicMemberAddressDTO
=
new
BasicMemberAddressDTO
();
BeanUtils
.
copyProperties
(
memberAddressDTO
,
basicMemberAddressDTO
);
return
basicMemberAddressDTO
;
}
throw
new
BadRequestException
(
GlobeExceptionMsg
.
SEQUENCE_MAX
);
...
...
@@ -60,12 +65,17 @@ public class MemberAddressOperationServiceImpl implements MemberAddressOperation
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
MemberAddressDTO
update
(
MemberAddress
resources
)
{
public
Basic
MemberAddressDTO
update
(
MemberAddress
resources
)
{
log
.
info
(
"MemberAddressOperationServiceImpl ==>> update ==>> param ==>> [{}]"
,
resources
);
MemberAddressDTO
memberAddressDTO
=
this
.
memberAddressService
.
update
(
resources
);
memberAddressDTO
.
setMemberCode
(
resources
.
getMemberCode
());
MemberDTO
memberDTO
=
this
.
memberService
.
findById
(
memberAddressDTO
.
getMemberId
());
memberAddressDTO
.
setMemberCode
(
memberDTO
.
getCode
());
((
MemberAddressOperationServiceImpl
)
AopContext
.
currentProxy
()).
asyncMemberAddress
(
memberAddressDTO
);
return
memberAddressDTO
;
BasicMemberAddressDTO
basicMemberAddressDTO
=
new
BasicMemberAddressDTO
();
BeanUtils
.
copyProperties
(
memberAddressDTO
,
basicMemberAddressDTO
);
return
basicMemberAddressDTO
;
}
@Override
...
...
member-service-impl/src/main/java/com/topdraw/business/process/service/member/MemberAddressOperationService.java
View file @
1432c3c
package
com
.
topdraw
.
business
.
process
.
service
.
member
;
import
com.topdraw.business.module.member.address.domain.MemberAddress
;
import
com.topdraw.business.module.member.address.service.dto.BasicMemberAddressDTO
;
import
com.topdraw.business.module.member.address.service.dto.MemberAddressDTO
;
public
interface
MemberAddressOperationService
{
...
...
@@ -16,13 +17,13 @@ public interface MemberAddressOperationService {
* 保存会员地址
* @param resources
*/
MemberAddressDTO
create
(
MemberAddress
resources
);
Basic
MemberAddressDTO
create
(
MemberAddress
resources
);
/**
* 修改会员地址
* @param resources
*/
MemberAddressDTO
update
(
MemberAddress
resources
);
Basic
MemberAddressDTO
update
(
MemberAddress
resources
);
/**
* 通过id删除
...
...
Please
register
or
sign in
to post a comment