feat 增加返回充值配置
This commit is contained in:
parent
1555ca659e
commit
c8e70fd3a0
|
|
@ -51,8 +51,8 @@ public class RechargeServiceImpl implements IRechargeService {
|
||||||
Map<String, String> config = ConfigUtils.get("recharge");
|
Map<String, String> config = ConfigUtils.get("recharge");
|
||||||
|
|
||||||
RechargeConfigVo vo = new RechargeConfigVo();
|
RechargeConfigVo vo = new RechargeConfigVo();
|
||||||
vo.setOpenRecharge(Integer.parseInt(config.getOrDefault("openRecharge", "0")));
|
vo.setStatus(Integer.parseInt(config.getOrDefault("status", "0")));
|
||||||
vo.setMinRechargeMoney(new BigDecimal(config.getOrDefault("minRechargeMoney", "0")));
|
vo.setMinAmount(new BigDecimal(config.getOrDefault("min_amount", "0")));
|
||||||
vo.setUserMoney(user.getUserMoney());
|
vo.setUserMoney(user.getUserMoney());
|
||||||
return vo;
|
return vo;
|
||||||
}
|
}
|
||||||
|
|
@ -103,12 +103,12 @@ public class RechargeServiceImpl implements IRechargeService {
|
||||||
@Override
|
@Override
|
||||||
public Map<String, Object> placeOrder(Integer userId, Integer terminal, RechargeValidate rechargeValidate) {
|
public Map<String, Object> placeOrder(Integer userId, Integer terminal, RechargeValidate rechargeValidate) {
|
||||||
RechargeConfigVo config = this.config(userId);
|
RechargeConfigVo config = this.config(userId);
|
||||||
if (config.getOpenRecharge().equals(0)) {
|
if (config.getStatus().equals(0)) {
|
||||||
throw new OperateException("充值功能已关闭");
|
throw new OperateException("充值功能已关闭");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rechargeValidate.getOrderAmount().compareTo(config.getMinRechargeMoney()) < 0) {
|
if (rechargeValidate.getOrderAmount().compareTo(config.getMinAmount()) < 0) {
|
||||||
throw new OperateException("充值金额不能少于" + config.getMinRechargeMoney());
|
throw new OperateException("充值金额不能少于" + config.getMinAmount());
|
||||||
}
|
}
|
||||||
|
|
||||||
RechargeOrder order = new RechargeOrder();
|
RechargeOrder order = new RechargeOrder();
|
||||||
|
|
|
||||||
|
|
@ -14,10 +14,10 @@ public class RechargeConfigVo implements Serializable {
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
@ApiModelProperty("是否开启充值: 0=否,1=是")
|
@ApiModelProperty("是否开启充值: 0=否,1=是")
|
||||||
private Integer openRecharge;
|
private Integer status;
|
||||||
|
|
||||||
@ApiModelProperty("最低充值金额")
|
@ApiModelProperty("最低充值金额")
|
||||||
private BigDecimal minRechargeMoney;
|
private BigDecimal minAmount;
|
||||||
|
|
||||||
@ApiModelProperty("用户钱包")
|
@ApiModelProperty("用户钱包")
|
||||||
private BigDecimal userMoney;
|
private BigDecimal userMoney;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue