Skip to content

zhangtai / zzhnc

转到一个项目
Commit 4197ed9d 由 zxt@theyeasy.com
选项

修改对象类型

1 个父辈 b23b3ef6
内嵌 并排
正在显示 5 个修改的文件 包含 202 行增加 和 223 行删除
src/com/w1hd/zzhnc/controller/wx/WxMiniController.java
......@@ -255,7 +255,24 @@ public class WxMiniController extends BaseController {
@RequestMapping(value = "/index",method=RequestMethod.GET)
@ResponseBody
public Object index(@RequestParam String openId) {
public Object index(@RequestParam("openId") String openId) {
try {
Map<String, Object> result = Maps.newHashMap();
List<Banner> bannerList = bannerService.getAll();
List<Articles> homeData = articleService.getHomeData();
List<Goods> homeData2 = goodsService.getHomeData();
result.put("banner", bannerList);
List<MiniHomeVO> data = MiniHomeVO.getData(homeData, homeData2);
result.put("data", data);
return new Vo_msg(0, result);
} catch (Exception e) {
return new Vo_msg(-1, "系统繁忙");
}
}
@RequestMapping(value = "/second",method=RequestMethod.GET)
@ResponseBody
public Object second(@RequestParam("openId") String openId,@RequestParam(value="page")Integer page,@RequestParam(value="size")Integer size) {
try {
Map<String, Object> result = Maps.newHashMap();
List<Banner> bannerList = bannerService.getAll();
......@@ -268,7 +285,6 @@ public class WxMiniController extends BaseController {
} catch (Exception e) {
return new Vo_msg(-1, "系统繁忙");
}
}
}
src/com/w1hd/zzhnc/model/Activity.java
......@@ -6,6 +6,9 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.springframework.format.annotation.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.collect.Lists;
public class Activity implements Serializable {
......@@ -14,8 +17,15 @@ public class Activity implements Serializable {
*
*/
private static final long serialVersionUID = 1L;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date beginTime;// 活动开始时间
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;// 活动结束时间
private int status;// 活动状态
private BigDecimal planMny;// 发放红包预算
private BigDecimal currentMny;
......
src/com/w1hd/zzhnc/model/Goods.java
......@@ -25,6 +25,7 @@ public class Goods {
private Date createtime;
private Date updateTime;
private Boolean deleted;
private String categoryName;
public Integer getId() {
return id;
......@@ -34,42 +35,25 @@ public class Goods {
this.id = id;
}
/**
* This method was generated by MyBatis Generator. This method returns the value
* of the database column goods.name
*
* @return the value of goods.name
*
* @mbggenerated Tue Dec 26 15:09:23 CST 2017
*/
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator. This method sets the value of
* the database column goods.name
*
* @param name
* the value for goods.name
*
* @mbggenerated Tue Dec 26 15:09:23 CST 2017
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator. This method returns the value
* of the database column goods.description
*
* @return the value of goods.description
*
* @mbggenerated Tue Dec 26 15:09:23 CST 2017
*/
public String getDescription() {
return description;
}
public String getCategoryName() {
return categoryName;
}
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
/**
* This method was generated by MyBatis Generator. This method sets the value of
......
src/com/w1hd/zzhnc/model/Lotterylog.java
......@@ -6,200 +6,168 @@ import java.util.Date;
import javax.persistence.Id;
public class Lotterylog {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column lotterylog.id
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
@Id
private Integer id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column lotterylog.fansid
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
private Integer fansid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column lotterylog.mny
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
private BigDecimal mny;
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column lotterylog.status
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
private Integer status;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column lotterylog.turn
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
private Integer turn;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column lotterylog.createdtime
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
private Date createdtime;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column lotterylog.id
*
* @return the value of lotterylog.id
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public Integer getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column lotterylog.id
*
* @param id the value for lotterylog.id
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public void setId(Integer id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column lotterylog.fansid
*
* @return the value of lotterylog.fansid
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public Integer getFansid() {
return fansid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column lotterylog.fansid
*
* @param fansid the value for lotterylog.fansid
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public void setFansid(Integer fansid) {
this.fansid = fansid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column lotterylog.mny
*
* @return the value of lotterylog.mny
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public BigDecimal getMny() {
return mny;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column lotterylog.mny
*
* @param mny the value for lotterylog.mny
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public void setMny(BigDecimal mny) {
this.mny = mny;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column lotterylog.status
*
* @return the value of lotterylog.status
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public Integer getStatus() {
return status;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column lotterylog.status
*
* @param status the value for lotterylog.status
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public void setStatus(Integer status) {
this.status = status;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column lotterylog.turn
*
* @return the value of lotterylog.turn
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public Integer getTurn() {
return turn;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column lotterylog.turn
*
* @param turn the value for lotterylog.turn
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public void setTurn(Integer turn) {
this.turn = turn;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column lotterylog.createdtime
*
* @return the value of lotterylog.createdtime
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public Date getCreatedtime() {
return createdtime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column lotterylog.createdtime
*
* @param createdtime the value for lotterylog.createdtime
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public void setCreatedtime(Date createdtime) {
this.createdtime = createdtime;
}
@Id
private Integer id;
private Integer fansid;
private String prizeName;
private BigDecimal mny;
private String name;
private Integer status;
private Integer turn;
private Date createdtime;
public Integer getId() {
return id;
}
public String getPrizeName() {
return prizeName;
}
public void setPrizeName(String prizeName) {
this.prizeName = prizeName;
}
/**
* This method was generated by MyBatis Generator. This method sets the value of
* the database column lotterylog.id
*
* @param id
* the value for lotterylog.id
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public void setId(Integer id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator. This method returns the value
* of the database column lotterylog.fansid
*
* @return the value of lotterylog.fansid
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public Integer getFansid() {
return fansid;
}
/**
* This method was generated by MyBatis Generator. This method sets the value of
* the database column lotterylog.fansid
*
* @param fansid
* the value for lotterylog.fansid
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public void setFansid(Integer fansid) {
this.fansid = fansid;
}
/**
* This method was generated by MyBatis Generator. This method returns the value
* of the database column lotterylog.mny
*
* @return the value of lotterylog.mny
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public BigDecimal getMny() {
return mny;
}
/**
* This method was generated by MyBatis Generator. This method sets the value of
* the database column lotterylog.mny
*
* @param mny
* the value for lotterylog.mny
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public void setMny(BigDecimal mny) {
this.mny = mny;
}
/**
* This method was generated by MyBatis Generator. This method returns the value
* of the database column lotterylog.status
*
* @return the value of lotterylog.status
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public Integer getStatus() {
return status;
}
/**
* This method was generated by MyBatis Generator. This method sets the value of
* the database column lotterylog.status
*
* @param status
* the value for lotterylog.status
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public void setStatus(Integer status) {
this.status = status;
}
/**
* This method was generated by MyBatis Generator. This method returns the value
* of the database column lotterylog.turn
*
* @return the value of lotterylog.turn
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public Integer getTurn() {
return turn;
}
/**
* This method was generated by MyBatis Generator. This method sets the value of
* the database column lotterylog.turn
*
* @param turn
* the value for lotterylog.turn
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public void setTurn(Integer turn) {
this.turn = turn;
}
/**
* This method was generated by MyBatis Generator. This method returns the value
* of the database column lotterylog.createdtime
*
* @return the value of lotterylog.createdtime
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public Date getCreatedtime() {
return createdtime;
}
/**
* This method was generated by MyBatis Generator. This method sets the value of
* the database column lotterylog.createdtime
*
* @param createdtime
* the value for lotterylog.createdtime
*
* @mbggenerated Thu Nov 30 17:43:59 CST 2017
*/
public void setCreatedtime(Date createdtime) {
this.createdtime = createdtime;
}
public String getName() {
return name;
......@@ -208,6 +176,5 @@ public class Lotterylog {
public void setName(String name) {
this.name = name;
}
}
\ No newline at end of file
src/com/w1hd/zzhnc/service/ActivityService.java
......@@ -108,6 +108,8 @@ public class ActivityService {
int total = logDao.getLotteryLogCount(turn, status);
BigDecimal bMny = logDao.getSumMny(turn, status);
int mny = bMny == null ? 0 : bMny.intValue();
pageResults.setPage(page);
pageResults.setPageSize(pagesize);
pageResults.setRows(list);
......
Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
请先完成此消息的编辑！