Merge branch 'master' of http://fywlsoft.cn:50379/other-project/tjmdp

src/main/java/com/qiankun/controller/rainbowplan/RainbowPlanController.java

@@ -255,6 +255,7 @@ public class RainbowPlanController extends BaseController<Object> {
                 wish.setUploadImage(uploadWishImagePath + File.separator + originalFileName);
                 wish.setStatus(Wish.STATUS_PUBLISH);
                 wish.setRainbowPlanUserId(user.getId());
+                wish.setActivityId(publishWish.getActivityId());
                 wishDao.save(wish);
             }else {
                 throw new Exception("保存失败，请上传图片");
@@ -377,8 +378,14 @@ public class RainbowPlanController extends BaseController<Object> {
     }
     @Auth(verifyLogin = false,verifyURL = false)
     @RequestMapping(value = "/importWish",method = RequestMethod.POST)
-    public @ResponseBody Map<String,Object> importWish(ImportWishVo importWishVo) throws Exception {
+    public Map<String,Object> importWish(ImportWishVo importWishVo) throws Exception {
         Map<String,Object> result = Maps.newConcurrentMap();
+        Activity activity = activityService.findByAavailableAndType("3");
+        if (activity == null){
+            result.put("status","error");
+            result.put("errorMsg","当前不存在开放的彩虹计划活动");
+            return result;
+        }
         RainbowPlanUser user = new RainbowPlanUser();
         user.setPhone(importWishVo.getPhone());
         user.setName(importWishVo.getName());
@@ -406,6 +413,7 @@ public class RainbowPlanController extends BaseController<Object> {
             wish.setUploadImage(uploadWishImagePath + File.separator + originalFileName);
             wish.setStatus(Wish.STATUS_PUBLISH);
             wish.setRainbowPlanUserId(user.getId());
+            wish.setActivityId(activity.getId());
             wishDao.save(wish);
         }else {
             throw new Exception("保存失败，请上传图片");

src/main/java/com/qiankun/dao/ActivityDaoImpl.java

@@ -49,6 +49,7 @@ public class ActivityDaoImpl extends AbsDao<Activity, String> implements Activit
 
     @Override
     public List<Activity> findByAvailableAndType(String type) {
-        return find("from Activity where type = ? and available = true order by createTime desc",new Hints(0),type);
+	    boolean available = true;
+        return find("from Activity where type = ? and available = ? order by createTime desc",new Hints(),type,available);
     }
 }

src/main/java/com/qiankun/vo/PublishWish.java

@@ -7,6 +7,7 @@ public class PublishWish {
     public String id;
     public String title;
     public String wish;
+    public String activityId;
     public String wishImage;
     public MultipartFile file;
 
@@ -49,4 +50,12 @@ public class PublishWish {
     public void setFile(MultipartFile file) {
         this.file = file;
     }
+
+    public String getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(String activityId) {
+        this.activityId = activityId;
+    }
 }