|
@@ -1,7 +1,9 @@
|
|
package com.fs.recharge.service.impl;
|
|
package com.fs.recharge.service.impl;
|
|
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
import cn.hutool.json.JSONUtil;
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.fs.common.core.domain.R;
|
|
import com.fs.common.core.domain.R;
|
|
@@ -28,6 +30,7 @@ import com.fs.recharge.domain.FsUserRechargeRecord;
|
|
import com.fs.recharge.domain.RechargeTemplate;
|
|
import com.fs.recharge.domain.RechargeTemplate;
|
|
import com.fs.recharge.mapper.RechargeTemplateMapper;
|
|
import com.fs.recharge.mapper.RechargeTemplateMapper;
|
|
import com.fs.recharge.param.RechargeParam;
|
|
import com.fs.recharge.param.RechargeParam;
|
|
|
|
+import com.fs.recharge.param.RechargeTemplateQuery;
|
|
import com.fs.recharge.service.FsUserRechargeRecordService;
|
|
import com.fs.recharge.service.FsUserRechargeRecordService;
|
|
import com.fs.recharge.service.RechargeTemplateService;
|
|
import com.fs.recharge.service.RechargeTemplateService;
|
|
import com.fs.recharge.vo.RechargeTemplateVO;
|
|
import com.fs.recharge.vo.RechargeTemplateVO;
|
|
@@ -317,9 +320,43 @@ public class RechargeTemplateServiceImpl extends ServiceImpl<RechargeTemplateMap
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 获取用户购买数量
|
|
|
|
+ */
|
|
@Override
|
|
@Override
|
|
public Long countUserPurchaseByTemplateId(Long userId, Long id) {
|
|
public Long countUserPurchaseByTemplateId(Long userId, Long id) {
|
|
- return 0L;
|
|
|
|
|
|
+ return this.fsUserRechargeRecordService.countUserPurchaseByTemplateId(userId,id);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public List<RechargeTemplateVO> queryList(RechargeTemplateQuery query) {
|
|
|
|
+ log.info("查询充值模板列表,参数:{}", query);
|
|
|
|
+
|
|
|
|
+ QueryWrapper<RechargeTemplate> queryWrapper = new QueryWrapper<>();
|
|
|
|
+
|
|
|
|
+ if (StringUtil.isNotBlank(query.getTemplateName())) {
|
|
|
|
+ queryWrapper.like("template_name", query.getTemplateName());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (query.getStatus() != null) {
|
|
|
|
+ queryWrapper.eq("status", query.getStatus());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (StringUtil.isNotBlank(query.getTag())) {
|
|
|
|
+ queryWrapper.eq("tag", query.getTag());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ queryWrapper.orderByAsc("sort_order");
|
|
|
|
+
|
|
|
|
+ List<RechargeTemplate> templateList = baseMapper.selectList(queryWrapper);
|
|
|
|
+
|
|
|
|
+ if (CollectionUtils.isEmpty(templateList)) {
|
|
|
|
+ return Collections.emptyList();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return templateList.stream()
|
|
|
|
+ .map(this::convertToVO)
|
|
|
|
+ .collect(Collectors.toList());
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|