moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复查询档位问题

Browse Source
This commit is contained in:
liaozetao
2023-08-21 18:45:12 +08:00
parent be58a6610e
commit 09972fcc6d
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeChannelAdminServiceImpl.java
View File

@@ -13,10 +13,12 @@ import com.accompany.payment.model.ChargeProd;
import com.accompany.payment.model.ChargeProdExample;
import com.accompany.payment.model.ChargeRegion;
import com.accompany.payment.service.ChargeChannelService;
import com.accompany.payment.service.ChargeProdService;
import com.accompany.payment.service.ChargeRegionService;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -44,6 +46,9 @@ public class ChargeChannelAdminServiceImpl implements ChargeChannelAdminService
@Autowired
private ChargeChannelService chargeChannelService;
@Autowired
private ChargeProdService chargeProdService;
@Override
public Page<ChargeChannelAdminVo> page(Integer regionType) {
List<ChargeRegion> chargeRegions = chargeRegionService.list(Wrappers.<ChargeRegion>lambdaQuery()
@@ -68,9 +73,15 @@ public class ChargeChannelAdminServiceImpl implements ChargeChannelAdminService
admin.setCurrency(chargeRegion.getCurrency());
admin.setUsdRate(chargeRegion.getRate());
ChargeProdExample example = new ChargeProdExample();
example.createCriteria().andCountryEqualTo(regionCode)
.andPayChannelEqualTo(payChannel)
.andPaymentTypeEqualTo(paymentType);
ChargeProdExample.Criteria criteria = example.createCriteria();
criteria.andCountryEqualTo(regionCode)
.andPayChannelEqualTo(payChannel);
//需要特殊的产品，例如点数卡是固定数额
if (chargeChannel.isSpecial() && StringUtils.isNotBlank(paymentType)){
criteria.andPaymentTypeEqualTo(paymentType);
} else {
criteria.andPaymentTypeEqualIsNull();
}
admin.setChargeProds(chargeProdMapper.selectByExample(example));
admins.add(admin);
}