修改彩虹计划小程序接口

.gitignore

@@ -3,3 +3,5 @@
 .project
 .gitignore
 .classpath
+.idea
+udata
\ No newline at end of file

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

@@ -77,7 +77,8 @@ public class RainbowPlanController {
                 result.put("userInfo",userInfo);
             }else {
                 result.put("sKey","");
-                result.put("userInfo",null);
+                result.put("userInfo","");
+                result.put("openid",session.getOpenid());
             }
 
             return result;
@@ -96,6 +97,7 @@ public class RainbowPlanController {
         user.setPhone(info.getPhone());
         user.setName(info.getName());
         user.setGender(info.getGender());
+        user.setOpenid(info.getOpenid());
         if (Strings.isNullOrEmpty(info.getInviter())){
             user.setStatus(RainbowPlanUser.STATUS_UNAUDIT);
         }else if (inviterExist(info.getInviter())){
@@ -140,12 +142,14 @@ public class RainbowPlanController {
         if (user != null){
             user.setPhone(info.getPhone());
             user.setName(info.getName());
+            user.setNickName(info.getNickName());
             user.setGender(info.getGender());
             user.setBirthday(info.getBirthday());
             user.setBedNum(info.getBedNum());
             user.setReceiveName(info.getReceiveName());
             user.setConnectTel(info.getConnectTel());
             user.setReceiveAddress(info.getReceiveAddress());
+            userDao.update(user);
         }else {
             throw new Exception("保存失败，请求用户不存在");
         }
@@ -169,6 +173,7 @@ public class RainbowPlanController {
                 FileUtils.writeByteArrayToFile(destFile,info.getFile().getBytes());
                 user.setPhone(info.getPhone());
                 user.setName(info.getName());
+                user.setNickName(info.getNickName());
                 user.setGender(info.getGender());
                 user.setBirthday(info.getBirthday());
                 user.setBedNum(info.getBedNum());
@@ -226,9 +231,7 @@ public class RainbowPlanController {
         RainbowPlanUser user = userDao.findByOpenid(openid);
         List<Wish> resultList = Lists.newArrayList();
         if (user != null){
-            wishDao.findByRainbowPlanUserId(user.getId());
-        }else {
-            throw new Exception("获取数据失败，请求用户不存在");
+            resultList = wishDao.findByRainbowPlanUserId(user.getId());
         }
         return resultList;
     }

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

@@ -4,6 +4,7 @@ import com.qiankun.dao.core.AbsDao;
 import com.qiankun.dao.core.Hints;
 import com.qiankun.entity.RainbowPlanUser;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 @Repository
 public class RainbowPlanUserDaoImpl extends AbsDao<RainbowPlanUser,String> implements RainbowPlanUserDao {
@@ -11,4 +12,16 @@ public class RainbowPlanUserDaoImpl extends AbsDao<RainbowPlanUser,String> imple
     public RainbowPlanUser findByOpenid(String openid) {
         return findUnique("from RainbowPlanUser where openid=?",new Hints(),openid);
     }
+
+    @Transactional
+    @Override
+    public RainbowPlanUser save(RainbowPlanUser entity) {
+        return super.save(entity);
+    }
+
+    @Transactional
+    @Override
+    public void update(RainbowPlanUser entity) {
+        super.update(entity);
+    }
 }

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

@@ -4,6 +4,7 @@ import com.qiankun.dao.core.AbsDao;
 import com.qiankun.dao.core.Hints;
 import com.qiankun.entity.Wish;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -18,4 +19,10 @@ public class WishDaoImpl extends AbsDao<Wish,String> implements WishDao {
     public Wish findById(String id) {
         return findUnique("from Wish where id = ?",new Hints(),id);
     }
+
+    @Transactional
+    @Override
+    public Wish save(Wish entity) {
+        return super.save(entity);
+    }
 }