bug修改

101captain

2022-06-23 29a57ef19ba1a202d5923a9e356ed5863d26602c

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

@@ -2,31 +2,22 @@

import static java.util.stream.Collectors.toList;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;

import javax.annotation.Resource;

import com.panzhihua.applets.umf.UmfPayUtil;
import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.common.utlis.DateUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -336,14 +327,15 @@
                    } else {
                        comActActivityVO.setActivitySignInList(currentList);
                    }
                    if(comActActivityVO.getLimit()>0&&currentList.size()>0){
                    Integer limit = comActActivityVO.getLimit();
                    if(limit != null && limit>0 &&currentList.size()>0){
                        if(comActActivityVO.getType()==3){
                            if(comActActivityVO.getLimit()==currentList.size()||currentList.get(currentList.size()-1).getEndTime()!=null){
                            if(limit==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
                                comActActivityVO.setIsRegist(1);
                            }
                        }
                        else {
                            if(comActActivityVO.getLimit()==currentList.size()){
                            if(limit==currentList.size()){
                                comActActivityVO.setIsRegist(1);
                            }
                        }