From 5c4658392c4b485954d71cbab6c30eae5612745c Mon Sep 17 00:00:00 2001 From: zxt@theyeasy.com Date: Tue, 2 Jan 2018 18:15:29 +0800 Subject: [PATCH] 添加奖品图片 --- src/com/w1hd/zzhnc/controller/wx/WxMiniController.java | 5 +++-- src/com/w1hd/zzhnc/model/Prize.java | 10 +++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java b/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java index 513b23f..7b9ab75 100644 --- a/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java +++ b/src/com/w1hd/zzhnc/controller/wx/WxMiniController.java @@ -31,6 +31,7 @@ import com.w1hd.zzhnc.model.Banner; import com.w1hd.zzhnc.model.Fans; import com.w1hd.zzhnc.model.Goods; import com.w1hd.zzhnc.model.Lotterylog; +import com.w1hd.zzhnc.model.Prize; import com.w1hd.zzhnc.service.ActivityService; import com.w1hd.zzhnc.service.ArticleService; import com.w1hd.zzhnc.service.BannerService; @@ -331,8 +332,8 @@ public class WxMiniController extends BaseController { @RequestMapping(value = "/prizes/all", method = RequestMethod.GET) @ResponseBody public Object prizesList(@RequestParam(value = "openId") String openId) { - Activity setting = activityService.getActivitySetting(); - return setting; + List prizeList = activityService.getPrizeList(); + return prizeList; } /** 核销奖品 */ diff --git a/src/com/w1hd/zzhnc/model/Prize.java b/src/com/w1hd/zzhnc/model/Prize.java index cfa9c91..e91d9fe 100644 --- a/src/com/w1hd/zzhnc/model/Prize.java +++ b/src/com/w1hd/zzhnc/model/Prize.java @@ -13,7 +13,6 @@ public class Prize implements Serializable { private static final long serialVersionUID = 1L; private Integer id; - private String name; private Integer num = 0; private Boolean isMoney; @@ -22,6 +21,7 @@ public class Prize implements Serializable { private Integer maxMoney; private Date createtime; private Boolean deleted; + private String imgUrl; public Boolean getIsMoney() { return isMoney; @@ -103,4 +103,12 @@ public class Prize implements Serializable { this.deleted = deleted; } + public String getImgUrl() { + return imgUrl; + } + + public void setImgUrl(String imgUrl) { + this.imgUrl = imgUrl; + } + } \ No newline at end of file -- libgit2 0.24.0