From ccd28a0c35e8fff74da6ef63042fb8a896d78f7f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 29 六月 2022 09:45:52 +0800
Subject: [PATCH] 单位服务统计
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index c452c25..ecc4684 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/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;
@@ -305,8 +296,8 @@
comActActRegistVOS.forEach(activitySignInVO -> {
if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
currentList.add(activitySignInVO);
- comActActivityVO.setIsComment(1);
if(comActActivityVO.getType()!=3){
+ comActActivityVO.setIsComment(1);
if(comActActivityVO.getTimes()==null){
comActActivityVO.setTimes(1);
comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
@@ -318,6 +309,7 @@
}
else {
if(activitySignInVO.getEndTime()!=null){
+ comActActivityVO.setIsComment(1);
if(comActActivityVO.getTimes()==null){
comActActivityVO.setTimes(1);
comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
@@ -335,14 +327,15 @@
} else {
comActActivityVO.setActivitySignInList(currentList);
}
- if(comActActivityVO.getLimit()>0){
+ Integer limit = comActActivityVO.getLimit();
+ if(limit != null && limit>0 &¤tList.size()>0){
if(comActActivityVO.getType()==3){
- if(comActActivityVO.getLimit()==currentList.size()||currentList.get(collect.size()).getEndTime()!=null){
+ if(limit==currentList.size()&¤tList.get(currentList.size()-1).getEndTime()!=null){
comActActivityVO.setIsRegist(1);
}
}
else {
- if(comActActivityVO.getLimit()==currentList.size()){
+ if(limit==currentList.size()){
comActActivityVO.setIsRegist(1);
}
}
--
Gitblit v1.7.1