修复留言bug

src/main/java/com/share/help/controller/ActivityController.java

@@ -74,10 +74,10 @@ public class ActivityController {
      * @return 返回报名结果
      */
     @PostMapping(Constants.ACTIVITY_INTERFACE_APPLY)
-    public JSONResponse<DefaultRes,Void> apply(ApplyActivityForm activityForm,@CookieValue(Constants.USER_COOKIE) String userId){
+    public JSONResponse<DefaultRes,Void> apply(UpdateActivityForm updateActivityForm,@CookieValue(Constants.USER_COOKIE) String userId){
-        if(StringUtils.isNotEmpty(userId)&&ObjectUtils.allNotNull(activityForm.getActivityId(),activityForm.getActivityStatus())){
+        if(StringUtils.isNotEmpty(userId)&&ObjectUtils.allNotNull(updateActivityForm.getActivityId(),updateActivityForm.getActivityStatus())){
-            activityForm.setUserId(userId);
+            updateActivityForm.setUserId(userId);
-            return activityService.apply(activityForm);
+            return activityService.apply(updateActivityForm);
         }else{
             return new JSONResponse<>(DefaultRes.fail,Result.FAIL);
         }

src/main/java/com/share/help/form/ApplyActivityForm.java

@@ -1,9 +0,0 @@
-package com.share.help.form;
-
-/**
- * 报名活动表单
- */
-public class ApplyActivityForm extends UpdateActivityForm{
-
-}
-

src/main/java/com/share/help/form/UpdateActivityForm.java

@@ -3,7 +3,7 @@ package com.share.help.form;
 /**
  * 改变活动状态
  */
-public abstract class UpdateActivityForm {
+public  class UpdateActivityForm {
     //活动id
     private Long activityId;
     //用户id

src/main/java/com/share/help/service/ActivityService.java

@@ -113,7 +113,7 @@ public class ActivityService{
      * @return 返回报名结果
      */
     @Transactional
-    public JSONResponse<DefaultRes,Void> apply(ApplyActivityForm activityForm){
+    public JSONResponse<DefaultRes,Void> apply(UpdateActivityForm activityForm){
 //        保存到活动历史记录
         ActivityHistoryEntity activityEntity=new ActivityHistoryEntity();
         activityEntity.setActivityId(activityForm.getActivityId());
@@ -127,7 +127,7 @@ public class ActivityService{
 
 //        给求助用户发送留言
         LeaveWordEntity leaveWordEntity=new LeaveWordEntity();
-        leaveWordEntity.setType(LeaveWordType.apply.name());
+        leaveWordEntity.setType(activityForm.getActivityStatus().toString());
         leaveWordEntity.setSourceUserId(activityForm.getUserId());
         ActivityEntity activity=activityMapper.findOne(activityForm.getActivityId());
         if(activity==null){

src/main/java/com/share/help/service/LeaveWordService.java

@@ -28,6 +28,11 @@ public class LeaveWordService {
     @Autowired
     private ActivityMapper activityMapper;
 
+    /**
+     * 查询留言
+     * @param findLeaveWordForm 查询条件
+     * @return 返回留言列表
+     */
     public JSONResponse<DefaultRes, Page<List<LeaveWordRes>>> query(FindLeaveWordForm findLeaveWordForm){
         Page<List<LeaveWordRes>> listPage=leaveWordMapper.count(pageSize,findLeaveWordForm.getUserId());
         List<LeaveWordRes> leaveWordRes=leaveWordMapper.select((findLeaveWordForm.getCurrentPage()-1)*pageSize,pageSize,findLeaveWordForm.getUserId());