update

src/com/w1hd/zzhnc/controller/wx/WxMiniController.java

@@ -298,8 +298,18 @@ public class WxMiniController extends BaseController {
 	@ResponseBody
 	@ResponseBody
 	public Object prizes(@RequestParam(value = "openId") String openId) {
 	public Object prizes(@RequestParam(value = "openId") String openId) {
 		Fans fans = fansService.getFansByMiniOpenid(openId);
 		Fans fans = fansService.getFansByMiniOpenid(openId);
+		if(fans!=null ) {
+			try {
 				List<Lotterylog> list = prizeService.getMyLotteryLog(fans.getId());
 				List<Lotterylog> list = prizeService.getMyLotteryLog(fans.getId());
 				return new Vo_msg(0, list);
 				return new Vo_msg(0, list);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			
+		}
+			return new Vo_msg(0, null);
+		
+		
 	}
 	}
 
 
 	@RequestMapping(value = "/prizes/{id}", method = RequestMethod.GET)
 	@RequestMapping(value = "/prizes/{id}", method = RequestMethod.GET)

src/com/w1hd/zzhnc/model/Lotterylog.java

@@ -11,7 +11,6 @@ public class Lotterylog {
 	private Integer fansid;
 	private Integer fansid;
 	private String prizeName;
 	private String prizeName;
 	private BigDecimal mny;
 	private BigDecimal mny;
-	private String name;
 	private Integer status;
 	private Integer status;
 	private Integer turn;
 	private Integer turn;
 
 
@@ -73,12 +72,5 @@ public class Lotterylog {
 		this.createdtime = createdtime;
 		this.createdtime = createdtime;
 	}
 	}
 
 
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
 
 
 }
 }
\ No newline at end of file

src/com/w1hd/zzhnc/service/ActivityService.java

@@ -96,7 +96,6 @@ public class ActivityService {
 		log.setMny(mny);
 		log.setMny(mny);
 		log.setStatus(status);
 		log.setStatus(status);
 		log.setTurn(turn);
 		log.setTurn(turn);
-		log.setName(name);
 		int row = logDao.insertSelective(log);
 		int row = logDao.insertSelective(log);
 		return row > 0 ? "ok" : "error";
 		return row > 0 ? "ok" : "error";
 	}
 	}