From 94a69f5c6b470a59b2642f870861a62dd00eef84 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 11 四月 2022 13:59:18 +0800
Subject: [PATCH] 电动车商城接口开发

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |   43 ++++++++++++++++++++++++++++++-------------
 1 files changed, 30 insertions(+), 13 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 4664598..0976896 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
@@ -305,14 +305,29 @@
                     comActActRegistVOS.forEach(activitySignInVO -> {
                         if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
                             currentList.add(activitySignInVO);
-                            comActActivityVO.setIsComment(1);
-                            if(comActActivityVO.getTimes()==null){
-                                comActActivityVO.setTimes(1);
-                                comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
+                            if(comActActivityVO.getType()!=3){
+                                comActActivityVO.setIsComment(1);
+                                if(comActActivityVO.getTimes()==null){
+                                    comActActivityVO.setTimes(1);
+                                    comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
+                                }
+                                else {
+                                    comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
+                                    comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
+                                }
                             }
                             else {
-                                comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
-                                comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
+                                if(activitySignInVO.getEndTime()!=null){
+                                    comActActivityVO.setIsComment(1);
+                                    if(comActActivityVO.getTimes()==null){
+                                        comActActivityVO.setTimes(1);
+                                        comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
+                                    }
+                                    else {
+                                        comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
+                                        comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
+                                    }
+                                }
                             }
                         }
                     });
@@ -321,14 +336,16 @@
                     } else {
                         comActActivityVO.setActivitySignInList(currentList);
                     }
-                    if(comActActivityVO.getType()==3){
-                        if(comActActivityVO.getSignCount()==currentList.size()||currentList.get(collect.size()).getEndTime()!=null){
-                            comActActivityVO.setIsRegist(1);
+                    if(comActActivityVO.getLimit()>0&&currentList.size()>0){
+                        if(comActActivityVO.getType()==3){
+                            if(comActActivityVO.getLimit()==currentList.size()||currentList.get(currentList.size()-1).getEndTime()!=null){
+                                comActActivityVO.setIsRegist(1);
+                            }
                         }
-                    }
-                    else {
-                        if(comActActivityVO.getSignCount()==currentList.size()){
-                            comActActivityVO.setIsRegist(1);
+                        else {
+                            if(comActActivityVO.getLimit()==currentList.size()){
+                                comActActivityVO.setIsRegist(1);
+                            }
                         }
                     }
                 });

--
Gitblit v1.7.1