Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

# Conflicts:
#	src/main/resources/application.yml

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v.0.01</version>
+	<version>v0.0.2</version>
 	<name>estateagents</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/controller/TaCheckinController.java

@@ -36,7 +36,7 @@ import java.util.List;
  * @since 2019-07-24
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaCheckinController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaCheckinController.class);
@@ -53,14 +53,14 @@ public class TaCheckinController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taCheckin",method= RequestMethod.GET)
+    @RequestMapping(value="/taCheckin/activity/{activity}",method= RequestMethod.GET)
     public ResponseBean taCheckinList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,String activity){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaCheckin> pg = new Page<>(pageNum, pageSize);
-            IPage<TaCheckin> result = iTaCheckinService.getUndisplayedCustomerList(pg);
+            IPage<TaCheckin> result = iTaCheckinService.getUndisplayedCustomerList(pg,activity);
             for (int i = 0;i<result.getRecords().size();i++){
                 result.getRecords().get(i).setStatus(1);
             }
@@ -87,18 +87,26 @@ public class TaCheckinController extends BaseController {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        TaCheckin taCheckin = new TaCheckin();
-        taCheckin.setStatus(0);
-        taCheckin.setActivity(activity);
-        taCheckin.setName(person.getNickname());
-        taCheckin.setAvatar(person.getAvatarurl());
-        taCheckin.setCheckinTime(LocalDateTime.now());
+
+
         try {
-            if (iTaCheckinService.save(taCheckin)){
-                responseBean.success(taCheckin);
+            if(iTaCheckinService.isCustomerChecked(activity,person.getPersonId())>0){
+                ResponseBean.success("您已签到过此活动");
             }else {
-                responseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
+                TaCheckin taCheckin = new TaCheckin();
+                taCheckin.setStatus(0);
+                taCheckin.setPersonId(person.getPersonId());
+                taCheckin.setActivity(activity);
+                taCheckin.setName(person.getNickname());
+                taCheckin.setAvatar(person.getAvatarurl());
+                taCheckin.setCheckinTime(LocalDateTime.now());
+                if (iTaCheckinService.save(taCheckin)){
+                    responseBean.success(taCheckin);
+                }else {
+                    responseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
+                }
             }
+
         }catch (Exception e){
             logger.error("taCheckinAdd -=- {}",e.toString());
             responseBean.error("保存失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/huiju/estateagents/entity/TaCheckin.java

@@ -34,6 +34,11 @@ public class TaCheckin implements Serializable {
      */
     private String name;
 
+    /**
+     * 签到人id
+     */
+    private String personId;
+
     /**
      * 签到时间
      */

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -16,7 +16,8 @@ public class AccessInterceptor implements HandlerInterceptor {
     private String[] whiteList = {
             "/wx/chat", // 聊天暂时不鉴权
             "/api/wx/login",
-            "/api/admin/signin"
+            "/api/admin/signin",
+            "/api/taCheckin/activity"
     };
 
     /*

src/main/java/com/huiju/estateagents/mapper/TaCheckinMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaCheckin;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,6 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaCheckinMapper extends BaseMapper<TaCheckin> {
-    IPage<TaCheckin>getUndisplayedCustomerList(IPage<TaCheckin> pg);
+    IPage<TaCheckin>getUndisplayedCustomerList(IPage<TaCheckin> pg, @Param("activity")String activity);
+    Integer isCustomerChecked(@Param("activity")String activity,@Param("personId")String personId);
 
 }

src/main/java/com/huiju/estateagents/service/ITaCheckinService.java

@@ -14,6 +14,7 @@ import com.huiju.estateagents.entity.TaCheckin;
  * @since 2019-07-24
  */
 public interface ITaCheckinService extends IService<TaCheckin> {
-    IPage<TaCheckin> getUndisplayedCustomerList(IPage<TaCheckin> pg);
+    IPage<TaCheckin> getUndisplayedCustomerList(IPage<TaCheckin> pg,String activity);
+    Integer isCustomerChecked(String activity,String personId);
 
 }

src/main/java/com/huiju/estateagents/service/impl/TaCheckinServiceImpl.java

@@ -22,8 +22,13 @@ public class TaCheckinServiceImpl extends ServiceImpl<TaCheckinMapper, TaCheckin
     TaCheckinMapper taCheckinMapper;
 
     @Override
-    public IPage<TaCheckin> getUndisplayedCustomerList(IPage<TaCheckin> pg){
-        return taCheckinMapper.getUndisplayedCustomerList(pg);
+    public IPage<TaCheckin> getUndisplayedCustomerList(IPage<TaCheckin> pg,String activity){
+        return taCheckinMapper.getUndisplayedCustomerList(pg,activity);
+    }
+
+    @Override
+    public Integer isCustomerChecked(String activity,String personId){
+        return taCheckinMapper.isCustomerChecked(activity,personId);
     }
 
 }

src/main/resources/mapper/TaCheckinMapper.xml

@@ -8,6 +8,17 @@
         ta_checkin
         WHERE
         STATUS < 1
+        AND activity = #{activity}
+    </select>
+
+    <select id="isCustomerChecked" resultType="com.huiju.estateagents.entity.TaCheckin">
+        SELECT
+        count(1)
+        FROM
+        ta_checkin
+        WHERE
+        activity = #{activity}
+        AND person_id = #{personId}
     </select>
 
 </mapper>