|
|
@@ -202,8 +202,9 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
BigDecimal giveMonth = getGiveMonth(val);
|
|
|
//转换格式
|
|
|
BigDecimal valDecimal = new BigDecimal(val);
|
|
|
- //单价150 固定
|
|
|
- BigDecimal price = new BigDecimal("150");
|
|
|
+ //获取单价
|
|
|
+ String activityAmount = sysConfigDao.findConfigValue("qqhe_2022_buy_member_activity_amount");
|
|
|
+ BigDecimal price = new BigDecimal(activityAmount);
|
|
|
//计算出购买的价格 单价 X 购买的月份
|
|
|
BigDecimal amount = price.multiply(valDecimal);
|
|
|
//获取会员总激活时间
|
|
|
@@ -244,7 +245,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
List<StudentPaymentOrder> studentPaymentOrders = studentPaymentOrderService.queryByCondition(GroupType.MEMBER,
|
|
|
null, sysUser.getId(), DealStatusEnum.ING, OrderTypeEnum.MEMBER);
|
|
|
if (CollectionUtils.isEmpty(studentPaymentOrders)) {
|
|
|
- BaseController.succeed();
|
|
|
+ return BaseController.succeed();
|
|
|
}
|
|
|
return BaseController.succeed(studentPaymentOrders.get(0));
|
|
|
}
|
|
|
@@ -268,6 +269,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
|
|
|
private SysUser getSysUser() {
|
|
|
Optional<SysUser> sysUserOpt = Optional.ofNullable(sysUserFeignService.queryUserInfo());
|
|
|
+ sysUserOpt.filter(s -> s.getOrganId() == 59).orElseThrow(() -> new BizException("该活动是齐齐哈尔分部专属活动"));
|
|
|
SysUser sysUser = sysUserOpt.orElseThrow(() -> new BizException("未查询到学生信息，请重新登录！"));
|
|
|
sysUserOpt.map(SysUser::getId)
|
|
|
.map(studentService::getLocked)
|
hgw