活动参与相关修改

donate-console/src/main/java/com/uas/console/donate/model/Activity.java

@@ -125,12 +125,6 @@ public class Activity implements Serializable{
     @Column(name = "act_receive_person")
     private Integer receivePerson;
 
-    /**
-     * 已筹集善款
-     * @return
-     */
-    @Column(name="act_amount")
-    private Double amount;
     /**
      * 相关项目数
      */
@@ -189,6 +183,13 @@ public class Activity implements Serializable{
     @Transient
     private Integer awardAmount;
 
+    /**
+     * 已筹集善款
+     * @return
+     */
+    @Transient
+    private Double amount;
+
     public Long getId() {
         return id;
     }
@@ -316,6 +317,14 @@ public class Activity implements Serializable{
     }
 
     public Double getAmount() {
+        Double amount = 0d;
+        if (!CollectionUtils.isEmpty(this.getProjects())) {
+            for (Project project : this.getProjects()) {
+                if (null != project.getTotalAmount()) {
+                    amount += project.getTotalAmount();
+                }
+            }
+        }
         return amount;
     }
 

donate-console/src/main/webapp/resources/js/index/app.js

@@ -2475,9 +2475,11 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                     } else {
                         toaster.pop('success', '保存成功');
                     }
-                    Activity.deletePrizeImgByBatch({path: $scope.deletePath}, {}, function (data) {
+                    if ($scope.deletePath.length > 0) {
+                        Activity.deletePrizeImgByBatch({path: $scope.deletePath}, {}, function (data) {
 
-                    });
+                        });
+                    }
                     $scope.loading = false;
                     window.location.href = '#/activity';
                 }).error(function (data) {

donate-console/src/main/webapp/resources/view/activity/activity_launch.html

@@ -725,6 +725,12 @@
                                     <span>{{$index + 1}}</span>
                                     <a ng-click="deleteAward($index)">删除</a>
                                 </div>
+                                <div class="award-detail clearfix">
+                                    <span class="fl">简介</span>
+                                    <input type="text" ng-model="award.awardSummary" class="fl form-control" required>
+
+                                    <span class="error" ng-show="submited && award.awardSummary == null">*活动奖品的简介不能为空</span>
+                                </div>
                                 <div class="award-detail clearfix">
                                     <span class="fl">数量</span>
                                     <input type="text" ng-model="award.amount" class="fl form-control" required>

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

@@ -1,6 +1,8 @@
 package com.uas.service.donate.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.uas.service.donate.model.Activity;
+import com.uas.service.donate.model.ActivityRecode;
 import com.uas.service.donate.service.ActivityService;
 import com.uas.service.donate.service.AwardService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,25 +95,25 @@ public class ActivityController {
     }
 
     /**
-     * 计算与活动相关的项目筹集的总金额
+     * 获取当前登录用户参加活动资格
      * @param id
-     * @return
+     * @return 0无资格  1有已参加
      */
     @ResponseBody
-    @RequestMapping(value = "/sumMoney/{id}",method = RequestMethod.GET)
-    public ModelMap sumMoney(@PathVariable("id") Long id) {
-        return new ModelMap("sum",activityService.sumMoney(id));
+    @RequestMapping(value = "/getActivityRecord/{id}",method = RequestMethod.GET)
+    public ActivityRecode getActivityRecord(@PathVariable("id") Long id) {
+        return activityService.getActivityRecord(id);
     }
 
-
     /**
-     * 获取当前登录用户参加活动资格
-     * @param id
-     * @return 0无资格  1有已参加
+     * 确认领奖
+     * @param json 领奖记录
+     * @return success error
      */
     @ResponseBody
-    @RequestMapping(value = "/getQualification/{id}",method = RequestMethod.GET)
-    public ModelMap getQualification(@PathVariable("id") Long id) {
-        return new ModelMap("qualification",activityService.getQualification(id));
+    @RequestMapping(value = "/takeAward",method = RequestMethod.POST)
+    public ModelMap takeAward(@RequestBody String json) {
+        ActivityRecode record = JSON.parseObject(json, ActivityRecode.class);
+        return activityService.takeAward(record);
     }
 }

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

@@ -62,6 +62,9 @@ public class AlipayController {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private ActivityRecodeService activityRecodeService;
+
     private Logger logger = LoggerFactory.getLogger(AlipayController.class);
 
     //private AlipayClient alipayClient = new DefaultAlipayClient(AlipayConfig.SB_GATEWAY,AlipayConfig.SB_APPID,AlipayConfig.SB_RSA_PRIVATE_KEY,AlipayConfig.FORMAT,AlipayConfig.CHARSET,AlipayConfig.SB_ALIPAY_PUBLIC_KEY,AlipayConfig.SIGNTYPE);
@@ -376,6 +379,11 @@ public class AlipayController {
                         String requestUrlMessage = request.getScheme() +"://" + request.getServerName() + ":" + request.getServerPort();
                         String url = requestUrlMessage + "/project#/donationsOver/" +  notifyOutTradeNo;
                         modelAndView.setViewName("redirect:" + url);
+                        //TODO 如果未登录需要，给出引导注册，并可参加活动!!!!!!!!!!!
+                        if (null != SystemSession.getUser()) {
+                            Long userUU = SystemSession.getUser().getUserUU();
+                            activityRecodeService.joinAfterDonate(Long.valueOf(notifyOutTradeNo), userUU);
+                        }
                     }
                     //TODO 其他状态判断
                 } else {

donate-service/src/main/java/com/uas/service/donate/model/Activity.java

@@ -112,6 +112,7 @@ public class Activity implements Serializable{
      */
     @Column(name = "act_joinAmount")
     private Long joinAmount;
+
     /**
      * 活动中奖人数
      * @return
@@ -125,12 +126,6 @@ public class Activity implements Serializable{
     @Column(name = "act_receive_person")
     private Integer receivePerson;
 
-    /**
-     * 已筹集善款
-     * @return
-     */
-    @Column(name="act_amount")
-    private Double amount;
     /**
      * 相关项目数
      */
@@ -183,6 +178,13 @@ public class Activity implements Serializable{
     @JoinTable(name = "donate$activityproject", joinColumns = @JoinColumn(name = "act_id", referencedColumnName = "act_id"), inverseJoinColumns = @JoinColumn(name="pro_id", referencedColumnName = "pro_id"))
     private Set<Project> projects;
 
+    /**
+     * 已筹集善款
+     * @return
+     */
+    @Column(name="act_amount")
+    private Double amount;
+
     /**
      * 奖品总数
      */
@@ -321,14 +323,6 @@ public class Activity implements Serializable{
         this.receivePerson = receivePerson;
     }
 
-    public Double getAmount() {
-        return amount;
-    }
-
-    public void setAmount(Double amount) {
-        this.amount = amount;
-    }
-
     public Integer getSumconnect() {
         return sumconnect;
     }
@@ -462,4 +456,23 @@ public class Activity implements Serializable{
     public void setStage(String stage) {
         this.stage = stage;
     }
+
+    public Double getAmount() {
+        if (null != amount) {
+            return amount;
+        }
+        Double totalAmount = 0d;
+        if (!CollectionUtils.isEmpty(this.getProjects())) {
+            for (Project project : this.getProjects()) {
+                if (null != project.getTotalAmount()) {
+                    totalAmount += project.getTotalAmount();
+                }
+            }
+        }
+        return totalAmount;
+    }
+
+    public void setAmount(Double amount) {
+        this.amount = amount;
+    }
 }

donate-service/src/main/java/com/uas/service/donate/model/ActivityRecode.java

@@ -8,8 +8,6 @@ import java.util.Date;
 @Table(name="donate$activityrecode")
 public class ActivityRecode {
 
-    private static final long serialVersionUID = 1L;
-
     @Id
     @GeneratedValue(strategy= GenerationType.IDENTITY)
     @Column(name="ar_id")
@@ -62,24 +60,46 @@ public class ActivityRecode {
     /**
      * 活动参与记录关联参与的活动
      */
-    @OneToOne(cascade = CascadeType.REFRESH)
-    @JoinColumn(name = "activityId",insertable = false, updatable = false)
+    @ManyToOne(cascade = CascadeType.REFRESH)
+    @JoinColumn(name="ar_act_id", insertable = false, updatable = false)
     private Activity activity;
 
     /**
-     * 是否获奖,1代表已获奖
+     * 是否获奖,1代表已获奖, 0表示未获奖
      * @return
      */
     @Column(name = "ar_getaward")
     private Integer isGetAward;
 
     /**
-     * 奖品等级
-     * @return
+     * 省
+     */
+    @Column(name = "ar_province")
+    private String province;
+
+    /**
+     * 市
      */
-    @Column(name = "ar_awardLeavel")
-    private String awardLeavel;
+    @Column(name = "ar_city")
+    private String city;
 
+    /**
+     * 区
+     */
+    @Column(name = "ar_district")
+    private String district;
+
+    /**
+     * 详细地址
+     */
+    @Column(name = "ar_address")
+    private String address;
+
+    /**
+     * 领奖联系电话
+     */
+    @Column(name = "ar_tel")
+    private String tel;
 
     public Long getId() {
         return id;
@@ -161,11 +181,43 @@ public class ActivityRecode {
         this.isGetAward = isGetAward;
     }
 
-    public String getAwardLeavel() {
-        return awardLeavel;
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getTel() {
+        return tel;
     }
 
-    public void setAwardLeavel(String awardLeavel) {
-        this.awardLeavel = awardLeavel;
+    public void setTel(String tel) {
+        this.tel = tel;
     }
 }

donate-service/src/main/java/com/uas/service/donate/model/Award.java

@@ -1,3 +1,4 @@
+
 package com.uas.service.donate.model;
 
 import com.alibaba.fastjson.annotation.JSONField;

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

@@ -2,7 +2,6 @@ package com.uas.service.donate.service;
 
 
 import com.uas.service.donate.model.ActivityRecode;
-import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
@@ -26,4 +25,11 @@ public interface ActivityRecodeService {
 
     //领奖
     ActivityRecode receive(Long activityId,Long uuid);
+
+    /**
+     * 捐赠完如果已登录，参加活动
+     * @param projectRecordId
+     * @param userUU
+     */
+    void joinAfterDonate(Long projectRecordId, Long userUU);
 }

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

@@ -1,8 +1,10 @@
 package com.uas.service.donate.service;
 
 import com.uas.service.donate.model.Activity;
+import com.uas.service.donate.model.ActivityRecode;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.ui.ModelMap;
 
 import java.util.List;
 
@@ -28,18 +30,16 @@ public interface ActivityService {
 
     Activity save(Activity activity);
 
-    //计算与活动相关的项目筹集的总金额
-    Double sumMoney(Long id);
-
     //根据活动名关键字，奖品名关键字查询活动
     List<Activity> search(String search);
 
     Page<Activity> search(String search,Pageable pageable);
 
     /**
-     * 获取当前登录用户参加活动资格
-     * @param id
-     * @return 0无资格  1已参加
+     * 获取当前登录用户参加活动记录
+     *
      */
-    Short getQualification(Long id);
+    ActivityRecode getActivityRecord(Long id);
+
+    ModelMap takeAward(ActivityRecode record);
 }

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

@@ -1,10 +1,13 @@
 package com.uas.service.donate.service.impl;
 
 import com.uas.service.donate.dao.ActivityRecodeDao;
+import com.uas.service.donate.dao.ProjectRecodeDao;
 import com.uas.service.donate.model.Activity;
 import com.uas.service.donate.model.ActivityRecode;
+import com.uas.service.donate.model.ProjectRecode;
 import com.uas.service.donate.service.ActivityRecodeService;
 import com.uas.service.donate.service.ActivityService;
+import com.uas.service.donate.service.ProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +23,12 @@ public class ActivityRecodeServiceImpl implements ActivityRecodeService {
     @Autowired
     private ActivityService activityService;
 
+    @Autowired
+    private ProjectRecodeDao projectRecodeDao;
+
+    @Autowired
+    private ProjectService projectService;
+
     public ActivityRecode save(ActivityRecode joinActivity) {
 
 
@@ -47,8 +56,7 @@ public class ActivityRecodeServiceImpl implements ActivityRecodeService {
     }
 
     public List<ActivityRecode> joins(Long activityId) {
-        List<ActivityRecode> joinActivities = activityRecodeDao.findByActivityId(activityId);
-        return joinActivities;
+        return activityRecodeDao.findByActivityId(activityId);
     }
 
     public List<ActivityRecode> queryOne(Long uuid) {
@@ -85,4 +93,13 @@ public class ActivityRecodeServiceImpl implements ActivityRecodeService {
         activityService.save(activity);
         return activityRecodeDao.save(activityRecode);
     }
+
+    @Override
+    public void joinAfterDonate(Long projectRecordId, Long userUU) {
+        ProjectRecode projectRecode = projectRecodeDao.findOne(projectRecordId);
+        if (null != projectRecode) {
+            Activity activity = projectService.getJoinedActivity(projectRecode.getProId());
+            join(activity.getId(), userUU);
+        }
+    }
 }

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

@@ -6,12 +6,12 @@ import com.uas.service.donate.dao.ActivityRecodeDao;
 import com.uas.service.donate.dao.AwardDao;
 import com.uas.service.donate.model.Activity;
 import com.uas.service.donate.model.ActivityRecode;
-import com.uas.service.donate.model.Project;
 import com.uas.service.donate.service.ActivityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
 
 import java.util.List;
 
@@ -64,16 +64,6 @@ public class ActivityServiceImpl implements ActivityService {
         return activityDao.save(activity);
     }
 
-    //计算与活动相关的项目筹集的总金额
-    public Double sumMoney(Long id){
-        Double amount = 0d;
-        Activity activity = activityDao.findOne(id);
-        for (Project project : activity.getProjects()) {
-            amount += project.getTotalAmount();
-        }
-        return amount;
-    }
-
     //根据活动名关键字，奖品名关键字查询活动
     public List<Activity> search(String search){
        return activityDao.search(search);
@@ -85,23 +75,39 @@ public class ActivityServiceImpl implements ActivityService {
     }
 
     /**
-     * 获取当前登录用户参加活动资格
+     * 获取当前登录用户参加活动记录
      *
      * @param id 活动id
-     * @return 0无资格  1已参加
+     * @return
      */
     @Override
-    public Short getQualification(Long id) {
+    public ActivityRecode getActivityRecord(Long id) {
         if (null != SystemSession.getUser()) {
             Long userUU = SystemSession.getUser().getUserUU();
-            ActivityRecode record = activityRecodeDao.findByActivityIdAndUuid(id, userUU);
-            if (null == record) {
-                return 0;
-            } else {
-                return 1;
-            }
+            return activityRecodeDao.findByActivityIdAndUuid(id, userUU);
+        }
+        return null;
+    }
+
+    @Override
+    public ModelMap takeAward(ActivityRecode record) {
+        ModelMap map = new ModelMap();
+        Long userUU = SystemSession.getUser().getUserUU();
+        if (userUU != record.getUuid()) {
+            map.put("error", "当前登陆用户与领奖人不符！");
+        }
+        if (record.getIsGetAward() != 2) {
+            map.put("error", "没有领取奖品资格！");
+            return map;
+        }
+        if (record.getStatus() == 3) {
+            map.put("error", "奖品已失效！");
+            return map;
         }
-        return 0;
+        record.setStatus(2);
+        activityRecodeDao.save(record);
+        map.put("success", "领奖成功！");
+        return map;
     }
 
 }

donate-service/src/main/webapp/resources/js/activity/app.js

@@ -4,7 +4,7 @@
  */
 define([ 'angularAMD', 'ngRoute', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'common/services', 'angular-toaster', 'ngSanitize', 'common/query/Activity'], function(angularAMD) {
 	'use strict';
-	var app = angular.module('myApp', [ 'ngRoute', 'ui.router', 'ui.bootstrap', 'ng.local', 'ngTable', 'common.services', 'toaster', 'ActivityService']);
+	var app = angular.module('myApp', [ 'ngRoute', 'ui.router', 'ui.bootstrap', 'ng.local', 'ngTable', 'common.services', 'toaster', 'ngSanitize', 'ActivityService']);
 	app.init = function() {
 		angularAMD.bootstrap(app);
 	};

donate-service/src/main/webapp/resources/js/activity/controllers/ActivityDetailCtrl.js

@@ -9,31 +9,24 @@ define([ 'app/app' ], function(app) {
 
             // 获取活动详情
             Activity.getDetailById({id: id}, {}, function(data) {
-                console.log('detail', data);
                 $scope.activity = data;
             }, function (error) {
                 console.log(error);
             });
-
-            // 获取本次活动相关项目所筹集金额
-            Activity.getThisAmount({id: id}, {}, function(data) {
-                $scope.donationHistory = data.sum;
-                console.log(data);
-            });
         };
         init();
 
         // 验证领奖
         $scope.verifyAward = function() {
-            Activity.getActivityRecord({id: id}, {}, function(data) {
+            Activity.getActivityRecord({id: $stateParams.id}, {}, function(data) {
                 if (null == data) {
                     $scope.modalStatus = 'fail';
                 } else {
+                    $scope.activityRecord = data;
                     // 未领取
-                    if (data.status != 2) {
+                    if (data.status === 1) {
                         $scope.modalStatus = 'layer';
                     }
-                    $scope.activityRecord = data;
                 }
             });
         };
@@ -46,11 +39,14 @@ define([ 'app/app' ], function(app) {
         });
 
         // 确认领奖
-        $scope.takeAward = function() {
-            Activity.takeAward({id:id}, {}, function(data) {
+        $scope.takeAward = function(record) {
+            Activity.takeAward({}, record, function(data) {
                 if (data.success) {
                     $scope.awardStatus = 'success';
                 }
+                if (data.error) {
+                    toaster.pop("error", data.error);
+                }
             }, function(response) {
                 console.log(response.data);
                 toaster.pop("error", "出现异常，领取失败");

donate-service/src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -95,7 +95,6 @@ define([ 'app/app' ], function(app) {
 			AuthenticationService.getAuthentication().success(function(data) {
 				if(data && data.content) {
 					$scope.userInfo = data.content;
-					console.log(data.content);
 				}
 				$scope.isAuthed = data !== null && !angular.isUndefined(data.content);
 			});

donate-service/src/main/webapp/resources/js/common/query/Activity.js

@@ -25,7 +25,7 @@ define ([ 'ngResource' ], function() {
                 url: 'activity/save',
                 method: 'POST'
             },
-            // 获取活动参与记录
+            // 获取当前用户活动参与记录
             getActivityRecord: {
                 url: 'activity/record/:id',
                 method: 'GET',
@@ -40,19 +40,6 @@ define ([ 'ngResource' ], function() {
                 params: {
                     id: 'id'
                 }
-            },
-            // 获取筹集总金额
-            getThisAmount: {
-                url: 'activity/sumMoney/:id',
-                method: 'GET',
-                params: {
-                    id: 'id'
-                }
-            },
-            // 获取当前登录人员资格
-            getQualification: {
-                url: 'activity/getQualification',
-                method: 'GET'
             }
         });
     }]);

donate-service/src/main/webapp/resources/js/mobile/controllers/MobileActivityDetailCtrl.js

@@ -15,16 +15,6 @@ define([ 'app/app' ], function(app) {
             }, function (error) {
                 console.log(error);
             });
-
-            // 获取本次活动相关项目所筹集金额
-            Activity.getThisAmount({id: id}, {}, function(data) {
-                $scope.donationHistory = data.sum;
-            });
-
-            // 获取当前人员参加活动资格 (0无资格， 1有资格)
-            Activity.getQualification({id: id}, {}, function(data) {
-                $scope.qualification = data.qualification;
-            });
         };
         init();
 

donate-service/src/main/webapp/resources/view/activity/activity_detail.html

@@ -211,7 +211,7 @@
         padding-left: 28px;
         margin-top: 15px;
         width: 310px;
-        height: 270px;
+        /*height: 270px;*/
         border: 1px solid #e1e1e1;
     }
     .section2 .statistic .statistic-item p.title{
@@ -568,19 +568,13 @@
                 <span>&gt;</span>
                 <span ng-bind="activity.name ? activity.name : '优软一元捐感恩活动'"></span>
             </div>
-            <div class="img"><img src="static/images/activeCenter/active01.png" alt="{{activity.name}}" title="activity.name"></div>
+            <div class="img"><img src="{{activity.banner}}" alt="{{activity.name}}" title="activity.name"></div>
         </div>
         <div class="section section2">
             <div class="fl intro">
                 <div class="intro-item">
                     <h3>活动介绍</h3>
-                   <!-- <div class="txt">
-                        <p>1、活动介绍：基层团组织通过学校在学校内公布申请条件，学生以及其监护人提出求助申请学校对申请学生进行家访，核实家庭经济状况后报县级团委审核，县级团委上报市级团委汇总；</p>
-                        <p>2、参加条件：确认市级团委汇总地区申请资料后报市青基会；</p>
-                        <p>3、开奖时间等：市青基会终审申请，制作项目档案，并报理事会审议；审议通过后向申请人进行资助，并做审计和公示。</p>
-                    </div>-->
-                    <div class="txt">
-                        <span ng-bind="activity.summary"></span>
+                    <div class="txt" ng-bind-html="activity.summary">
                     </div>
                 </div>
                 <!--领奖页面-->
@@ -597,30 +591,20 @@
                     <h3>奖品介绍</h3>
                     <div class="txt">
                         <p ng-repeat="award in activity.awards | orderBy :'awardLevel'">
-                            <span ng-if="award.awardLevel == 1">一等奖：</span>
-                            <span ng-if="award.awardLevel == 2">二等奖：</span>
-                            <span ng-if="award.awardLevel == 3">三等奖：</span>
-                            <span ng-if="award.awardLevel != 1 && award.awardLevel != 2 && award.awardLevel != 3">参与奖：</span>
+                            <!--<span ng-if="award.awardLevel == 1">一等奖：</span>-->
+                            <!--<span ng-if="award.awardLevel == 2">二等奖：</span>-->
+                            <!--<span ng-if="award.awardLevel == 3">三等奖：</span>-->
+                            <!--<span ng-if="award.awardLevel != 1 && award.awardLevel != 2 && award.awardLevel != 3">参与奖：</span>-->
+                            <span ng-bind="award.awardLevel"></span>
                             <span ng-bind="award.awardSummary"></span>
                         </p>
                     </div>
-                    <!--<div class="txt">
-                        <p>1、活动介绍：基层团组织通过学校在学校内公布申请条件，学生以及其监护人提出求助申请学校对申请学生进行家访，核实家庭经济状况后报县级团委审核，县级团委上报市级团委汇总；</p>
-                        <p>2、参加条件：确认市级团委汇总地区申请资料后报市青基会；</p>
-                        <p>3、开奖时间等：市青基会终审申请，制作项目档案，并报理事会审议；审议通过后向申请人进行资助，并做审计和公示。</p>
-                    </div>-->
                 </div>
                 <div class="show-img">
                     <ul class="clearfix">
-                        <li ng-repeat="award in activity.awards">
-                            <img src="award.thumbnail" alt="award.awardName" title="award.awardName">
-                        </li>
-                        <!--<li>
-                            <img src="static/images/activeCenter/reward01.png" alt="">
+                        <li ng-repeat="award in activity.awards | orderBy :'awardLevel'">
+                            <img src="{{award.img}}" alt="{{award.awardLevel}}" title="{{award.awardLevel}}">
                         </li>
-                        <li><img src="static/images/activeCenter/reward02.png" alt=""></li>
-                        <li><img src="static/images/activeCenter/reward03.png" alt=""></li>
-                        <li><img src="static/images/activeCenter/reward04.png" alt=""></li>-->
                     </ul>
                 </div>
             </div>
@@ -632,17 +616,17 @@
                     <div class="statistic-bottom">
                         <div class="bottom-item">
                             <div class="title"><span>历史参加人次</span></div>
-                            <div class="count"><span ng-bind="joinedHistory | number"></span><span>人次</span></div>
+                            <div class="count"><span ng-bind="activity.joinAmount || 0 | number"></span><span>人次</span></div>
                         </div>
                         <div class="bottom-item">
                             <div class="title"><span>历史捐款总额</span></div>
-                            <div class="count" style="margin-left: -14px;"><span ng-bind="donationHistory | number"></span><span>元</span></div>
+                            <div class="count" style="margin-left: -14px;"><span ng-bind="activity.amount || 0 | number:2"></span><span>元</span></div>
                         </div>
                     </div>
                 </div>
                 <div class="statistic-item">
                     <p class="title">活动项目</p>
-                    <div class="item-list clearfix" ng-repeat="project in activity.projectQualifications">
+                    <div class="item-list clearfix" ng-repeat="project in activity.projects">
                         <div class="img fl">
                             <a href="/project#/detail/{{project.proId}}"><img src="{{project.pcImg}}" alt="项目缩略图" title="{{project.name}}"></a>
                         </div>
@@ -651,24 +635,6 @@
                             <span>{{project.projectSummary}}</span>
                         </div>
                     </div>
-                    <!--<div class="item-list clearfix">
-                        <div class="img fl">
-                            <img src="static/images/activeCenter/active02.png" alt="">
-                        </div>
-                        <div class="txt fl">
-                            <p>帮寒门学子多回趟家</p>
-                            <span>他们是一只脚迈进高校的寒门贵子校的寒门贵子</span>
-                        </div>
-                    </div>-->
-                    <div class="item-list clearfix">
-                        <div class="img fl">
-                            <img src="static/images/activeCenter/active03.png" alt="">
-                        </div>
-                        <div class="txt fl">
-                            <p>爱的营养早餐</p>
-                            <span>倡导老年人健康饮食</span>
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>
@@ -680,10 +646,7 @@
         <div class="modal-content">
             <div class="header modal-header clearfix">
                 <p class="fl">恭喜你，获得本次活动
-                    <span ng-if="activityRecord.award.awardLevel == 1">一等奖</span>
-                    <span ng-if="activityRecord.award.awardLevel == 2">二等奖</span>
-                    <span ng-if="activityRecord.award.awardLevel == 3">三等奖</span>
-                    <span ng-if="activityRecord.award.awardLevel != 1 && award.awardLevel != 2 && award.awardLevel != 3">参与奖</span>
+                    <span ng-bind="activityRecord.award.awardLevel"></span>
                 </p>
                 <div class="close fr" data-dismiss="modal">&times;</div>
             </div>
@@ -703,53 +666,38 @@
                 <div class="choose clearfix">
                     <span class="fl best">赠送方式：</span>
                     <div class="f1 best-detail">
-                        <span>邮寄快递</span>
+                        <span ng-if="activityRecord.award.way == 1">快递配送</span>
+                        <span ng-if="activityRecord.award.way == 2">短信通知</span>
                         <p>奖品具体赠送方式和流程进度，请查看活动介绍或消息中心。</p>
                     </div>
                 </div>
                 <div class="choose clearfix">
                     <span class="fl best">联系电话：</span>
-                    <input type="text" ng-model="ship.userTel" class="fl form-control">
+                    <input type="text" ng-model="activityRecord.tel" class="fl form-control" required>
                 </div>
                 <div class="choose clearfix">
                     <span class="fl best">接收地址：</span>
                     <div class="select fr">
-                        <select required="" class="area-select" ng-model="ship.province"
+                        <select required="" class="area-select" ng-model="activityRecord.province"
                                 ng-options="key as key for (key,value) in provinces"
                                 ng-change="ship.city='';ship.district='';" required="true">
                             <option value="">省</option>
                         </select>
-                        <select class="area-select" ng-model="ship.city"
+                        <select class="area-select" ng-model="activityRecord.city"
                                           ng-options="key as key for (key,value) in provinces[ship.province]"
                                           ng-change="ship.district='';" required="true">
                             <option value="">市</option>
                         </select>
-                        <select class="area-select" ng-model="ship.district"
+                        <select class="area-select" ng-model="activityRecord.district"
                                       ng-options="value as value for value in provinces[ship.province][ship.city]"
                                       required="true">
                             <option value="">区</option>
                         </select>
                     </div>
-                    <input type="text" placeholder="请填写详细地址" ng-model="ship.addressdet" class="form-control" style="margin-top: 50px;">
+                    <input type="text" placeholder="请填写详细地址" ng-model="activityRecord.address" required class="form-control" style="margin-top: 50px;">
                     <div class="tip">请填写联系电话和收货地址，便于奖品的发放。</div>
-                    <!--<div class="fl">-->
-                        <!--<div class="province">-->
-                            <!--<select name="" id="" class="fl form-control">-->
-                                <!--<option value="">请选择</option>-->
-                            <!--</select>-->
-                            <!--<span class="fl">省</span>-->
-                        <!--</div>-->
-                        <!--<div class="city">-->
-                            <!--<select name="" id="" class="fl form-control">-->
-                                <!--<option value="">请选择</option>-->
-                            <!--</select>-->
-                            <!--<span class="fl" style="margin-right: 0;">市</span>-->
-                        <!--</div>-->
-                        <!--<input type="text" class="form-control" style="margin-top: 50px;">-->
-                        <!--<div class="tip">请填写联系电话和收货地址，便于奖品的发放。</div>-->
-                    <!--</div>-->
                 </div>
-                <button data-toggle="modal" data-target="#success" ng-click="takeAward()">确认领奖</button>
+                <button data-toggle="modal" data-target="#{{awardStatus}}" ng-click="takeAward(activityRecord)">确认领奖</button>
             </div>
         </div>
     </div>
@@ -779,9 +727,9 @@
                 <div class="close fr" data-dismiss="modal">&times;</div>
             </div>
             <div class="body modal-body">
-                <p>很遗憾，您没中奖！</p>
+                <p>很遗憾，您不满足领奖条件！</p>
                 <span>感谢您一直以来对本平台和公益事业的关注和支持。</span>
-                <div class="closeBtn"><a href="/activity">其他活动</a><a href="/project">返回首页</a></div>
+                <div class="closeBtn"><a href="/activeCenter">其他活动</a><a href="/index">返回首页</a></div>
             </div>
         </div>
     </div>

donate-service/src/main/webapp/resources/view/project/project_detail.html

@@ -765,22 +765,11 @@
             <div class="bottom clearfix show" >
                 <div class="project-txt fl">
                     <div class="project-intro" ng-bind-html="project.introduction">
-                        <!--<p>晚上上自修课，语文老师坐镇。同学们安静得做作业。忽然，老师咳嗽了一声，同学们惊异地抬起头，随即又低下了头。紧接着不知从哪又来了一声咳嗽声——是郭宵。老师瞅了他一眼，随即又若无其事的低下头，道：“有人是傻子。”“郭宵是也。”蔡元杰随即答道。“有人是疯子。”“蔡元杰是也。”全班同学超有默契的答道。顿时，欢乐一片。</p>-->
-                        <!--<img src="static/images/activeCenter/active05.png" alt="">-->
                     </div>
                     <div class="projectIntro">
                         <h3>资助人群</h3>
                         <p><span ng-bind="project.population"></span></p>
                     </div>
-                    <!--<div class="projectIntro">-->
-                        <!--<h3>执行计划</h3>-->
-                        <!--&lt;!&ndash;<p>1、基层团组织通过学校在学校内公布申请条件，学生以及其监护人提出求助申请学校对申请学生进行家访，核实家庭经济状况后报县级团委审核，县级团委上报市级团委汇总；</p>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<p>2、确认市级团委汇总地区申请资料后报市青基会；</p>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<p>3、市青基会终审申请，制作项目档案，并报理事会审议；审议通过后向申请人进行资助，并做审计和公示。</p>&ndash;&gt;-->
-                        <!--<p>-->
-                            <!--<span ng-bind="project.executionPlan"></span>-->
-                        <!--</p>-->
-                    <!--</div>-->
                     <div class="projectIntro">
                         <h3>执行机构</h3>
                         <p><span ng-bind="project.orgName"></span></p>
@@ -797,16 +786,11 @@
             <div class="bottom bottoms clearfix" >
                 <div class="project-txt fl">
                     <div class="project-intro" ng-repeat="schedule in schedules">
-                        <!--<p>晚上上自修课，语文老师坐镇。同学们安静得做作业。忽然，老师咳嗽了一声，同学们惊异地抬起头，随即又低下了头。紧接着不知从哪又来了一声咳嗽声——是郭宵。老师瞅了他一眼，随即又若无其事的低下头，道：“有人是傻子。”“郭宵是也。”蔡元杰随即答道。“有人是疯子。”“蔡元杰是也。”全班同学超有默契的答道。顿时，欢乐一片。
-                            晚上上自修课，语文老师坐镇。同学们安静得做作业。忽然，老师咳嗽了一声，同学们惊异地抬起头，随即又低下了头。紧接着不知从哪又来了一声咳嗽声——是郭宵。老师瞅了他一眼，随即又若无其事的低下头，道：“有人是傻子。”“郭宵是也。”蔡元杰随即答道。“有人是疯子。”“蔡元杰是也。”全班同学超有默契的答道。顿时，欢乐一片。
-                        </p>-->
-                        <!--<img src="static/images/activeCenter/active05.png" alt="">-->
                         <p>{{schedule.description}}</p>
                     </div>
                     <div class="projectIntro">
                         <h3>资助人群</h3>
                         <p>{{project.population}}</p>
-                        <!--<img src="static/images/active06.png" alt=""/>-->
                     </div>
                 </div>
                 <div ng-include src="'static/view/project/project_detail_side.html'"></div>
@@ -815,80 +799,8 @@
             <div class="bottom bottoms clearfix" >
                 <div class="project-txt fl">
                     <div class="project-intro">
-                        <!--<p>晚上上自修课，语文老师坐镇。同学们安静得做作业。忽然，老师咳嗽了一声，同学们惊异地抬起头，随即又低下了头。紧接着不知从哪又来了一声咳嗽声——是郭宵。老师瞅了他一眼，随即又若无其事的低下头，道：“有人是傻子。”“郭宵是也。”蔡元杰随即答道。“有人是疯子。”“蔡元杰是也。”全班同学超有默契的答道。顿时，欢乐一片。-->
-                            <!--晚上上自修课，语文老师坐镇。同学们安静得做作业。忽然，老师咳嗽了一声，同学们惊异地抬起头，随即又低下了头。紧接着不知从哪又来了一声咳嗽声——是郭宵。老师瞅了他一眼，随即又若无其事的低下头，道：“有人是傻子。”“郭宵是也。”蔡元杰随即答道。“有人是疯子。”“蔡元杰是也。”全班同学超有默契的答道。顿时，欢乐一片。-->
-                        <!--</p>-->
-                        <!--<img src="static/images/activeCenter/active05.png" alt="">-->
                         <p>{{proReport.description}}</p>
                     </div>
-                    <!--<div class="projectIntro">-->
-                        <!--<h3>财务披露</h3>-->
-                        <!--<div class="right-list">-->
-                            <!--<div class="list-message">-->
-                                <!--<div class="list-body clearfix" style="margin-top: 20px;">-->
-                                    <!--<div class="msg-list fl">-->
-                                        <!--<span class="fl">项目总募款</span>-->
-                                        <!--<span class="fl info mCount">126819.00元</span>-->
-                                    <!--</div>-->
-                                    <!--<div class="msg-list fl">-->
-                                        <!--<span class="fl">善款总支出</span>-->
-                                        <!--<span class="fl">80510.00元</span>-->
-                                    <!--</div>-->
-                                    <!--<div class="msg-list fl">-->
-                                        <!--<span class="fl">执行进度</span>-->
-                                        <!--<span class="fl">66.81%</span>-->
-                                    <!--</div>-->
-                                    <!--<div class="msg-list fl">-->
-                                        <!--<span class="fl">执行成本</span>-->
-                                        <!--<span class="fl">10029.61(12.35%)</span>-->
-                                    <!--</div>-->
-                                    <!--<div class="msg-list fl">-->
-                                        <!--<span class="fl">项目支出</span>-->
-                                        <!--<span class="fl">70480.39(87.65%)</span>-->
-                                    <!--</div>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                            <!--<div class="list-message">-->
-                                <!--<div class="list-body clearfix">-->
-                                    <!--<div class="msg-list">-->
-                                        <!--<span class="fl">2017-09-16</span>-->
-                                        <!--<div class="spending-detail fl">-->
-                                            <!--<span class="detail">项目支出</span>-->
-                                            <!--<div><b>3758.00元</b><span>购买XXX*35，购买学生节日补贴小礼品(包括粽子50个，水果10kg,大米5kg)</span></div>-->
-                                            <!--<div><b>4200.00元</b><span>购买学生来回车票70张</span></div>-->
-                                            <!--<div class="thumbnail-img clearfix">-->
-                                                <!--<div class="thumb fl">-->
-                                                    <!--发票略缩图-->
-                                                    <!--<input type="file">-->
-                                                <!--</div>-->
-                                                <!--<div class="thumb fl">-->
-                                                    <!--发票略缩图-->
-                                                    <!--<input type="file">-->
-                                                <!--</div>-->
-                                            <!--</div>-->
-                                        <!--</div>-->
-                                    <!--</div>-->
-                                    <!--<div class="msg-list msg-lists">-->
-                                        <!--<span class="fl">2017-09-16</span>-->
-                                        <!--<div class="spending-detail fl">-->
-                                            <!--<span class="detail">执行成本</span>-->
-                                            <!--<div><b>1058.00元</b><span>执行人员车票20人*50元，中午用餐费428元，机构管理费48元</span></div>-->
-                                            <!--<div class="thumbnail-img clearfix">-->
-                                                <!--<div class="thumb fl">-->
-                                                    <!--发票略缩图-->
-                                                    <!--<input type="file">-->
-                                                <!--</div>-->
-                                                <!--<div class="thumb fl">-->
-                                                    <!--发票略缩图-->
-                                                    <!--<input type="file">-->
-                                                <!--</div>-->
-                                            <!--</div>-->
-                                        <!--</div>-->
-                                    <!--</div>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                        <!--</div>-->
-                    <!--</div>-->
                 </div>
                 <div ng-include src="'static/view/project/project_detail_side.html'"></div>
             </div>