修改活动4480

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivityMapper.java

@@ -38,4 +38,6 @@ public interface TpActivityMapper {
      * @return
      */
     List<TpActivity> selecttpActivity(@Param("id") Integer id, @Param("communityId") Integer communityId);
+
+    TpActivity selectActivity(@Param("activityId") Integer activityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignInMapper.java

@@ -24,4 +24,5 @@ public interface TpActivitySignInMapper {
      *
      */
     TpActivitySignIn selectSing(@Param("activityId") Integer activityId,@Param("userID") Integer userID);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignupMapper.java

@@ -1,6 +1,7 @@
 package com.community.huiju.dao;
 
 
+import com.community.huiju.model.TpActivitySignIn;
 import com.community.huiju.model.TpActivitySignup;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpActivity.java

@@ -42,7 +42,17 @@ public class TpActivity {
     private Date updateDate;
     
     private String userName;
-    
+
+    private String signInCode;
+
+    public String getSignInCode() {
+        return signInCode;
+    }
+
+    public void setSignInCode(String signInCode) {
+        this.signInCode = signInCode;
+    }
+
     /**
      * 报名状态
      */

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

@@ -645,6 +645,32 @@ public class SocialServiceImpl implements SocialServiceI {
     public ResponseBean tpActivitySignInAdd(String paramets, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
         Integer activityId = JSONObject.parseObject(paramets).getInteger("activityId");
+        // 校验扫码签到
+        TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId,userElement.getCommunityId());
+        /*当前用户扫的是否是本小区的码*/
+        TpActivity activity = tpActivityMapper.selectActivity(activityId);
+        if (null!=activity && (!userElement.getCommunityId().equals(activity.getCommunityId()))){
+            responseBean.addError("活动不属于当前登录小区，请在个人中心切换小区");
+            return responseBean;
+        }
+        /*查看当前用户是否报名*/
+         TpActivitySignup signIn= tpActivitySignupMapper.selectTpActivetitySignByUserId(activityId,userElement.getCommunityId(),userElement.getUserVerifyId());
+        if (signIn == null){
+            responseBean.addError("请先报名");
+            return responseBean;
+        }
+        /*活动不需要签到*/
+
+        if (null!=tpActivity && "2".equals(tpActivity.getSignInCode())){
+            responseBean.addError("活动已不能签到");
+            return responseBean;
+        }
+        /*活动作废*/
+        if (null!=tpActivity && "0".equals(tpActivity.getStatus())){
+            responseBean.addError("活动已被作废");
+            return responseBean;
+        }
+
         TpActivitySignIn tpActivitySignIn = new TpActivitySignIn();
         tpActivitySignIn.setActivityId(activityId);
         tpActivitySignIn.setCommunityId(userElement.getCommunityId());
@@ -787,7 +813,7 @@ public class SocialServiceImpl implements SocialServiceI {
         TpActivitySignup tpActivitySignup = new TpActivitySignup();
         tpActivitySignup.setActivityId(tpActivity.getId());
         tpActivitySignup.setCommunityId(communityId);
-        tpActivitySignup.setTaUserId(userElement.getId());
+        tpActivitySignup.setTaUserId(userElement.getUserVerifyId());
         tpActivitySignup.setSignUpTime(new Date());
         tpActivitySignup.setRemark(remark);
 

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

@@ -21,12 +21,14 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="sign_in_code" property="signInCode" jdbcType="VARCHAR" />
+
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, activity_title, activity_carousel_img, activity_content, sort, 
     sign_up_count, sign_up_max, view_count, registration_start_time, registration_end_time, 
     activity_start_time, activity_end_time, status, create_user, create_date, update_user, 
-    update_date
+    update_date,sign_in_code
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap">
     select
@@ -45,14 +47,14 @@
       registration_start_time, registration_end_time, 
       activity_start_time, activity_end_time, 
       status, create_user, create_date, 
-      update_user, update_date)
+      update_user, update_date,sign_in_code,sign_in_code,sign_in_code)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{activityTitle,jdbcType=VARCHAR}, 
       #{activityCarouselImg,jdbcType=VARCHAR}, #{activityContent,jdbcType=LONGVARCHAR}, #{sort,jdbcType=INTEGER},
       #{signUpCount,jdbcType=INTEGER}, #{signUpMax,jdbcType=INTEGER}, #{viewCount,jdbcType=INTEGER}, 
       #{registrationStartTime,jdbcType=TIMESTAMP}, #{registrationEndTime,jdbcType=TIMESTAMP}, 
       #{activityStartTime,jdbcType=TIMESTAMP}, #{activityEndTime,jdbcType=TIMESTAMP}, 
       #{status,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
-      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},#{signInCode,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpActivity" >
     insert into tp_activity
@@ -111,6 +113,9 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="signInCode != null" >
+        sign_in_code
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -167,6 +172,9 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="signInCode != null" >
+        #{signInCode,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpActivity" >
@@ -223,6 +231,9 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="signInCode != null" >
+        sign_in_code = #{signInCode,jdbcType=VARCHAR}
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -244,7 +255,8 @@
       create_user = #{createUser,jdbcType=INTEGER},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
-      update_date = #{updateDate,jdbcType=TIMESTAMP}
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      sign_in_code = #{signInCode,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -290,4 +302,7 @@
     AND tr.community_id =#{communityId}
     order by a.create_date desc
   </select>
+  <select id="selectActivity" resultMap="BaseResultMap">
+    select * from tp_activity where id = #{activityId}
+  </select>
 </mapper>

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

@@ -149,4 +149,14 @@
     and ta_user_id = #{userID,jdbcType=INTEGER}
   </select>
 
+  <select id="toSignUp" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from
+    tp_activity_sign_in
+    where
+    activity_id = #{activityId,jdbcType=INTEGER}
+    and ta_user_id = #{userVerifyId,jdbcType=INTEGER}
+    and community_id = #{communityId,jdbcType=INTEGER}
+  </select>
 </mapper>