Commit bae5eb27 bae5eb270642439c37df8798422dfcb5b4ccce82 by xianghan

1.添加同步时需要的字段

1 parent 573bb43c
......@@ -25,6 +25,10 @@ import java.sql.Timestamp;
@Table(name="uc_member_address")
public class MemberAddress extends AsyncMqModule implements Serializable {
@Transient
private String platformAccount;
// 主键
/** 主键 */
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
......
......@@ -34,6 +34,9 @@ public class MemberVipHistory extends AsyncMqModule implements Serializable {
@Column(name = "member_id")
private Long memberId;
@Transient
private String memberCode;
// 会员vip等级
@Column(name = "vip")
private Integer vip;
......
......@@ -654,7 +654,7 @@ public class UserOperationServiceImpl implements UserOperationService {
UserTvDTO userTvDTO = this.findByPlatformAccount(platformAccount);
/* if (Objects.nonNull(userTvDTO.getId())) {
if (Objects.nonNull(userTvDTO)) {
if (StringUtils.isNotBlank(userTvDTO.getPriorityMemberCode()) && userTvDTO.getPriorityMemberCode().equalsIgnoreCase(memberCode))
throw new BadRequestException("会员已是主账户");
......@@ -662,7 +662,7 @@ public class UserOperationServiceImpl implements UserOperationService {
throw new EntityNotFoundException(UserTvDTO.class , "platformAccount" , GlobeExceptionMsg.IPTV_IS_NULL);
}*/
}
// 设置主会员
UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, memberCode, "manual");
......