Commit e6a0d117 e6a0d117ced9295ad3a3dcc5c878cea47244a9ea by xianghan

1.优化

1 parent 48409765
Showing 17 changed files with 37 additions and 32 deletions
......@@ -20,7 +20,7 @@ import io.swagger.annotations.*;
*/
@Api(tags = "会员地址管理")
@RestController
@RequestMapping("/ucEngine/memberAddress")
@RequestMapping("/ucEngine/api/memberAddress")
@CrossOrigin
@Slf4j
public class MemberAddressController {
......
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;
......
......@@ -20,7 +20,7 @@ import io.swagger.annotations.*;
*/
@Api(tags = "会员属性管理")
@RestController
@RequestMapping("/ucEngine/memberProfile")
@RequestMapping("/ucEngine/api/memberProfile")
@CrossOrigin
@Slf4j
public class MemberProfileController {
......
......@@ -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;
......
......@@ -19,7 +19,7 @@ import io.swagger.annotations.*;
*/
@Api(tags = "相关人员管理")
@RestController
@RequestMapping("/ucEngine/memberRelatedInfo")
@RequestMapping("/ucEngine/api/memberRelatedInfo")
@CrossOrigin
@Slf4j
public class MemberRelatedInfoController {
......
......@@ -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 {
......
......@@ -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
......
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);
......
......@@ -34,7 +34,7 @@ public interface UserTvService {
*
* @param resources
*/
void unbindPriorityMemberCode(UserTv resources);
UserTvDTO unbindPriorityMemberCode(UserTv resources);
/**
*
......
......@@ -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 UserTv = this.userTvRepository.findById(id).orElseThrow(
UserTv userTv = this.userTvRepository.findById(id).orElseThrow(
() -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", UserTv.class, id), 1));
this.userTvRepository.delete(UserTv);
this.userTvRepository.delete(userTv);
}
@Override
......
......@@ -21,13 +21,13 @@ public interface UserWeixinService {
* @param resources
* @return
*/
UserWeixin create(UserWeixin resources);
UserWeixinDTO create(UserWeixin resources);
/**
*
* @param resources
*/
void update(UserWeixin resources);
UserWeixinDTO update(UserWeixin resources);
/**
*
......
......@@ -37,19 +37,20 @@ public class UserWeixinServiceImpl implements UserWeixinService {
@Override
@Transactional(rollbackFor = Exception.class)
public UserWeixin create(UserWeixin resources) {
public UserWeixinDTO 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
......
......@@ -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();
}
......
......@@ -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();
......
......@@ -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());
}
......
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);
}
......