PC活动报名修改

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

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*;
 import platform.common.Constant;
 import platform.common.annotation.OperationLog;
 import platform.common.base.controller.BaseController;
+import platform.common.util.CommonUtils;
 import platform.common.util.ShiroUtils;
 import platform.modules.build.entity.Company;
 import platform.modules.build.service.CompanyService;
@@ -141,6 +142,7 @@ public class ActivityOpenController extends BaseController {
         log.info("活动报名");
 
         Integer id = paramRegistration.getRegistrationList().get(0).getActivity_id();
+        Integer userId = paramRegistration.getRegistrationList().get(0).getUser_id();
         ActivityDetail activityDetail = activityService.findById(id);
         String quota = activityDetail.getActivity_quota();
         String isReview = activityDetail.getIs_review();
@@ -166,6 +168,7 @@ public class ActivityOpenController extends BaseController {
                 }
                 return ResponseMessage.error("手机号码为:" + phone + "的用户已报名");
             }
+            activityRegistrationService.deleteOldCancelRegist(String.valueOf(id), null, String.valueOf(userId));
             for (ActivityRegistration registration : registrationList) {
 //                if (registration.getId() == null) {
                 activityRegistrationService.saveActivityRegistration(registration);
@@ -195,23 +198,7 @@ public class ActivityOpenController extends BaseController {
     public ResponseMessage cancelRegist(@RequestParam("activity_id") String id,
                                         @RequestParam(value = "phone", required = false) String phone,
                                         @RequestParam("user_id") String userId) {
-
-        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone, userId);
-        if (!CollectionUtils.isEmpty(activityRegistrationList)) {
-            List<String> abortIds = new ArrayList<>();
-            List<String> oldIds = new ArrayList<>();
-            for (ActivityRegistration activityRegistration : activityRegistrationList) {
-                if (Objects.equals(activityRegistration.getReview_state(), "3")) {
-                    oldIds.add(activityRegistration.getId() + "");
-                } else if (Objects.equals(activityRegistration.getReview_state(), "0")) {
-                    abortIds.add(activityRegistration.getId() + "");
-                }
-            }
-            //删除旧的报名数据
-            activityRegistrationService.deleteBatch(oldIds);
-            //把最新的标记为取消
-            activityRegistrationService.abortRegister(abortIds);
-        }
+        activityRegistrationService.cancelRegist(id, phone, userId);
         return ResponseMessage.success("操作成功！");
     }
 
@@ -308,10 +295,13 @@ public class ActivityOpenController extends BaseController {
         List<ActivityRegistration> ret = activityRegistrationService.findListByWhere(activityRegistration);
         Iterator<ActivityRegistration> it = ret.iterator();
         while (it.hasNext()) {
-            if (Objects.equals(it.next().getReview_state(), "3"))
+            if (Objects.equals(it.next().getReview_state(), "3")) {
                 it.remove();
+            }
+        }
+        if (CollectionUtils.isEmpty(ret)) {
+            return ResponseMessage.success("查询成功!");
         }
-        if (CollectionUtils.isEmpty(ret)) return ResponseMessage.success("查询成功!");
         return ResponseMessage.success("查询成功!", ret.get(0));
     }
 

src/main/java/platform/modules/home/HomeController.java

@@ -519,6 +519,7 @@ public class HomeController extends BaseController {
         log.info("活动报名");
 
         Integer id = paramRegistration.getRegistrationList().get(0).getActivity_id();
+        Integer userId = paramRegistration.getRegistrationList().get(0).getUser_id();
         ActivityDetail activityDetail = activityService.findById(id);
         String quota = activityDetail.getActivity_quota();
         String isReview = activityDetail.getIs_review();
@@ -537,6 +538,7 @@ public class HomeController extends BaseController {
 
         List<ActivityRegistration> registrationList = paramRegistration.getRegistrationList();
         if (!CollectionUtils.isEmpty(registrationList)) {
+            activityRegistrationService.deleteOldCancelRegist(String.valueOf(id), null, String.valueOf(userId));
             for (ActivityRegistration registration : registrationList) {
                 if (registration.getId() == null) {
                     activityRegistrationService.saveActivityRegistration(registration);

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

@@ -8,9 +8,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.RequestParam;
 import platform.common.Constant;
 import platform.common.base.service.BaseService;
 import platform.common.util.AlibabaSMSUtil;
+import platform.common.util.CommonUtils;
 import platform.common.util.ShiroUtils;
 import platform.modules.carrier.dto.ActivityStatistic;
 import platform.modules.government.dto.BatchDto;
@@ -26,6 +28,7 @@ import platform.modules.sys.entity.ActivityRegistration;
 import platform.modules.sys.entity.ActivityReview;
 import platform.modules.sys.report.ActivityRegistrationExports;
 import platform.modules.sys.report.ActivitySignExports;
+import platform.modules.sys.web.ResponseMessage;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -140,8 +143,9 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
             }*/
 
         }
-        if (activityRegistration.getId() != null)
+        if (activityRegistration.getId() != null) {
             return this.updateSelective(activityRegistration);
+        }
         return this.saveSelective(activityRegistration);
     }
 
@@ -279,6 +283,8 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
             relationId = ShiroUtils.getCompanyId().toString();
         } else if (Objects.equals(Constant.UserType.PERSONAL, userType)) {
             relationId = ShiroUtils.getUserId().toString();
+        } else if (Objects.equals(Constant.UserType.WECHAT, userType)) {
+            relationId = ShiroUtils.getUserId().toString();
         }
         return activityRegistrationDao.findByRelationIdAndType(userType.toString(), relationId, activity_id);
     }
@@ -471,4 +477,38 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
             activityRegistrationDao.deleteBatch(ids);
         }
     }
+
+    public void deleteOldCancelRegist(String id, String phone, String userId) {
+        List<ActivityRegistration> activityRegistrationList = this.getCurrRegUsers(id, phone, userId);
+        if (!CollectionUtils.isEmpty(activityRegistrationList)) {
+            List<String> oldIds = new ArrayList<>();
+            for (ActivityRegistration activityRegistration : activityRegistrationList) {
+                if (Objects.equals(activityRegistration.getReview_state(), "3")) {
+                    oldIds.add(activityRegistration.getId() + "");
+                }
+            }
+            if (CommonUtils.isNotNull(oldIds)) {
+                //删除旧的报名数据
+                this.deleteBatch(oldIds);
+            }
+        }
+    }
+
+    public void cancelRegist(String id, String phone, String userId) {
+        List<ActivityRegistration> activityRegistrationList = this.getCurrRegUsers(id, phone, userId);
+        if (!CollectionUtils.isEmpty(activityRegistrationList)) {
+            List<String> abortIds = new ArrayList<>();
+            for (ActivityRegistration activityRegistration : activityRegistrationList) {
+                if (Objects.equals(activityRegistration.getReview_state(), "0")) {
+                    abortIds.add(activityRegistration.getId() + "");
+                }
+            }
+            if (CommonUtils.isNotNull(abortIds)) {
+                //删除旧的报名数据
+                this.deleteOldCancelRegist(id, phone, userId);
+                //把最新的标记为取消
+                this.abortRegister(abortIds);
+            }
+        }
+    }
 }

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

@@ -658,7 +658,7 @@ public class ActivityService extends BaseService<ActivityDetail> {
 //        ActivityDetail detail = this.findById(id);
         ActivityDetail detail = activityDetailDao.findByActivityId(id);
 
-        PageHelper.startPage(pageNum, 5);
+        PageHelper.startPage(pageNum, 999);
         List<ActivityRegistration> registrations =
                 activityRegistrationService.getActivityRegistration(id + "", ShiroUtils.getUserId() + "");
         ActivityOrderDetail orderDetail = new ActivityOrderDetail();

src/main/java/platform/modules/sys/web/FileUploadController.java

@@ -53,7 +53,7 @@ public class FileUploadController extends BaseController {
     private static final String[] IMAGE_TYPE = new String[]{".gif", ".jpeg", ".bmp", ".jpg", ".png"};
 
     // 允许上传文件的格式
-    private static final String[] DOC_TYPE = new String[]{".doc", ".docx", ".ppt", ".pptx", ".pdf", ".xls", ".xlsx", ".gif", ".jpeg", ".bmp", ".jpg", ".png", ".txt", ".rar", ".zip", ".7z", ".flv"};
+    private static final String[] DOC_TYPE = new String[]{".doc", ".docx", ".ppt", ".pptx", ".pdf", ".xls", ".xlsx", ".gif", ".jpeg", ".bmp", ".jpg", ".png", ".txt", ".rar", ".zip", ".7z", ".flv", ".ofd"};
 
     //private static final String FILE_SERVER_URL = "http://172.18.1.101:8080/file/upload/";
 

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

@@ -673,9 +673,9 @@
         ad.id,
         ad.activity_title,
         ad.activity_starttime,
-        (SELECT COUNT(ar.id) FROM ac_activity_registration ar WHERE ar.activity_id = ad.id AND ar.user_id =
+        (SELECT COUNT(ar.id) FROM ac_activity_registration ar WHERE ar.del_flag = 0 and review_state != '3' and ar.activity_id = ad.id AND ar.user_id =
         #{condition.user_id} ) AS registration_number,
-        (SELECT COUNT(ar.id) FROM ac_activity_registration ar WHERE ar.activity_id = ad.id AND ar.user_id =
+        (SELECT COUNT(ar.id) FROM ac_activity_registration ar WHERE ar.del_flag = 0 and ar.activity_id = ad.id AND ar.user_id =
         #{condition.user_id} AND review_state = 1) AS registration_success_number,
         IF(ad.activity_starttime > now() , 1,
         IF(ad.activity_endtime <![CDATA[ >= ]]> now() ,2,