合并

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

@@ -188,11 +188,11 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, name = "helpActivityId", paramType = "query",value = "助力ID"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query",value = "status: 0助力成功，1进行中，2助力失败")
     })
-    @RequestMapping(value="admin/top/update",method= RequestMethod.GET)
+    @RequestMapping(value="admin/helpRecord",method= RequestMethod.GET)
     public ResponseBean helpRecord(@RequestParam(value ="helpActivityId",required = false) Integer helpActivityId,
                                    @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                   @RequestParam(value ="status",required = false) Integer status){
+                                   @RequestParam(value ="status",required = false) String status){
         ResponseBean helpRecord = taHelpActivityService.helpRecord(helpActivityId,status, pageNum, pageSize);
         return helpRecord;
     }
@@ -210,4 +210,18 @@ public class HelpActivityController extends BaseController {
         ResponseBean helpRecord = taHelpActivityService.taHelpRecordDetails(helpRecordInitiateId, pageNum, pageSize);
         return helpRecord;
     }
+
+    @ApiOperation(value = "核销", notes = "核销")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "helpRecordInitiateId", paramType = "query",value = "发起助力ID"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "verifyCode", paramType = "query",value = "核销码"),
+    })
+    @RequestMapping(value="admin/helpInitiateRecordVerify/",method= RequestMethod.POST)
+    public ResponseBean helpInitiateRecordVerify(@RequestParam(value ="helpRecordInitiateId",required = false) Integer helpRecordInitiateId,
+                                                 @RequestParam(value ="verifyCode",required = false) Integer verifyCode){
+        ResponseBean helpRecord = taHelpActivityService.helpInitiateRecordVerify(helpRecordInitiateId,verifyCode);
+        return helpRecord;
+    }
 }

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

@@ -102,7 +102,11 @@ public class HelpInitiateRecord implements Serializable {
      * 助力
      */
     @TableField(exist = false)
-    private Integer helpCount;
-
+    private int helpCount;
 
+    /**
+     * 当前活动助力所需要的人数
+     */
+    @TableField(exist = false)
+    private int persionNumCount;
 }

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

@@ -1,9 +1,12 @@
 package com.huiju.estateagents.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,5 +19,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface HelpInitiateRecordMapper extends BaseMapper<HelpInitiateRecord> {
 
-
+    /**
+     * 助力记录（成功，进行中，失败）
+     * @param pg
+     * @param helpActivityId
+     * @param status
+     * @return
+     */
+    IPage<HelpInitiateRecord> selectPageList(IPage<HelpInitiateRecord> pg, @Param("helpActivityId") Integer helpActivityId, @Param("status") String status);
 }

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

@@ -48,7 +48,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param helpActivityId
      * @return
      */
-    ResponseBean helpRecord(Integer helpActivityId,int status,Integer pageNum,Integer pageSize);
+    ResponseBean helpRecord(Integer helpActivityId,String status,Integer pageNum,Integer pageSize);
 
     /**
      * 当前发起人的助力人数
@@ -58,4 +58,12 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @return
      */
     ResponseBean taHelpRecordDetails(Integer helpRecordInitiateId, Integer pageNum, Integer pageSize);
+
+    /**
+     * 验证核销码是否正确
+     * @param helpRecordInitiateId
+     * @param verifyCode
+     * @return
+     */
+    ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, Integer verifyCode);
 }

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

@@ -62,42 +62,40 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean helpRecord(Integer helpActivityId, int status,Integer pageNum,Integer pageSize) {
+    public ResponseBean helpRecord(Integer helpActivityId, String status,Integer pageNum,Integer pageSize) {
         ResponseBean responseBean = new ResponseBean<>();
-        //  status 0助力成功，1进行中，2助力失败
+        //  status: helpSucceed助力成功，helpUnderway进行中，helpUnfinished助力失败
 
         //查询当前助力成功所需的人数限制（persion_num）
         HelpActivity helpActivity = taHelpActivityMapper.selectById(helpActivityId);
         // 得到活动限制助力的总数
         int persionNumCount = helpActivity.getPersionNum();
         IPage<HelpInitiateRecord> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<HelpInitiateRecord> helpInitiateRecordQuery = new QueryWrapper<>();
-        helpInitiateRecordQuery.eq("help_activity_id", helpActivityId);
-        IPage<HelpInitiateRecord> list = helpInitiateRecordMapper.selectPage(pg,helpInitiateRecordQuery);
+        IPage<HelpInitiateRecord> list = helpInitiateRecordMapper.selectPageList(pg,helpActivityId,status);
 
         List<HelpInitiateRecord>  helpInitiateRecordList= list.getRecords();
         for (HelpInitiateRecord helpInitiateRecord : helpInitiateRecordList) {
-
+            helpInitiateRecord.setPersionNumCount(persionNumCount);
             // 统计助力成功的总数(发起人得到助力数满了即可)
             QueryWrapper<HelpRecord> helpRecorddQueryWrapper = new QueryWrapper<>();
-            helpRecorddQueryWrapper.eq("help_record_initiate_id", helpInitiateRecord.getHelpActivityId());
+            helpRecorddQueryWrapper.eq("help_record_initiate_id", helpInitiateRecord.getHelpRecordInitiateId());
             // 拿到每个发起人，得到助力的总数
             int helpRecordCount = helpRecordMapper.selectCount(helpRecorddQueryWrapper);
             // 助力成功
-            if (0 == status) {
+            if ("helpSucceed".equals(status)) {
                 if (persionNumCount == helpRecordCount) {
                     helpInitiateRecord.setHelpCount(helpRecordCount);
                 }
             }
             // 助力进行中（活动进行中，未结束）
-            if (1 == status && "1".equals(helpActivity.getStatus())) {
+            if ("helpUnderway".equals(status) && "1".equals(helpActivity.getStatus())) {
                 if (persionNumCount > helpRecordCount) {
                     helpInitiateRecord.setHelpCount(helpRecordCount);
                 }
             }
             // 活动助力失败
             // 活动进行中（活动已结束）
-            if (2 == status && "2".equals(helpActivity.getStatus())) {
+            if ("helpUnfinished".equals(status) && "2".equals(helpActivity.getStatus())) {
                 if (persionNumCount > helpRecordCount) {
                     helpInitiateRecord.setHelpCount(helpRecordCount);
                 }
@@ -120,4 +118,22 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
         responseBean.addSuccess(helpRecordList);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, Integer verifyCode) {
+        ResponseBean responseBean = new ResponseBean<>();
+        HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecordInitiateId);
+        // 判断是否已核销
+        if ("1".equals(helpInitiateRecord.getVerificationStatus())){
+            responseBean.addSuccess("已核销");
+            return responseBean;
+        }
+
+        if (helpInitiateRecord.getVerification().equals(verifyCode)){
+            responseBean.addSuccess("成功");
+        }else {
+            responseBean.addError("核销码错误");
+        }
+        return responseBean;
+    }
 }

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -1,5 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.HelpInitiateRecordMapper">
+    <select id="selectPageList" resultType="com.huiju.estateagents.entity.HelpInitiateRecord">
+        SELECT
+        hi.*
+        FROM
+        ta_help_initiate_record as hi
+        LEFT JOIN ta_help_activity ha ON hi.help_activity_id = ha.help_activity_id
+       <where>
+           hi.help_activity_id = #{helpActivityId}
+        <if test="status == 'helpSucceed'">
+            AND hi.verification !='null'
+            AND hi.verification !=''
+        </if>
+       <if test="status == 'helpUnderway'">
+           and (hi.verification = 'null' OR hi.verification = '')
+           AND ha.`status` = 1
+       </if>
 
+       <if test="status == 'helpUnfinished '">
+           and (hi.verification = 'null' OR hi.verification = '')
+           AND ha.`status` = 2
+       </if>
+       </where>
+    </select>
 </mapper>