|
|
|
@ -1,12 +1,22 @@
|
|
|
|
|
package com.baiye.modules.system.service.impl;
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import com.baiye.constant.DefaultNumberConstants;
|
|
|
|
|
import com.baiye.model.dto.UserDto;
|
|
|
|
|
import com.baiye.modules.system.domain.Company;
|
|
|
|
|
import com.baiye.modules.system.domain.PayCombo;
|
|
|
|
|
import com.baiye.modules.system.domain.User;
|
|
|
|
|
import com.baiye.modules.system.repository.CompanyRepository;
|
|
|
|
|
import com.baiye.modules.system.repository.PayComboRepository;
|
|
|
|
|
import com.baiye.modules.system.repository.UserRepository;
|
|
|
|
|
import com.baiye.modules.system.service.CompanyService;
|
|
|
|
|
import com.baiye.modules.system.service.PayComboService;
|
|
|
|
|
import com.baiye.modules.system.service.UserService;
|
|
|
|
|
import com.baiye.modules.system.service.dto.CompanyDto;
|
|
|
|
|
import com.baiye.modules.system.service.dto.PayComboQueryCriteria;
|
|
|
|
|
import com.baiye.modules.system.service.mapstruct.PayComboMapper;
|
|
|
|
|
import com.baiye.util.QueryHelp;
|
|
|
|
|
import com.baiye.util.SecurityUtils;
|
|
|
|
|
import com.baiye.util.StringUtils;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
@ -31,7 +41,9 @@ import java.util.Set;
|
|
|
|
|
public class PayComboServiceImpl implements PayComboService {
|
|
|
|
|
|
|
|
|
|
private final PayComboRepository payComboRepository;
|
|
|
|
|
private final CompanyService companyService;
|
|
|
|
|
private final CompanyRepository companyRepository;
|
|
|
|
|
private final UserRepository userRepository;
|
|
|
|
|
private final PayComboMapper payComboMapper;
|
|
|
|
|
@Value("${payTemplate.base_fee}")
|
|
|
|
|
private Double baseFee;
|
|
|
|
|
@Value("${payTemplate.beyond_fee}")
|
|
|
|
@ -77,17 +89,20 @@ public class PayComboServiceImpl implements PayComboService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public Object query() {
|
|
|
|
|
public Object list() {
|
|
|
|
|
//1、查询公司的模板
|
|
|
|
|
CompanyDto company = companyService.findCompanyById(SecurityUtils.getCurrentUserId());
|
|
|
|
|
Long fatherTemplateId = company.getTemplateId();
|
|
|
|
|
//2、查询
|
|
|
|
|
Set<PayCombo> payCombos = payComboRepository.findByFatherTemplateIdAndStatus(fatherTemplateId, DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
|
User user = userRepository.findById(SecurityUtils.getCurrentUserId()).orElseGet(User::new);
|
|
|
|
|
Company company = companyRepository.findById(user.getCompanyId()).orElseGet(Company::new);
|
|
|
|
|
HashMap<Object, Object> map = new HashMap<>();
|
|
|
|
|
if (CollUtil.isNotEmpty(payCombos)){
|
|
|
|
|
map.put("list", payCombos);
|
|
|
|
|
map.put("baseFee",baseFee);
|
|
|
|
|
map.put("beyondFee",beyondFee);
|
|
|
|
|
if (ObjectUtil.isNotEmpty(company)){
|
|
|
|
|
Long fatherTemplateId = company.getTemplateId();
|
|
|
|
|
//2、查询
|
|
|
|
|
Set<PayCombo> payCombos = payComboRepository.findByFatherTemplateIdAndStatus(fatherTemplateId, DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
|
if (CollUtil.isNotEmpty(payCombos)){
|
|
|
|
|
map.put("list", payCombos);
|
|
|
|
|
map.put("baseFee",baseFee);
|
|
|
|
|
map.put("beyondFee",beyondFee);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return map;
|
|
|
|
|
}
|
|
|
|
@ -97,4 +112,11 @@ public class PayComboServiceImpl implements PayComboService {
|
|
|
|
|
public PayCombo findTemplateById(Long templateId) {
|
|
|
|
|
return payComboRepository.findById(templateId).orElseGet(PayCombo::new);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public Object query(PayComboQueryCriteria payComboQueryCriteria) {
|
|
|
|
|
payComboQueryCriteria.setStatus(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
|
return payComboMapper.toDto(payComboRepository.findAll((root, criteriaQuery, criteriaBuilder) ->
|
|
|
|
|
QueryHelp.getPredicate(root, payComboQueryCriteria, criteriaBuilder)));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|