前台代码优化

donate-service/src/main/java/com/uas/service/donate/controller/ActiveCenterController.java

@@ -22,38 +22,47 @@ public class ActiveCenterController {
     @Autowired
     private ActivityService activityService;
 
-    @RequestMapping(value = "/activeCenter",method = RequestMethod.GET)
+    /**
+     * 返回一元捐活动列表freemarker页面
+     * @param modelMap
+     * @param status
+     * @param search
+     * @param page
+     * @param size
+     * @return
+     */
+    @RequestMapping(value = "/activeCenter", method = RequestMethod.GET)
     public String returnActivity(ModelMap modelMap,
-                                 @RequestParam(value = "status",defaultValue = "全部") String status,
-                                 @RequestParam(value = "search",required = false)String search,
+                                 @RequestParam(value = "status", defaultValue = "全部") String status,
+                                 @RequestParam(value = "search", required = false) String search,
                                  @RequestParam(value = "page", defaultValue = "0") int page,
-                                 @RequestParam(value = "size", defaultValue = "7") int size){
+                                 @RequestParam(value = "size", defaultValue = "7") int size) {
         //得到历史参与总人数
         Long historyPerson = projectRecodeService.historyPerson();
         //得到历史参与总捐款额
         Double totality = projectRecodeService.totality();
 
-        PageRequest pageable=new PageRequest(page,size);
+        PageRequest pageable = new PageRequest(page, size);
 
         //根据活动状态查询出所有活动
-        if("进行中".equals(status)){
-             Page<Activity> activities=activityService.findInProcess(pageable);
-             modelMap.put("page",activities);
-        }else if("已结束".equals(status)){
-            Page<Activity> activities=activityService.findEndActivities(pageable);
-            modelMap.put("page",activities);
-        }else if("全部".equals(status)){
-            Page<Activity> activities=activityService.findAll(pageable);
-            modelMap.put("page",activities);
+        if ("进行中".equals(status)) {
+            Page<Activity> activities = activityService.findInProcess(pageable);
+            modelMap.put("page", activities);
+        } else if ("已结束".equals(status)) {
+            Page<Activity> activities = activityService.findEndActivities(pageable);
+            modelMap.put("page", activities);
+        } else if ("全部".equals(status)) {
+            Page<Activity> activities = activityService.findAll(pageable);
+            modelMap.put("page", activities);
         }
 
-        if(search!=null){
-            Page<Activity> activities=activityService.search(search,pageable);
-            modelMap.put("page",activities);
+        if (search != null) {
+            Page<Activity> activities = activityService.search(search, pageable);
+            modelMap.put("page", activities);
         }
 
-        modelMap.put("historyPerson",historyPerson);
-        modelMap.put("totality",totality);
+        modelMap.put("historyPerson", historyPerson);
+        modelMap.put("totality", totality);
 
         return "activeCenter";
     }

donate-service/src/main/java/com/uas/service/donate/controller/ActivityController.java

@@ -13,11 +13,9 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -38,7 +36,7 @@ public class ActivityController {
      * @return
      */
     @ResponseBody
-    @RequestMapping("/getActivities")
+    @RequestMapping(value = "/getActivities",method = RequestMethod.GET)
     public List<Activity> getActivities(String status){
         List<Activity> activityList=new ArrayList<Activity>();
         if("进行中".equals(status)){
@@ -53,7 +51,7 @@ public class ActivityController {
      * 展示某具体活动
      */
     @ResponseBody
-    @RequestMapping("/detail/{id}")
+    @RequestMapping(value = "/detail/{id}",method = RequestMethod.GET)
     public Activity findById(@PathVariable("id") Long id){
         return activityService.fingById(id);
     }
@@ -62,23 +60,23 @@ public class ActivityController {
      *  搜索出所有正在进行的活动
      */
     @ResponseBody
-    @RequestMapping("/inprocessActivities")
+    @RequestMapping(value = "/inprocessActivities",method = RequestMethod.GET)
     public List<Activity> findInProcess(){
         return activityService.findInProcess();
     }
 
-    /**
+ /*   *//**
      * 分页，所有正在进行中的活动
      * @param page
      * @param size
      * @return
-     */
+     *//*
     @ResponseBody
     public Page<Activity> findInProcess(@RequestParam(defaultValue = "0")int page,
                                         @RequestParam(defaultValue = "7")int size){
         PageRequest pageRequest=new PageRequest(page,size);
         return  activityService.findInProcess(pageRequest);
-    }
+    }*/
 
     /**
      * 搜索出所有已结束的活动,当前时间大于活动结束时间
@@ -90,23 +88,24 @@ public class ActivityController {
         return activityService.findEndActivities();
     }
 
-
-    /**
+/*
+    *//**
      * 分页，查询所有进行中和已结束的活动
-     */
+     *//*
     @ResponseBody
     public Page<Activity> findAll(@RequestParam(defaultValue = "0")int page,
                                   @RequestParam(defaultValue = "7")int size){
         PageRequest pageRequest=new PageRequest(page,size);
         return activityService.findAll(pageRequest);
-    }
+    }*/
+
     /**
      * 计算与活动相关的项目筹集的总金额
      * @param id
      * @return
      */
     @ResponseBody
-    @RequestMapping("/sumMoney/{id}")
+    @RequestMapping(value = "/sumMoney/{id}",method = RequestMethod.GET)
     public ModelMap sumMoney(@PathVariable("id") Long id) {
         return new ModelMap("sum",activityService.sumMoney(id));
     }

donate-service/src/main/java/com/uas/service/donate/controller/ActivityRecodeController.java

@@ -7,6 +7,7 @@ import com.uas.service.donate.service.ActivityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.Date;
@@ -26,28 +27,17 @@ public class ActivityRecodeController {
      * 参与活动
      */
     @ResponseBody
-    @RequestMapping("/join")
+    @RequestMapping(value = "/join",method = RequestMethod.POST)
     public ActivityRecode join(Long activityId,Long uuid){
-        ActivityRecode activityRecode=new ActivityRecode();
-        activityRecode.setActivityId(activityId);
-        activityRecode.setUuid(uuid);
-        activityRecode.setStatus(0);
 
-        Activity activity=activityService.fingById(activityId);
-        //更新活动参与人数
-        Long joinAmount=activity.getJoinAmount();
-        joinAmount++;
-        activity.setJoinAmount(joinAmount);
-        activityService.save(activity);
-
-        return activityRecodeService.save(activityRecode);
+      return activityRecodeService.join(activityId,uuid);
     }
 
     /**
      *查询某一用户参加过的活动
      */
     @ResponseBody
-    @RequestMapping("/queryOne")
+    @RequestMapping(value = "/queryOne",method = RequestMethod.GET)
     public List<ActivityRecode> queryOne(Long uuid){
         return activityRecodeService.queryOne(uuid);
     }
@@ -59,7 +49,7 @@ public class ActivityRecodeController {
      * @return
      */
     @ResponseBody
-    @RequestMapping("/joins")
+    @RequestMapping(value = "/joins",method = RequestMethod.GET)
     public List<ActivityRecode> joins(Long activityId){
 
         return activityRecodeService.joins(activityId);
@@ -69,22 +59,10 @@ public class ActivityRecodeController {
      * 领奖  1.未领取 2.已领取
      */
     @ResponseBody
-    @RequestMapping("/receive")
+    @RequestMapping(value = "/receive",method = RequestMethod.POST)
     public ActivityRecode receive(Long activityId,Long uuid){
 
-        ActivityRecode activityRecode=activityRecodeService.findOne(activityId,uuid);
-        activityRecode.setStatus(2);
-        activityRecode.setReceiveTime(new Date());
-        //找到领奖的活动
-        Activity activity=activityService.fingById(activityId);
-        //重新设置当前活动领奖总人数
-        Integer receivePerson=activity.getReceivePerson();
-        receivePerson++;
-        activity.setReceivePerson(receivePerson);
-        //保存活动
-        activityService.save(activity);
-
-        return activityRecodeService.save(activityRecode);
+        return activityRecodeService.receive(activityId,uuid);
     }
 
 }

donate-service/src/main/java/com/uas/service/donate/controller/AppController.java

@@ -37,7 +37,7 @@ public class AppController {
      * 返回移动端首页轮播图
      */
     @ResponseBody
-    @RequestMapping("/appIndex")
+    @RequestMapping(value = "/appIndex",method = RequestMethod.GET)
     public ModelMap returnapp(){
         ModelMap modelMap=new ModelMap();
         Double totality=projectRecodeService.totality();
@@ -55,7 +55,7 @@ public class AppController {
      * 返回首页项目列表
      */
     @ResponseBody
-    @RequestMapping("/projects")
+    @RequestMapping(value = "/projects",method = RequestMethod.GET)
     public ModelMap returnProjects(@RequestParam(value="area",defaultValue = "0")String area,
                                    @RequestParam(value = "search",required = false)String search){
         ModelMap modelMap=new ModelMap();
@@ -74,7 +74,7 @@ public class AppController {
      * 获取活动列表
      */
     @ResponseBody
-    @RequestMapping("/activities")
+    @RequestMapping(value = "/activities",method = RequestMethod.GET)
     public ModelMap returnActivities(@RequestParam(value="status",defaultValue = "全部")String status,
                                      @RequestParam(value = "search",required = false)String search){
         ModelMap modelMap=new ModelMap();
@@ -94,7 +94,7 @@ public class AppController {
      * 传入用户UUID
      */
     @ResponseBody
-    @RequestMapping("/donateDetail/{uuid}")
+    @RequestMapping(value = "/donateDetail/{uuid}",method = RequestMethod.GET)
     public ModelMap projectRecodeList(@PathVariable("uuid") Long uuid){
         ModelMap modelMap=new ModelMap();
         List<ProjectRecode> projectRecodeList=projectRecodeService.findByuuid(uuid);
@@ -112,7 +112,7 @@ public class AppController {
      * 查询某一用户参与的活动
      */
     @ResponseBody
-    @RequestMapping("/joinActivity/{uuid}")
+    @RequestMapping(value = "/joinActivity/{uuid}",method = RequestMethod.GET)
     public ModelMap queryOne(@PathVariable("uuid")Long uuid){
         ModelMap modelMap=new ModelMap();
         List<ActivityRecode> activityRecodeList=activityRecodeService.queryOne(uuid);
@@ -127,7 +127,7 @@ public class AppController {
      * 个人中心列表
      */
     @ResponseBody
-    @RequestMapping("/center")
+    @RequestMapping(value = "/center",method = RequestMethod.GET)
     public ModelMap center(Long uuid){
         ModelMap modelMap=new ModelMap();
         //获取个人账户信息

donate-service/src/main/java/com/uas/service/donate/controller/AwardController.java

@@ -13,12 +13,13 @@ import java.util.List;
 @Controller
 @RequestMapping("/award")
 public class AwardController {
+
     @Autowired
     private AwardService awardService;
 
     @ResponseBody
     @RequestMapping("/getAwards")
-    public List<Award> getAwards(Long id){
+    public List<Award> getAwards(Long id) {
         return awardService.getAwards(id);
     }
 }

donate-service/src/main/java/com/uas/service/donate/controller/OrgController.java

@@ -34,7 +34,7 @@ public class OrgController {
     }
 
     @ResponseBody
-    @RequestMapping("/submit")
+    @RequestMapping(value = "/submit",method = RequestMethod.POST)
     public Org submit(String jsonStr, Map<String,String> orgAttaches)throws Exception{
         Org org=saveform(jsonStr,orgAttaches);
         org.setStatus(4);

donate-service/src/main/java/com/uas/service/donate/controller/ProjectConcludeController.java

@@ -1,6 +1,5 @@
 package com.uas.service.donate.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.uas.service.donate.model.ProjectConclude;
 import com.uas.service.donate.model.ProjectFinance;
 import com.uas.service.donate.service.ProjectConcludeService;
@@ -8,10 +7,10 @@ import com.uas.service.donate.service.ProjectFinanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 @Controller
@@ -30,7 +29,7 @@ public class ProjectConcludeController {
      * @return
      */
     @ResponseBody
-    @RequestMapping("/conclude")
+    @RequestMapping(value = "/conclude",method = RequestMethod.GET)
     public List<Object> getConclude(Long proId){
         List<ProjectConclude> projectConcludeList=projectConcludeService.findAll(proId);
         List<ProjectFinance> projectFinanceList=projectFinanceService.findAll(proId);

donate-service/src/main/java/com/uas/service/donate/controller/ProjectController.java

@@ -83,7 +83,7 @@ public class ProjectController {
      * @return
      */
     @ResponseBody
-    @RequestMapping("/findAll")
+    @RequestMapping(value = "/findAll",method = RequestMethod.GET)
     public List<Project> getProjects(){
         return projectService.findProjects();
     }
@@ -94,7 +94,7 @@ public class ProjectController {
      * @param size
      * @return
      */
-    @RequestMapping("/getProjects")
+    @RequestMapping(value = "/getProjects",method = RequestMethod.GET)
     @ResponseBody
     public Page<Project> findAll(@RequestParam(value = "page",defaultValue = "0")int page,
                                  @RequestParam(value = "size",defaultValue = "7")int size){
@@ -106,7 +106,7 @@ public class ProjectController {
      * 对领域和执行状态同时进行查询
      */
     @ResponseBody
-    @RequestMapping("/searchAreaAndStatus")
+    @RequestMapping(value = "/searchAreaAndStatus",method = RequestMethod.GET)
     public Page<Project> searchAreaAndStatus(String area,String status,int page,int size){
         Pageable pageable=new PageRequest(page,size);
         if("进行中".equals(status)){
@@ -121,7 +121,7 @@ public class ProjectController {
      * 根据项目状态获取列表
      */
     @ResponseBody
-    @RequestMapping("/status")
+    @RequestMapping(value = "/status",method = RequestMethod.GET)
     public Page<Project> findStatus(String status,int page ,int size){
         Pageable pageable=new PageRequest(page,size);
         if("进行中".equals(status)){
@@ -137,7 +137,7 @@ public class ProjectController {
      * 查询出所有执行中项目
      */
     @ResponseBody
-    @RequestMapping("/inprocess")
+    @RequestMapping(value = "/inprocess",method = RequestMethod.GET)
     public Page<Project> findInProcess(@RequestParam(value = "page",defaultValue = "0")int page,
                                        @RequestParam(value = "size",defaultValue = "7")int size){
         Pageable pageable=new PageRequest(page,size);
@@ -151,7 +151,7 @@ public class ProjectController {
      * @return
      */
     @ResponseBody
-    @RequestMapping("/endproject")
+    @RequestMapping(value = "/endproject",method = RequestMethod.GET)
     public Page<Project> findEndProject(@RequestParam(value = "page",defaultValue = "0")int page,
                                        @RequestParam(value = "size",defaultValue = "7")int size){
         Pageable pageable=new PageRequest(page,size);
@@ -164,7 +164,7 @@ public class ProjectController {
      * @return
      */
     @ResponseBody
-    @RequestMapping("/area")
+    @RequestMapping(value = "/area",method = RequestMethod.GET)
     public List<Project> findArea(String area){
         return projectService.findArea(area);
     }
@@ -173,7 +173,7 @@ public class ProjectController {
      *获取特定领域的项目分页
      */
     @ResponseBody
-    @RequestMapping("/pageArea")
+    @RequestMapping(value = "/pageArea",method = RequestMethod.GET)
     public Page<Project> findPageArea(@RequestParam(value = "page",defaultValue = "0")int page,
                                       @RequestParam(value = "size",defaultValue = "7")int size,
                                       String area){
@@ -188,7 +188,7 @@ public class ProjectController {
      * @return
      */
     @ResponseBody
-    @RequestMapping("/detail/{id}")
+    @RequestMapping(value = "/detail/{id}",method = RequestMethod.GET)
     public Project showDetail(@PathVariable("id") Long id) {
         return projectService.findOne(id);
     }
@@ -197,7 +197,7 @@ public class ProjectController {
      * 根据搜索框查找相应项目
      */
     @ResponseBody
-    @RequestMapping("/search")
+    @RequestMapping(value = "/search",method = RequestMethod.GET)
     public List<Project> search(String search){
         return projectService.search(search);
     }
@@ -207,7 +207,7 @@ public class ProjectController {
      * 根据搜索框查找相应项目
      */
     @ResponseBody
-    @RequestMapping("/searchPage")
+    @RequestMapping(value = "/searchPage",method = RequestMethod.GET)
     public Page<Project> searchPage(@RequestParam("search")String search,int page,int size){
         Pageable pageable=new PageRequest(page,size);
         return projectService.searchPage(pageable,search);

donate-service/src/main/java/com/uas/service/donate/controller/ProjectEvolveController.java

@@ -1,45 +1,28 @@
 package com.uas.service.donate.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.uas.service.donate.model.ProjectEvolve;
 import com.uas.service.donate.service.ProjectEvolveService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.Date;
 import java.util.List;
 
 @Controller
 @RequestMapping("/projectevolve")
 public class ProjectEvolveController {
+
     @Autowired
     private ProjectEvolveService projectEvolveService;
 
     //查找某项目所有的项目进度
     @ResponseBody
-    @RequestMapping("/getEvolves")
-    public List<ProjectEvolve> findAll(Long proId){
+    @RequestMapping( value = "/getEvolves",method = RequestMethod.GET)
+    public List<ProjectEvolve> findAll(@PathVariable("proId") Long proId){
         return projectEvolveService.findAll(proId);
     }
 
-   /* @ResponseBody
-    @RequestMapping("/save")
-    public ProjectEvolve save(String jsonStr){
-        ProjectEvolve projectEvolve= JSONObject.parseObject(jsonStr,ProjectEvolve.class);
-        //状态.1:保存2:提交
-        projectEvolve.setStatus(1);
-        projectEvolve.setSubmitTime(new Date());
-        return projectEvolveService.save(projectEvolve);
-    }
-
-    @ResponseBody
-    @RequestMapping("/submit")
-    public ProjectEvolve submit(String jsonStr){
-        ProjectEvolve projectEvolve= JSONObject.parseObject(jsonStr,ProjectEvolve.class);
-        projectEvolve.setStatus(2);
-        projectEvolve.setSubmitTime(new Date());
-        return projectEvolveService.save(projectEvolve);
-    }*/
 }

donate-service/src/main/java/com/uas/service/donate/controller/ProjectFinanceController.java

@@ -1,14 +1,14 @@
 package com.uas.service.donate.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.uas.service.donate.model.ProjectFinance;
 import com.uas.service.donate.service.ProjectFinanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.Date;
 import java.util.List;
 
 @Controller
@@ -23,28 +23,9 @@ public class ProjectFinanceController {
      * @return
      */
     @ResponseBody
-    @RequestMapping("/findAllFinance")
-    public List<ProjectFinance> findAll(Long proId){
+    @RequestMapping(value = "/findAllFinance/{proId}",method = RequestMethod.GET)
+    public List<ProjectFinance> findAll(@PathVariable("proId") Long proId){
         return projectFinanceService.findAll(proId);
     }
 
-
- /*   @ResponseBody
-    @RequestMapping("/save")
-    public ProjectFinance save(String jsonStr){
-        ProjectFinance projectFinance= JSONObject.parseObject(jsonStr,ProjectFinance.class);
-        //状态.1:保存2:提交
-        projectFinance.setStatus(1);
-        projectFinance.setSubmitTime(new Date());
-        return projectFinanceService.save(projectFinance);
-    }
-
-    @ResponseBody
-    @RequestMapping("/submit")
-    public ProjectFinance submit(String jsonStr){
-        ProjectFinance projectFinance= JSONObject.parseObject(jsonStr,ProjectFinance.class);
-        projectFinance.setStatus(2);
-        projectFinance.setSubmitTime(new Date());
-        return projectFinanceService.save(projectFinance);
-    }*/
 }

donate-service/src/main/java/com/uas/service/donate/controller/ProjectRecodeController.java

@@ -30,7 +30,7 @@ public class ProjectRecodeController {
      * @return
      */
     @ResponseBody
-    @RequestMapping("/joins")
+    @RequestMapping(value = "/joins",method = RequestMethod.GET)
     public List<ProjectRecode> joins(Long uuid){
         return projectRecodeService.findByuuid(uuid);
     }
@@ -41,7 +41,7 @@ public class ProjectRecodeController {
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/join")
+    @RequestMapping(value = "/join",method = RequestMethod.POST)
     public ProjectRecode join(String jsonStr){
 
         ProjectRecode projectRecode= JSONObject.parseObject(jsonStr,ProjectRecode.class);
@@ -54,7 +54,7 @@ public class ProjectRecodeController {
      * @return
      */
     @ResponseBody
-    @RequestMapping("/totality")
+    @RequestMapping(value = "/totality",method = RequestMethod.GET)
     public Double totality(){
         return projectRecodeService.totality();
     }
@@ -64,7 +64,7 @@ public class ProjectRecodeController {
      * 计算历史参与总人数
      */
     @ResponseBody
-    @RequestMapping("/historyperson")
+    @RequestMapping(value = "/historyperson",method = RequestMethod.GET)
     public Long historyPerson(){
         return projectRecodeService.historyPerson();
     }
@@ -73,7 +73,7 @@ public class ProjectRecodeController {
      * 记录某项目已参与人数
      */
     @ResponseBody
-    @RequestMapping("/sumperson")
+    @RequestMapping(value = "/sumperson",method = RequestMethod.GET)
     public Long sumPerson(Long proId){
         return projectRecodeService.sumPerson(proId);
     }
@@ -82,7 +82,7 @@ public class ProjectRecodeController {
      * 记录某项目已筹款额
      */
     @ResponseBody
-    @RequestMapping("/sumamount")
+    @RequestMapping(value = "/sumamount",method = RequestMethod.GET)
     public Double sumamount(Long proId){
         return projectRecodeService.sumamount(proId);
     }
@@ -91,7 +91,6 @@ public class ProjectRecodeController {
      *  根据捐款单号找到该条捐款单据
      */
     @ResponseBody
-    @RequestMapping
     public ProjectRecode findOne(Long id){
         return projectRecodeService.findOne(id);
     }

donate-service/src/main/java/com/uas/service/donate/controller/ProjectReportController.java

@@ -1,35 +0,0 @@
-package com.uas.service.donate.controller;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.uas.service.donate.model.ProjectReport;
-import com.uas.service.donate.service.ProjectReportService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-
-@Controller
-@RequestMapping("/projectreport")
-public class ProjectReportController {
-    @Autowired
-    private ProjectReportService projectReportService;
-
-    @ResponseBody
-    @RequestMapping("/save")
-    public ProjectReport save(String jsonStr) {
-        ProjectReport projectReport= JSONObject.parseObject(jsonStr,ProjectReport.class);
-        return projectReportService.save(projectReport);
-    }
-
-    @ResponseBody
-    @RequestMapping("/submit")
-    public ProjectReport submit(String jsonStr){
-        ProjectReport projectReport= JSONObject.parseObject(jsonStr,ProjectReport.class);
-        projectReport.setStatus(2);
-        projectReport.setSubmitTime(new Date());
-        return projectReportService.save(projectReport);
-    }
-}

donate-service/src/main/java/com/uas/service/donate/impl/ActivityRecodeServiceImpl.java

@@ -1,11 +1,14 @@
 package com.uas.service.donate.impl;
 
 import com.uas.service.donate.dao.ActivityRecodeDao;
+import com.uas.service.donate.model.Activity;
 import com.uas.service.donate.model.ActivityRecode;
 import com.uas.service.donate.service.ActivityRecodeService;
+import com.uas.service.donate.service.ActivityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -14,28 +17,72 @@ public class ActivityRecodeServiceImpl implements ActivityRecodeService {
     @Autowired
     private ActivityRecodeDao activityRecodeDao;
 
-    public ActivityRecode save(ActivityRecode joinActivity){
+    @Autowired
+    private ActivityService activityService;
+
+    public ActivityRecode save(ActivityRecode joinActivity) {
 
 
         return activityRecodeDao.save(joinActivity);
     }
-    public List<ActivityRecode> joins(Long activityId){
-        List<ActivityRecode> joinActivities =  activityRecodeDao. findByActivityId(activityId);
+
+    //参与活动
+    public ActivityRecode join(Long activityId, Long uuid) {
+        ActivityRecode activityRecode = new ActivityRecode();
+        activityRecode.setActivityId(activityId);
+        activityRecode.setUuid(uuid);
+        activityRecode.setStatus(0);
+
+        Activity activity = activityService.fingById(activityId);
+        //更新活动参与人数
+        Long joinAmount = activity.getJoinAmount();
+        if (joinAmount == null) {
+            joinAmount = (long) 0;
+        }
+        joinAmount++;
+        activity.setJoinAmount(joinAmount);
+        activityService.save(activity);
+        activityRecodeDao.save(activityRecode);
+        return activityRecode;
+    }
+
+    public List<ActivityRecode> joins(Long activityId) {
+        List<ActivityRecode> joinActivities = activityRecodeDao.findByActivityId(activityId);
         return joinActivities;
     }
 
-    public List<ActivityRecode> queryOne(Long uuid){
+    public List<ActivityRecode> queryOne(Long uuid) {
         return activityRecodeDao.findByUuid(uuid);
     }
 
 
-    public ActivityRecode findOne(Long activityId,Long uuid){
-        return activityRecodeDao.findOne(activityId,uuid);
+    public ActivityRecode findOne(Long activityId, Long uuid) {
+        return activityRecodeDao.findOne(activityId, uuid);
     }
 
     //计算某人活动参与总次数
-    public Long sumJoin(Long uuid){
+    public Long sumJoin(Long uuid) {
         return activityRecodeDao.sumJoin(uuid);
     }
 
+    //领奖
+    public ActivityRecode receive(Long activityId,Long uuid){
+        ActivityRecode activityRecode=activityRecodeDao.findOne(activityId,uuid);
+        //设置领取状态
+        activityRecode.setStatus(2);
+        //设置领取时间
+        activityRecode.setReceiveTime(new Date());
+        //找到领奖的活动
+        Activity activity=activityService.fingById(activityId);
+        //重新设置当前活动领奖总人数
+        Integer receivePerson=activity.getReceivePerson();
+        if(receivePerson==null){
+            receivePerson=(int)0;
+        }
+        receivePerson++;
+        activity.setReceivePerson(receivePerson);
+        //保存活动
+        activityService.save(activity);
+        return activityRecodeDao.save(activityRecode);
+    }
 }

donate-service/src/main/java/com/uas/service/donate/impl/ProjectRecordServiceImpl.java

@@ -1,6 +1,5 @@
 package com.uas.service.donate.impl;
 
-import com.uas.service.donate.dao.ProjectDao;
 import com.uas.service.donate.dao.ProjectRecodeDao;
 import com.uas.service.donate.model.Org;
 import com.uas.service.donate.model.Project;

donate-service/src/main/java/com/uas/service/donate/service/ActivityRecodeService.java

@@ -10,12 +10,20 @@ public interface ActivityRecodeService {
 
     ActivityRecode save(ActivityRecode joinActivity);
 
+    //参与活动
+    ActivityRecode join(Long activityId,Long uuid);
+
+    //查询某活动的所有参与人
     List<ActivityRecode> joins(Long activityId);
 
+    //查询某人参与的所有活动
     List<ActivityRecode> queryOne(Long uuid);
 
     ActivityRecode findOne(Long activityId,Long uuid);
 
     //计算某人活动参与总次数
     Long sumJoin(Long uuid);
+
+    //领奖
+    ActivityRecode receive(Long activityId,Long uuid);
 }