|
@@ -91,7 +91,8 @@ public class FamilyController extends AppBaseController {
|
|
|
*/
|
|
|
@ApiOperation("我的默认家族")
|
|
|
@GetMapping("/myFamily")
|
|
|
- public AjaxResult myFamily(@LoginAppUser AppMemberVo memberVo){
|
|
|
+ public AjaxResult myFamily(){
|
|
|
+ AppMemberVo memberVo = getLoginUser().getUser();
|
|
|
Long memberId = memberVo.getMemberId();
|
|
|
if (memberId == null) {
|
|
|
return AjaxResult.error("成员id不能为空");
|
|
@@ -102,7 +103,8 @@ public class FamilyController extends AppBaseController {
|
|
|
|
|
|
@ApiOperation("我的家族列表")
|
|
|
@GetMapping("/myList")
|
|
|
- public AjaxResult myList(@LoginAppUser AppMemberVo memberVo){
|
|
|
+ public AjaxResult myList(){
|
|
|
+ AppMemberVo memberVo = getLoginUser().getUser();
|
|
|
Long memberId = memberVo.getMemberId();
|
|
|
if (memberId == null) {
|
|
|
return AjaxResult.error("成员id不能为空");
|
|
@@ -116,7 +118,8 @@ public class FamilyController extends AppBaseController {
|
|
|
@ApiOperation("创建家族")
|
|
|
@PostMapping("/create")
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public AjaxResult add(@LoginAppUser AppMemberVo memberVo,@RequestBody TbFamily tbFamily) {
|
|
|
+ public AjaxResult add(@RequestBody TbFamily tbFamily) {
|
|
|
+ AppMemberVo memberVo = getLoginUser().getUser();
|
|
|
Date date = new Date();
|
|
|
tbFamily.setCreateTime(date);
|
|
|
tbFamily.setUpdateTime(date);
|
|
@@ -140,7 +143,8 @@ public class FamilyController extends AppBaseController {
|
|
|
@ApiOperation("切换家族")
|
|
|
@ApiImplicitParam(name = "familyId", value = "切换的家族ID",paramType="Long")
|
|
|
@GetMapping("/change")
|
|
|
- public AjaxResult change(@LoginAppUser AppMemberVo memberVo,Long familyId) {
|
|
|
+ public AjaxResult change(Long familyId) {
|
|
|
+ AppMemberVo memberVo = getLoginUser().getUser();
|
|
|
Long memberId = memberVo.getMemberId();
|
|
|
if(familyService.change(memberId,familyId)){
|
|
|
return AjaxResult.success();
|
|
@@ -153,44 +157,16 @@ public class FamilyController extends AppBaseController {
|
|
|
* @param familyId
|
|
|
* @return
|
|
|
*/
|
|
|
- @Transactional(rollbackFor = Exception.class)
|
|
|
@ApiOperation("申请加入家族")
|
|
|
@ApiImplicitParam(name = "familyId", value = "申请的家族ID",paramType="Long")
|
|
|
@GetMapping("/join")
|
|
|
- public AjaxResult join(@LoginAppUser AppMemberVo memberVo, Long familyId) {
|
|
|
-
|
|
|
- List<TbMemberMiddle> middles = middleService.list(new LambdaQueryWrapper<TbMemberMiddle>()
|
|
|
- .eq(TbMemberMiddle::getFamilyId,familyId)
|
|
|
- .eq(TbMemberMiddle::getMemberId,memberVo.getMemberId())
|
|
|
- .eq(TbMemberMiddle::getStatus,"2")
|
|
|
- );
|
|
|
- if (middles.size() > 0) {
|
|
|
- return AjaxResult.error("已在该家族,不允许重复加入");
|
|
|
- }
|
|
|
-
|
|
|
- memberVo.setJoins("Y");
|
|
|
- // 保存成员
|
|
|
- if(appUserService.saveOrUpdate(memberVo)){
|
|
|
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
- return AjaxResult.error("申请失败");
|
|
|
- }
|
|
|
- // 是否已加入过家族
|
|
|
- List<TbMemberMiddle> middleList = middleService.list(new LambdaQueryWrapper<TbMemberMiddle>()
|
|
|
- .eq(TbMemberMiddle::getMemberId,memberVo.getMemberId())
|
|
|
- );
|
|
|
- TbMemberMiddle middle = new TbMemberMiddle();
|
|
|
- if (middleList.size() == 0) {
|
|
|
- // 如果从未加入过家族,则设置为默认家族
|
|
|
- middle.setAcquiesce("Y");
|
|
|
- }
|
|
|
- middle.setFamilyId(familyId);
|
|
|
- middle.setMemberId(memberVo.getMemberId());
|
|
|
- middle.setStatus("1"); // 申请
|
|
|
- if(!middleService.save(middle)){
|
|
|
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
- return AjaxResult.error("申请失败");
|
|
|
+ public AjaxResult join(Long familyId) {
|
|
|
+ if (familyId == null) {
|
|
|
+ return AjaxResult.error("家族id不能为空");
|
|
|
}
|
|
|
- return AjaxResult.success("申请成功");
|
|
|
+ AppMemberVo memberVo = getLoginUser().getUser();
|
|
|
+ memberVo.setFamilyId(familyId);
|
|
|
+ return familyService.applyFamily(memberVo);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -254,6 +230,7 @@ public class FamilyController extends AppBaseController {
|
|
|
TbMemberMiddle middle = middleService.getOne(new LambdaQueryWrapper<TbMemberMiddle>()
|
|
|
.eq(TbMemberMiddle::getMemberId,user.getMemberId())
|
|
|
.eq(TbMemberMiddle::getFamilyId,familyId)
|
|
|
+ .last("limit 1")
|
|
|
);
|
|
|
if (middle == null){
|
|
|
return AjaxResult.error("未加入家族");
|