小程序活动报名接口修改

src/main/java/platform/modules/api/web/ActivityOpenController.java

@@ -198,11 +198,19 @@ public class ActivityOpenController extends BaseController {
 
         List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone, userId);
         if (!CollectionUtils.isEmpty(activityRegistrationList)) {
-            List<String> ids = new ArrayList<>();
+            List<String> abortIds = new ArrayList<>();
+            List<String> oldIds = new ArrayList<>();
             for (ActivityRegistration activityRegistration : activityRegistrationList) {
-                ids.add(activityRegistration.getId() + "");
+                if (Objects.equals(activityRegistration.getReview_state(), "3")) {
+                    oldIds.add(activityRegistration.getId() + "");
+                } else if (Objects.equals(activityRegistration.getReview_state(), "0")) {
+                    abortIds.add(activityRegistration.getId() + "");
+                }
             }
-            activityRegistrationService.adortRegister(ids);
+            //删除旧的报名数据
+            activityRegistrationService.deleteBatch(oldIds);
+            //把最新的标记为取消
+            activityRegistrationService.abortRegister(abortIds);
         }
         return ResponseMessage.success("操作成功！");
     }

src/main/java/platform/modules/carrier/web/api/WeChatApiController.java

@@ -527,7 +527,7 @@ public class WeChatApiController extends BaseController {
     @PostMapping("/abort")
     public Object quert(@RequestBody List<String> ids) {
 //        List<String> idList = Arrays.asList(ids);
-        activityRegistrationService.adortRegister(ids);
+        activityRegistrationService.abortRegister(ids);
         return ResponseMessage.success("取消成功");
     }
 

src/main/java/platform/modules/government/web/MyActivityController.java

@@ -108,7 +108,7 @@ public class MyActivityController extends BaseController {
     @ResponseBody
     public Object quert(@RequestParam(value = "ids[]") String[] ids){
         List<String> idList = Arrays.asList(ids);
-        activityRegistrationService.adortRegister(idList);
+        activityRegistrationService.abortRegister(idList);
         return ResponseMessage.success("取消成功");
     }
 }

src/main/java/platform/modules/home/web/PersonalCenterController.java

@@ -60,7 +60,7 @@ public class PersonalCenterController extends BaseController {
      */
     @PostMapping("/abort")
     public Object quert(@RequestBody List<String> ids){
-        activityRegistrationService.adortRegister(ids);
+        activityRegistrationService.abortRegister(ids);
         return ResponseMessage.success("操作成功");
     }
 

src/main/java/platform/modules/sys/dao/ActivityRegistrationDao.java

@@ -33,7 +33,7 @@ public interface ActivityRegistrationDao extends BaseMapper<ActivityRegistration
 
     List<ActivityRegistrationExports> findRegistrationExport(@Param("activityId") Integer activityId, @Param("userId") Integer userId);
 
-    void adortRegister(@Param("list") List<String> ids);
+    void abortRegister(@Param("list") List<String> ids);
 
     List<ActivityRegistration> getActivityRegistration(@Param("activityId") String activityId, @Param("userId") String userId);
 
@@ -48,4 +48,6 @@ public interface ActivityRegistrationDao extends BaseMapper<ActivityRegistration
     List<ActivityDetail> findPushActivity(Integer userId);
 
     List<ActivityDetail> findCollectionActivity(Integer userId);
+
+    void deleteBatch(@Param("ids") List<String> ids);
 }

src/main/java/platform/modules/sys/service/ActivityRegistrationService.java

@@ -7,11 +7,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import platform.common.Constant;
 import platform.common.base.service.BaseService;
 import platform.common.util.AlibabaSMSUtil;
 import platform.common.util.ShiroUtils;
 import platform.modules.carrier.dto.ActivityStatistic;
+import platform.modules.government.dto.BatchDto;
 import platform.modules.government.entity.Attachment;
 import platform.modules.government.entity.FileDown;
 import platform.modules.government.entity.User;
@@ -382,8 +384,8 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
      *
      * @param ids
      */
-    public void adortRegister(List<String> ids) {
-        activityRegistrationDao.adortRegister(ids);
+    public void abortRegister(List<String> ids) {
+        activityRegistrationDao.abortRegister(ids);
     }
 
     /**
@@ -463,4 +465,10 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
         }
         return statistics;
     }
+
+    public void deleteBatch(List<String> ids) {
+        if (!CollectionUtils.isEmpty(ids)) {
+            activityRegistrationDao.deleteBatch(ids);
+        }
+    }
 }

src/main/resources/mapper/sys/ActivityRegistrationDao.xml

@@ -394,7 +394,7 @@
             zuser.name,reg.create_time desc
     </select>
 
-    <update id="adortRegister">
+    <update id="abortRegister">
         UPDATE ac_activity_registration SET review_state = 3 WHERE id IN
         <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
             #{id}
@@ -523,4 +523,11 @@
         AND ad.del_flag = 0
         AND af.user_id = #{userId}
     </select>
+
+    <update id="deleteBatch">
+        UPDATE ac_activity_registration SET del_flag = true where id in
+        <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </update>
 </mapper>