Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 bf46bac3cda70dc8dc7ed95e0461f1a72fba2eeb

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -7,9 +7,11 @@
import java.util.stream.Collectors;

import javax.annotation.Resource;
import javax.validation.Valid;

import com.panzhihua.applets.umf.UmfPayUtil;
import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.common.utlis.DateUtils;
import org.apache.commons.lang.StringUtils;
@@ -296,7 +298,7 @@
                    comActActRegistVOS.forEach(activitySignInVO -> {
                        if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
                            currentList.add(activitySignInVO);
                            if(comActActivityVO.getType()!=3){
                            if(comActActivityVO.getType()!=3&&comActActivityVO.getType()!=5){
                                comActActivityVO.setIsComment(1);
                                if(comActActivityVO.getTimes()==null){
                                    comActActivityVO.setTimes(1);
@@ -530,4 +532,11 @@
        userArchivesVO.setUserId(userId);
        return userService.updateUserArchives(userArchivesVO);
    }

    @ApiOperation(value = "分页查询用户报名的项目")
    @PostMapping("project")
    public R pageProjectWhichIsSignedByUser(@RequestBody @Valid PageProjectDTO pageProjectDTO) {
        pageProjectDTO.setUserId(this.getUserId());
        return communityService.pageProjectWhichIsSignedByUser(pageProjectDTO);
    }
}