提交 修复活动报名

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -231,7 +231,6 @@ public class SocialController extends BaseController {
     @RequestMapping(value = "/activity/{communityId}", method = RequestMethod.GET)
     public ResponseBean findActivityDetail(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
 
         if (!check(communityId)) {
@@ -239,7 +238,7 @@ public class SocialController extends BaseController {
             return responseBean;
         }
 
-        TpActivity activity = socialServiceI.findActivityDetail(activityId, communityId, userId);
+        TpActivity activity = socialServiceI.findActivityDetail(activityId, communityId, userElement);
         responseBean.addSuccess(activity);
         return responseBean;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java

@@ -56,9 +56,10 @@ public interface SocialServiceI {
 	 * 获取活动帖子详情
 	 * @param activityId
 	 * @param communityId
+	 * @param userElement
 	 * @return
 	 */
-	TpActivity findActivityDetail(Integer activityId, Integer communityId, Integer userId);
+	TpActivity findActivityDetail(Integer activityId, Integer communityId, UserElement userElement);
 
 	/**
 	 * 活动报名

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -198,9 +198,9 @@ public class SocialServiceImpl implements SocialServiceI {
      * @return
      */
     @Override
-    public TpActivity findActivityDetail(Integer activityId, Integer communityId, Integer userId) {
+    public TpActivity findActivityDetail(Integer activityId, Integer communityId, UserElement userElement) {
         //更新查看次数
-        Integer allViewNum = updateSocialView(userId, Constant.ACTIVITY, communityId, activityId);
+        Integer allViewNum = updateSocialView(userElement.getId(), Constant.ACTIVITY, communityId, activityId);
         if (null != allViewNum) {
             TpActivity activity = new TpActivity();
             activity.setId(activityId);
@@ -217,12 +217,12 @@ public class SocialServiceImpl implements SocialServiceI {
             tpActivity.setUserName(tpUser.getUserName());
         }
         //查看当前人是否签到
-        TpActivitySignIn tpActivitySignIn = tpActivitySignInMapper.selectSing(activityId, userId,communityId);
+        TpActivitySignIn tpActivitySignIn = tpActivitySignInMapper.selectSing(activityId, userElement.getId(),communityId);
         Integer signType = tpActivitySignIn == null ? 0 : 1;
         tpActivity.setSignType(signType);
 
         //返回报名状态
-        Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userId);
+        Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userElement.getUserVerifyId());
         String signStatus = signNum != 0 ? Constant.STATUS_SIGNED : Constant.STATUS_UNSIGN;
         tpActivity.setSignStatus(signStatus);
 
@@ -838,7 +838,10 @@ public class SocialServiceImpl implements SocialServiceI {
     public ResponseBean insertActivitySignUp(UserElement userElement, TpActivity tpActivity, Integer communityId, String remark) {
         ResponseBean responseBean = new ResponseBean();
         //判断是否已经报名
-        Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userElement.getId());
+        /**
+         * 活动报名表：ta_user_id 字段存储 审核id，所以查询的时候，用户审核id
+         */
+        Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userElement.getUserVerifyId());
         if (signNum != 0) {
             responseBean.addError("9996", "您已报名，请勿重复报名");
             return responseBean;

CODE/smart-community/app-api/src/main/resources/mapper/ToBannerMapper.xml

@@ -47,7 +47,7 @@
     <if test="communityId != null">
       and community_id = #{communityId}
     </if>
-    order by t.sort, t.eff_time
+    order by sort desc, update_date DESC
     <if test="num != null">
       limit #{num}
     </if>

CODE/smart-community/operate-api/src/main/resources/mapper/ToBannerMapper.xml

@@ -279,7 +279,7 @@
        and community_id = #{communityId,jdbcType=INTEGER}
       </if>
     </trim>
-    order by create_date DESC
+    order by sort desc, update_date DESC
   </select>
 
   <delete id="deleteBanchBanner" parameterType="list">