Skip to content

O
online-edu-backend
Commit 48f82fc8 authored by liuyang's avatar liuyang
Browse files
Options

update

parent 5594c14e
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 38 deletions
src/main/java/com/qkdata/biz/common/BizConstants.java
View file @ 48f82fc8
......@@ -34,6 +34,7 @@ public class BizConstants {
public static final String CONFIG_KEY_DISCOUNT_6MON = "discount_6mon";
public static final String CONFIG_KEY_DISCOUNT_12MON = "discount_12mon";
public static final String CONFIG_KEY_ENTERPRICE_VIP_PRICE = "enterprice_vip_price";
public static final String CONFIG_KEY_USER_TAG_PRICE = "user_tag_price";
public static final String SMS_TEMPLATE_CODE = "T_LG_CAPTCHA";
public static final String SMS_CHECK_USER_TEMPLATE_CODE = "T_CK_CAPTCHA";
......
src/main/java/com/qkdata/biz/management/service/PriceConfigService.java
View file @ 48f82fc8
package com.qkdata.biz.management.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.common.collect.Lists;
import com.qkdata.biz.common.BizConstants;
import com.qkdata.biz.management.vo.PriceConfigModel;
import com.qkdata.biz.management.vo.UserTagPriceModel;
import com.qkdata.biz.sys.entity.SysConfigPO;
import com.qkdata.biz.sys.service.SysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -19,10 +22,8 @@ public class PriceConfigService {
private SysConfigService sysConfigService;
private List<String> paramKeys = Lists.newArrayList(
BizConstants.CONFIG_KEY_VIP_PRICE,
BizConstants.CONFIG_KEY_DISCOUNT_3MON,
BizConstants.CONFIG_KEY_DISCOUNT_6MON,
BizConstants.CONFIG_KEY_DISCOUNT_12MON,
BizConstants.CONFIG_KEY_ENTERPRICE_VIP_PRICE);
BizConstants.CONFIG_KEY_ENTERPRICE_VIP_PRICE,
BizConstants.CONFIG_KEY_USER_TAG_PRICE);
private String configType = "PriceConfig";
public PriceConfigModel findConfig() {
......@@ -35,18 +36,16 @@ public class PriceConfigService {
case BizConstants.CONFIG_KEY_VIP_PRICE:
model.setVipPrice(new BigDecimal(config.getValue()));
break;
case BizConstants.CONFIG_KEY_DISCOUNT_3MON:
model.setDiscountFor3Mon(new BigDecimal(config.getValue()));
break;
case BizConstants.CONFIG_KEY_DISCOUNT_6MON:
model.setDiscountFor6Mon(new BigDecimal(config.getValue()));
break;
case BizConstants.CONFIG_KEY_DISCOUNT_12MON:
model.setDiscountFor12Mon(new BigDecimal(config.getValue()));
break;
case BizConstants.CONFIG_KEY_ENTERPRICE_VIP_PRICE:
model.setEnterpriceVipPrice(new BigDecimal(config.getValue()));
break;
case BizConstants.CONFIG_KEY_USER_TAG_PRICE:
String userTagPriceJson = config.getValue();
if (StrUtil.isNotBlank(userTagPriceJson)){
List<UserTagPriceModel> userTagPriceModelList = JSONArray.parseArray(userTagPriceJson,UserTagPriceModel.class);
model.setUserTagPrice(userTagPriceModelList);
}
break;
}
}
}
......@@ -59,18 +58,15 @@ public class PriceConfigService {
case BizConstants.CONFIG_KEY_VIP_PRICE:
sysConfigService.updateValueByKey(BizConstants.CONFIG_KEY_VIP_PRICE, model.getVipPrice().toString());
break;
case BizConstants.CONFIG_KEY_DISCOUNT_3MON:
sysConfigService.updateValueByKey(BizConstants.CONFIG_KEY_DISCOUNT_3MON, model.getDiscountFor3Mon().toString());
break;
case BizConstants.CONFIG_KEY_DISCOUNT_6MON:
sysConfigService.updateValueByKey(BizConstants.CONFIG_KEY_DISCOUNT_6MON, model.getDiscountFor6Mon().toString());
break;
case BizConstants.CONFIG_KEY_DISCOUNT_12MON:
sysConfigService.updateValueByKey(BizConstants.CONFIG_KEY_DISCOUNT_12MON, model.getDiscountFor12Mon().toString());
break;
case BizConstants.CONFIG_KEY_ENTERPRICE_VIP_PRICE:
sysConfigService.updateValueByKey(BizConstants.CONFIG_KEY_ENTERPRICE_VIP_PRICE, model.getEnterpriceVipPrice().toString());
break;
case BizConstants.CONFIG_KEY_USER_TAG_PRICE:
if (CollUtil.isNotEmpty(model.getUserTagPrice())){
String userTagPriceJson = JSONArray.toJSONString(model.getUserTagPrice());
sysConfigService.updateValueByKey(BizConstants.CONFIG_KEY_USER_TAG_PRICE,userTagPriceJson);
}
break;
}
}
}
......
src/main/java/com/qkdata/biz/management/vo/CourseDetailModel.java
View file @ 48f82fc8
......@@ -97,5 +97,8 @@ public class CourseDetailModel {
* 课程附件列表
*/
private List<CourseAttachmentModel> attachmentList;
/**
* 课程标签ID，多个以逗号分隔
*/
private String userTagIds;
}
src/main/java/com/qkdata/biz/management/vo/PriceConfigModel.java
View file @ 48f82fc8
......@@ -3,6 +3,7 @@ package com.qkdata.biz.management.vo;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* 会员价格配置对象
......@@ -13,20 +14,12 @@ public class PriceConfigModel {
* 购买一个月会员价格
*/
private BigDecimal vipPrice;
/**
* 购买3个月会员折扣
*/
private BigDecimal discountFor3Mon;
/**
* 购买6个月会员折扣
*/
private BigDecimal discountFor6Mon;
/**
* 购买12个月会员折扣
*/
private BigDecimal discountFor12Mon;
/**
* 企业会员价格
*/
private BigDecimal enterpriceVipPrice;
/**
* 用户标签价格
*/
private List<UserTagPriceModel> userTagPrice;
}
src/main/java/com/qkdata/biz/management/vo/UserTagPriceModel.java 0 → 100644
View file @ 48f82fc8
package com.qkdata.biz.management.vo;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class UserTagPriceModel {
private Long id;
private String name;
private BigDecimal price;
}
src/main/java/com/qkdata/biz/sys/service/SysUserService.java
View file @ 48f82fc8
......@@ -10,10 +10,7 @@ import com.qkdata.biz.enums.AccountStatusEnum;
import com.qkdata.biz.enums.AccountTypeEnum;
import com.qkdata.biz.enums.ProductTypeEnum;
import com.qkdata.biz.management.entity.*;
import com.qkdata.biz.management.service.OrgSurplusService;
import com.qkdata.biz.management.service.OrgUserReceiveRecordService;
import com.qkdata.biz.management.service.OrganizationService;
import com.qkdata.biz.management.service.UserCourseAuthService;
import com.qkdata.biz.management.service.*;
import com.qkdata.biz.sys.entity.SysUserExtPO;
import com.qkdata.biz.sys.entity.SysUserPO;
import com.qkdata.biz.sys.mapper.SysUserExtMapper;
......@@ -57,6 +54,8 @@ public class SysUserService extends BaseServiceImpl<SysUserMapper, SysUserPO> {
private UserCourseAuthService userCourseAuthService;
@Autowired
private OrganizationService orgService;
@Autowired
private UserTagService userTagService;
public SysUserPO getByUsername(String username) {
return baseMapper.selectOne(Wrappers.<SysUserPO>lambdaQuery().eq(SysUserPO::getUsername,username));
......@@ -151,6 +150,10 @@ public class SysUserService extends BaseServiceImpl<SysUserMapper, SysUserPO> {
userInfo.setEnterpriseName(orgPo.getName());
}
}
List<UserTagPO> usertagList = userTagService.findTagsByUserId(userInfo.getId());
if (CollUtil.isNotEmpty(usertagList)){
userInfo.setUserTagList(usertagList);
}
}
return userInfo;
......
src/main/java/com/qkdata/biz/web/vo/FullUserInfo.java
View file @ 48f82fc8
......@@ -2,9 +2,11 @@ package com.qkdata.biz.web.vo;
import com.qkdata.biz.enums.AccountStatusEnum;
import com.qkdata.biz.enums.AccountTypeEnum;
import com.qkdata.biz.management.entity.UserTagPO;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Data
public class FullUserInfo {
......@@ -80,6 +82,10 @@ public class FullUserInfo {
* 认证token
*/
private String authorization;
/**
* 用户标签列表
*/
private List<UserTagPO> userTagList;
}
src/main/resources/db/migration/V1.0.2__update.sql 0 → 100644
View file @ 48f82fc8
DELETE from sys_config WHERE `key` in ('discount_3mon','discount_6mon','discount_12mon');
INSERT INTO `sys_config` VALUES (6, 'user_tag_price', NULL, 'PriceConfig', '用户标签价格', '2021-05-14 16:12:25', '2021-06-28 09:35:18');
\ 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