Merge remote-tracking branch 'origin/dev' into dev

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/popularize/PopularizeVO.java

 package com.xxfc.platform.activity.vo.popularize;
 
 import com.xxfc.platform.activity.entity.ActivityPopularize;
+import com.xxfc.platform.activity.entity.ActivityPopularizeUser;
 import lombok.Data;
 
 import java.util.List;
@@ -9,6 +10,5 @@ import java.util.List;
 public class PopularizeVO extends ActivityPopularize {
     List<ItemVO> items;
     List<UserVO> userVOs;
-    boolean isComplete;
-
+	ActivityPopularizeUser activityPopularizeUser;
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeController.java

@@ -102,6 +102,7 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
                     UserVO userVO = BeanUtil.toBean(userFeign.userDetailById(pr.getMinorUserId()).getData(), UserVO.class);
                     return userVO;
                 }).collect(Collectors.toList()));
+                vo.setActivityPopularizeUser(apu[0]);
             }
 
             //设置任务项
@@ -168,7 +169,10 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
         //判断是否已经添加过
         ActivityPopularizeLog itemLog = BeanUtil.toBean(itemAddDTO, ActivityPopularizeLog.class);
         itemLog.setUserId(getAppUser().getUserid());
-        XxBizAssert.isNull(popularizeLogBiz.selectOne(itemLog));
+        ActivityPopularizeLog activityPopularizeLog = popularizeLogBiz.selectOne(itemLog);
+        if(activityPopularizeLog != null) {
+            return ObjectRestResponse.createFailedResult(1023, "参加成功，请勿重复参加！");
+        }
 
         //添加活动日志
         itemLog.setStatus(SYS_TRUE);