Commit febc0310 authored by hezhen's avatar hezhen

修改会员等级

parent 483c3376
...@@ -69,6 +69,16 @@ public class BaseUserMemberLevel implements Serializable { ...@@ -69,6 +69,16 @@ public class BaseUserMemberLevel implements Serializable {
@Column(name = "discount") @Column(name = "discount")
@ApiModelProperty(value = "折扣") @ApiModelProperty(value = "折扣")
private Integer discount; private Integer discount;
@Column(name = "share_amount")
@ApiModelProperty(value = "分红金额")
private BigDecimal shareAmount;
@Column(name = "is_show")
@ApiModelProperty(value = "是否显示:0-不显示;1-显示")
private Integer isShow;
//是否删除;0-正常;1-删除 //是否删除;0-正常;1-删除
@Column(name = "isdel") @Column(name = "isdel")
......
...@@ -33,6 +33,18 @@ public class UserMemberLevelBiz extends BaseBiz<BaseUserMemberLevelMapper,BaseUs ...@@ -33,6 +33,18 @@ public class UserMemberLevelBiz extends BaseBiz<BaseUserMemberLevelMapper,BaseUs
return mapper.selectByExample(example); return mapper.selectByExample(example);
} }
@Transactional
public List<BaseUserMemberLevel> getList(BaseUserMemberLevel baseUserMemberLevel) {
Example example=new Example(BaseUserMemberLevel.class);
Example.Criteria criteria = example.createCriteria();
criteria.andEqualTo("isdel",0);
if (baseUserMemberLevel.getIsShow() != null){
criteria.andEqualTo("isShow",baseUserMemberLevel.getIsShow());
}
example.setOrderByClause(" level asc ");
return mapper.selectByExample(example);
}
public BaseUserMemberLevel getLevel(Integer level) { public BaseUserMemberLevel getLevel(Integer level) {
Example example=new Example(BaseUserMemberLevel.class); Example example=new Example(BaseUserMemberLevel.class);
example.createCriteria().andEqualTo("isdel",0).andEqualTo("level",level); example.createCriteria().andEqualTo("isdel",0).andEqualTo("level",level);
......
...@@ -33,8 +33,9 @@ public class MemberLevelController extends BaseController<UserMemberLevelBiz, Ba ...@@ -33,8 +33,9 @@ public class MemberLevelController extends BaseController<UserMemberLevelBiz, Ba
} }
@RequestMapping(value = "/app/unauth/level/list", method = RequestMethod.GET) @RequestMapping(value = "/app/unauth/level/list", method = RequestMethod.GET)
public ObjectRestResponse<List<BaseUserMemberLevel>>list() throws Exception { public ObjectRestResponse<List<BaseUserMemberLevel>>list(BaseUserMemberLevel baseUserMemberLevel) throws Exception {
return ObjectRestResponse.succ(memberBiz.getLevesls()); baseUserMemberLevel.setIsShow(1);
return ObjectRestResponse.succ(memberBiz.getList(baseUserMemberLevel));
} }
@RequestMapping(value = "/app/unauth/level/{type}", method = RequestMethod.GET) @RequestMapping(value = "/app/unauth/level/{type}", method = RequestMethod.GET)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment