Merge branch 'test' into 'master'

罗yu 元桥

2021-04-30 1abee89cd55e34fc51102d23f984e3d56ed01647

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_dangjian.api;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
@@ -7,6 +8,7 @@
import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
import com.panzhihua.service_dangjian.service.ComBpActivityService;
import com.panzhihua.service_dangjian.service.ComPbMemberService;
import com.panzhihua.service_dangjian.service.ComPbServiceTeamService;
@@ -175,8 +177,7 @@
     */
    @PostMapping("updatepartybuildingmember")
    public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){
        return  comPbMemberService.updatePartyBuildingMember(partyBuildingMemberVO);
        
        return  comPbMemberService.updatePartyBuildingMembers(partyBuildingMemberVO);
    }

    /**
@@ -273,7 +274,7 @@
     * @return 详情
     */
    @PostMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Integer id){
    public R infoYnamic(@RequestParam("id") Long id){
        return  comPbMemberService.infoYnamic(id);
        
    }
@@ -507,4 +508,25 @@
        return comBpActivityService.addActivityApplets(comPbActivityDTO);
    }

    /**
     * 查询用户认证信息
     * @param id 用户id
     * @return 查询结果
     */
    @GetMapping("usercertification")
    R userCertification(@RequestParam("id")Long id){
        ComPbMemberDO comPbMemberDO = comPbMemberService.getOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id));
        return R.ok(comPbMemberDO);
    }


    /**
     * 查询用户认证信息
     * @param pagePartyBuildingMemberVO 查询参数
     * @return 查询结果
     */
    @PostMapping("pageusercertification")
    R pageUserCertification(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO){
        return comPbMemberService.pagePrePartyBuilingMember(pagePartyBuildingMemberVO);
    }
}