一元捐相关信息更改，代码格式调整

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

@@ -153,40 +153,39 @@ public class IndexController {
 
         PageRequest pageable=new PageRequest(page,size);
 
-        //得到历史参与总人数
-        Long historyPerson = projectRecodeService.historyPerson();
-        //得到历史参与总捐款额
-        Double totality = projectRecodeService.totality();
-        //得到轮播图
+	    //得到历史参与总人数
+	    Long historyPerson = projectRecodeService.historyPerson();
+	    //得到历史参与总捐款额
+	    Double totality = projectRecodeService.totality();
+	    //得到轮播图
         List<JSONObject> carouselList=carouselService.getCarousels(useFor);
-        //动态获取所有领域分类
-        List<String> areaList=projectService.allArea();
-
-        //展示不同的状态列表
-        if (!"全部".equals(status) &&  "全部".equals(area)) {
-            if("进行中".equals(status)){
-                Page<Project> projects=projectService.findInProcess(pageable);
-                model.addAttribute("page", projects);
-            }
-            if("已结束".equals(status)){
-                Page<Project> projects= projectService.findEndProject(pageable);
-                model.addAttribute("page", projects);
-            }
-        } else if ("全部".equals(status) &&  !"全部".equals(area)) {
-            Page<Project> projects = projectService.findPageArea(area,pageable);
-            model.addAttribute("page", projects);
-        } else if ("全部".equals(status) &&  "全部".equals(area)) {
-            Page<Project> projects = projectService.findAll(pageable);
-            model.addAttribute("page", projects);
-        } else {
-            if("进行中".equals(status)){
-                Page<Project> projects= projectService.findInProcessArea(pageable,area);
-                model.addAttribute("page",projects);
-            }else if("已结束".equals(status)){
-                Page<Project> projects= projectService.findEndProjectArea(pageable,area);
-                model.addAttribute("page",projects);
-            }
-        }
+	    //动态获取所有领域分类
+	    List<String> areaList = projectService.allArea();
+	    //展示不同的状态列表
+	    if (!Status.ALL.getPhrase().equals(status) && Status.ALL.getPhrase().equals(area)) {
+		    if (Status.LOADING.getPhrase().equals(status)) {
+			    Page<Project> projects = projectService.findInProcess(pageable);
+			    model.addAttribute("page", projects);
+		    }
+		    if (Status.END.getPhrase().equals(status)) {
+			    Page<Project> projects = projectService.findEndProject(pageable);
+			    model.addAttribute("page", projects);
+		    }
+	    } else if (Status.ALL.getPhrase().equals(status) && !Status.ALL.getPhrase().equals(area)) {
+		    Page<Project> projects = projectService.findPageArea(area, pageable);
+		    model.addAttribute("page", projects);
+	    } else if (Status.ALL.getPhrase().equals(status) && Status.ALL.getPhrase().equals(area)) {
+		    Page<Project> projects = projectService.findAll(pageable);
+		    model.addAttribute("page", projects);
+	    } else {
+		    if (Status.ALL.getPhrase().equals(status)) {
+			    Page<Project> projects = projectService.findInProcessArea(pageable, area);
+			    model.addAttribute("page", projects);
+		    } else if (Status.END.getPhrase().equals(status)) {
+			    Page<Project> projects = projectService.findEndProjectArea(pageable, area);
+			    model.addAttribute("page", projects);
+		    }
+	    }
 
         if(!"".equals(search)){
             Page<Project> projects=projectService.searchPage(pageable,search);

donate-service/src/main/java/com/uas/service/donate/core/model/Status.java

@@ -0,0 +1,71 @@
+package com.uas.service.donate.core.model;
+
+/**
+ * 一元捐的相关状态
+ *
+ * Created by hejq on 2017-11-24.
+ */
+public enum Status {
+
+    /**
+     * {@code 100 全部}
+     */
+    ALL(100, "全部"),
+
+    /**
+     * {@code 101 进行中}
+     *
+     * @param value
+     * @param phrase
+     */
+    LOADING(101, "进行中"),
+
+	/**
+	 * {@code 102 已结束}
+	 *
+	 * @param value
+	 * @param phrase
+	 */
+	END(102, "已结束");
+
+    private Status(int value, String phrase) {
+        this.value = value;
+        this.phrase = phrase;
+    }
+
+    private final int value;
+    private final String phrase;
+
+    public int getValue() {
+        return this.value;
+    }
+
+    public String getPhrase() {
+        return this.phrase;
+    }
+
+    /**
+     * @param statusCode
+     *            状态的编码
+     * @return 状态
+     * @throws IllegalArgumentException
+     *             如果statusCode不存在的话
+     */
+    public static Status valueOf(int statusCode) {
+        for (Status status : values()) {
+            if (status.value == statusCode) {
+                return status;
+            }
+        }
+        throw new IllegalArgumentException("没有与编号 [" + statusCode + "]匹配的状态");
+    }
+
+    /**
+     * 返回状态的编号
+     */
+    @Override
+    public String toString() {
+        return Integer.toString(value);
+    }
+
+}

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

@@ -6,14 +6,29 @@ import java.util.List;
 
 public interface ProjectRecodeService {
 
-    //查询某人参加过捐款的所有项目
-    List<ProjectRecode> findByuuid(Long uuid);
+	/**
+	 * 查询某人参加过捐款的所有项目
+	 *
+	 * @param uuid
+	 * @return
+	 */
+	List<ProjectRecode> findByuuid(Long uuid);
 
-    //计算某人参与项目的次数
-    Long sumJoin(Long uuid);
+	/**
+	 * 计算某人参与项目的次数
+	 *
+	 * @param uuid
+	 * @return
+	 */
+	Long sumJoin(Long uuid);
 
-    //计算某人捐赠的总善款
-    Long sumMoney(Long uuid);
+	/**
+	 * 计算某人捐赠的总善款
+	 *
+	 * @param uuid
+	 * @return
+	 */
+	Long sumMoney(Long uuid);
 
     ProjectRecode join(ProjectRecode projectRecode);
 
@@ -21,18 +36,41 @@ public interface ProjectRecodeService {
 
     void update(ProjectRecode projectRecode);
 
-    //查询所有项目已筹集金额
-    Double totality();
+	/**
+	 * 查询所有项目已筹集金额
+	 *
+	 * @return
+	 */
+	Double totality();
 
-    //查询所有的项目历史总参与人数
-    Long historyPerson();
+	/**
+	 * 查询所有的项目历史总参与人数
+	 *
+	 * @return
+	 */
+	Long historyPerson();
 
-    //查询某项目参与总人数
-    Long sumPerson(Long proId);
+	/**
+	 * 查询某项目参与总人数
+	 *
+	 * @param proId
+	 * @return
+	 */
+	Long sumPerson(Long proId);
 
-    //查询某项目已筹集金额
-    Double sumamount(Long proId);
+	/**
+	 * 查询某项目已筹集金额
+	 *
+	 * @param proId
+	 * @return
+	 */
+	Double sumamount(Long proId);
 
-    //根据捐款单号找到该条捐款单据
-    ProjectRecode findOne(Long id);
+	/**
+	 * 根据捐款单号找到该条捐款单据
+	 *
+	 * @param id
+	 * @return
+	 */
+	ProjectRecode findOne(Long id);
 }

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

@@ -1,6 +1,5 @@
 package com.uas.service.donate.service.impl;
 
-import com.uas.message.mail.service.MailService;
 import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.service.donate.MessageConfiguration;
@@ -21,8 +20,8 @@ import java.util.Map;
 @Service
 public class MessageServiceImpl implements MessageService {
 
-    @Autowired
-    private MailService mailService;
+//    @Autowired
+//    private MailService mailService;
 
     @Autowired
     private MessageConfiguration messageConfiguration;
@@ -36,7 +35,7 @@ public class MessageServiceImpl implements MessageService {
                 model.put("custname", "");
                 model.put("inviteuid", "");
                 model.put("inviteUserCode", "");
-                mailService.send(messageConfiguration.getTplInvitationForB2B(), receivedEmail, model);
+//                mailService.send(messageConfiguration.getTplInvitationForB2B(), receivedEmail, model);
             }
             return new ResponseEntity<String>(HttpStatus.OK);
         } catch (Exception e) {

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

@@ -33,18 +33,28 @@ public class ProjectRecordServiceImpl implements ProjectRecodeService {
         return projectRecodeDao.findByuuid(uuid);
     }
 
-    //计算某人参与项目的次数
-    public Long sumJoin(Long uuid) {
+	/**
+	 * 计算某人参与项目的次数
+	 *
+	 * @param uuid
+	 * @return
+	 */
+	public Long sumJoin(Long uuid) {
         return projectRecodeDao.sumJoin(uuid);
     }
 
-    //计算某人捐赠的总善款
-    public Long sumMoney(Long uuid) {
+	/**
+	 * 计算某人捐赠的总善款
+	 *
+	 * @param uuid
+	 * @return
+	 */
+	public Long sumMoney(Long uuid) {
         return projectRecodeDao.sumMoney(uuid);
     }
 
     public ProjectRecode join(ProjectRecode projectRecode) {
-      /*  //得到此次捐款额
+        //得到此次捐款额
         Double amount = projectRecode.getAmount();
         //通过项目参与表的项目id，找到项目
         Project project = projectService.findOne(projectRecode.getProId());
@@ -61,23 +71,22 @@ public class ProjectRecordServiceImpl implements ProjectRecodeService {
         //得到该项目的参与人数
         Long joinAmount = project.getJoinAmount();
         if (joinAmount == null) {
-            joinAmount = (long) 0;
+            joinAmount =  0L;
         }
         joinAmount++;
         //重新设置该项目的参与人数
         project.setJoinAmount(joinAmount);
         //保存项目
-        projectService.save(project);
-
+	    project = projectService.save(project);
+        //设置项目待支付状态
+	    projectRecode.setStatus((short) 1);
         //设置项目名
         projectRecode.setProjectName(project.getName());
         //设置机构名
         projectRecode.setOrgName(org.getName());
-*/
-        //设置项目待支付状态
-        projectRecode.setStatus((short) 1);
-
-        return projectRecodeDao.save(projectRecode);
+	    projectRecode = projectRecodeDao.save(projectRecode);
+	    projectRecode.setProject(project);
+        return projectRecode;
     }
 
     @Override
@@ -93,28 +102,51 @@ public class ProjectRecordServiceImpl implements ProjectRecodeService {
         projectRecodeDao.save(projectRecode);
     }
 
-    //查询所有项目已筹集金额
-    public Double totality() {
+	/**
+	 * 查询所有项目已筹集金额
+	 *
+	 * @return
+	 */
+	public Double totality() {
         return projectRecodeDao.totality();
     }
 
-    //查询所有的项目历史总参与人数
-    public Long historyPerson() {
+	/**
+	 * 查询所有的项目历史总参与人数
+	 *
+	 * @return
+	 */
+	public Long historyPerson() {
         return projectRecodeDao.historyPerson();
     }
 
-    //查询某项目参与总人数
-    public Long sumPerson(Long proId) {
+	/**
+	 * 查询某项目参与总人数
+	 *
+	 * @param proId
+	 * @return
+	 */
+	public Long sumPerson(Long proId) {
         return projectRecodeDao.sumPerson(proId);
     }
 
-    //查询某项目已筹集金额
-    public Double sumamount(Long proId) {
+	/**
+	 * 查询某项目已筹集金额
+	 *
+	 * @param proId
+	 * @return
+	 */
+	public Double sumamount(Long proId) {
         return projectRecodeDao.sumamount(proId);
     }
 
-    //根据捐款单号找到该条捐款单据
-    public ProjectRecode findOne(Long id) {
+	/**
+	 * 根据捐款单号找到该条捐款单据
+	 *
+	 * @param id
+	 * @return
+	 */
+	public ProjectRecode findOne(Long id) {
         return projectRecodeDao.findOne(id);
     }