Commit f8593ed7 authored by alex yao's avatar alex yao

fix:權益訂單創建限制

parent a2a00e43
...@@ -12,7 +12,17 @@ public class EquityEnum { ...@@ -12,7 +12,17 @@ public class EquityEnum {
* 类型 normal-普通 professional-专业版 , ultimate-旗舰版 * 类型 normal-普通 professional-专业版 , ultimate-旗舰版
*/ */
public enum TYPE { public enum TYPE {
normal, professional, ultimate; normal(1), professional(2), ultimate(3);
private Integer level;
TYPE(Integer level) {
this.level = level;
}
public Integer getLevel() {
return level;
}
public static boolean isMatch(String type) { public static boolean isMatch(String type) {
TYPE[] values = values(); TYPE[] values = values();
......
...@@ -3,7 +3,9 @@ package cn.com.poc.equity.rest.impl; ...@@ -3,7 +3,9 @@ package cn.com.poc.equity.rest.impl;
import cn.com.poc.common.utils.Assert; import cn.com.poc.common.utils.Assert;
import cn.com.poc.common.utils.BlContext; import cn.com.poc.common.utils.BlContext;
import cn.com.poc.equity.aggregate.EquityService; import cn.com.poc.equity.aggregate.EquityService;
import cn.com.poc.equity.aggregate.MemberEquityService;
import cn.com.poc.equity.constants.EquityEnum; import cn.com.poc.equity.constants.EquityEnum;
import cn.com.poc.equity.domain.MemberEquityInfo;
import cn.com.poc.equity.dto.CurrentUserPayOrderDto; import cn.com.poc.equity.dto.CurrentUserPayOrderDto;
import cn.com.poc.equity.dto.EquityOrderCreateDto; import cn.com.poc.equity.dto.EquityOrderCreateDto;
import cn.com.poc.equity.entity.CurrentUserPayOrderEntity; import cn.com.poc.equity.entity.CurrentUserPayOrderEntity;
...@@ -26,6 +28,9 @@ public class EquityOrderRestImpl implements EquityOrderRest { ...@@ -26,6 +28,9 @@ public class EquityOrderRestImpl implements EquityOrderRest {
@Resource @Resource
private EquityService equityService; private EquityService equityService;
@Resource
private MemberEquityService memberEquityService;
@Override @Override
public String createOrder(EquityOrderCreateDto createDto) throws Exception { public String createOrder(EquityOrderCreateDto createDto) throws Exception {
Assert.notNull(createDto); Assert.notNull(createDto);
...@@ -42,6 +47,14 @@ public class EquityOrderRestImpl implements EquityOrderRest { ...@@ -42,6 +47,14 @@ public class EquityOrderRestImpl implements EquityOrderRest {
throw new I18nMessageException("exception/user.not.login"); throw new I18nMessageException("exception/user.not.login");
} }
// 获取用户当前权益
MemberEquityInfo equityInfo = memberEquityService.getEquityInfo(currentUser.getUserId());
EquityEnum.TYPE currentEquityLevel = equityInfo.getEquityLevel();
if (currentEquityLevel.getLevel() > EquityEnum.TYPE.valueOf(createDto.getType()).getLevel()) {
throw new I18nMessageException("equity/target.equity.is.lower.current.equity");
}
return equityService.createEquityOrder( return equityService.createEquityOrder(
EquityEnum.TYPE.valueOf(createDto.getType()), EquityEnum.TYPE.valueOf(createDto.getType()),
EquityEnum.DOMAIN.valueOf(createDto.getDomain()), EquityEnum.DOMAIN.valueOf(createDto.getDomain()),
......
...@@ -4,3 +4,4 @@ not.enough.points=Not enough points ...@@ -4,3 +4,4 @@ not.enough.points=Not enough points
transaction.history.not.exist=The slip does not exist transaction.history.not.exist=The slip does not exist
event.not.support=Current event is not supported event.not.support=Current event is not supported
equity.level.not.exist=Equity level does not exist equity.level.not.exist=Equity level does not exist
target.equity.is.lower.current.equity=The target equity is lower than the current equity and cannot be created
\ No newline at end of file
...@@ -4,3 +4,4 @@ not.enough.points=\u79EF\u5206\u4E0D\u8DB3 ...@@ -4,3 +4,4 @@ not.enough.points=\u79EF\u5206\u4E0D\u8DB3
transaction.history.not.exist=\u6D41\u6C34\u4E0D\u5B58\u5728 transaction.history.not.exist=\u6D41\u6C34\u4E0D\u5B58\u5728
event.not.support=\u4E0D\u652F\u6301\u5F53\u524D\u4E8B\u4EF6 event.not.support=\u4E0D\u652F\u6301\u5F53\u524D\u4E8B\u4EF6
equity.level.not.exist=\u6743\u76CA\u7B49\u7EA7\u4E0D\u5B58\u5728 equity.level.not.exist=\u6743\u76CA\u7B49\u7EA7\u4E0D\u5B58\u5728
target.equity.is.lower.current.equity=\u76EE\u6807\u6743\u76CA\u6BD4\u5F53\u524D\u6743\u76CA\u4F4E\uFF0C\u65E0\u6CD5\u521B\u5EFA
\ No newline at end of file
...@@ -4,3 +4,4 @@ not.enough.points=\u7A4D\u5206\u4E0D\u8DB3 ...@@ -4,3 +4,4 @@ not.enough.points=\u7A4D\u5206\u4E0D\u8DB3
transaction.history.not.exist=\u6D41\u6C34\u55AE\u4E0D\u5B58\u5728 transaction.history.not.exist=\u6D41\u6C34\u55AE\u4E0D\u5B58\u5728
event.not.support=\u4E0D\u652F\u6301\u7576\u524D\u4E8B\u4EF6 event.not.support=\u4E0D\u652F\u6301\u7576\u524D\u4E8B\u4EF6
equity.level.not.exist=\u6B0A\u76CA\u7B49\u7D1A\u4E0D\u5B58\u5728 equity.level.not.exist=\u6B0A\u76CA\u7B49\u7D1A\u4E0D\u5B58\u5728
target.equity.is.lower.current.equity=\u76EE\u6A19\u6B0A\u76CA\u6BD4\u7576\u524D\u6B0A\u76CA\u4F4E\uFF0C\u7121\u6CD5\u5275\u5EFA
\ No newline at end of file
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