✨ 新增BFI汇率查询接口并完善结算单合同币种传递
- 新增BfiExchangeRateController: 提供/bfi/exchange-rate接口按币种和日期查询BFI汇率 - blade-transport/pom.xml: 添加blade-bfi-api依赖 - blade-transport/application.yml: 新建配置文件加载Nacos公共配置 - blade-transport/application-dev.yml: 简化配置，数据源等已在Nacos统一管理 - PreSettlementServiceImpl: contractOptions返回中增加settlementCurrency字段
This commit is contained in:
刘泉佳
@@ -39,6 +39,10 @@
|
||||
<groupId>org.springblade</groupId>
|
||||
<artifactId>blade-system-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springblade</groupId>
|
||||
<artifactId>blade-bfi-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-amqp</artifactId>
|
||||
|
||||
+76
@@ -0,0 +1,76 @@
|
||||
/**
|
||||
* BladeX Commercial License Agreement
|
||||
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
|
||||
* <p>
|
||||
* Use of this software is governed by the Commercial License Agreement
|
||||
* obtained after purchasing a license from BladeX.
|
||||
* <p>
|
||||
* 1. This software is for development use only under a valid license
|
||||
* from BladeX.
|
||||
* <p>
|
||||
* 2. Redistribution of this software's source code to any third party
|
||||
* without a commercial license is strictly prohibited.
|
||||
* <p>
|
||||
* 3. Licensees may copyright their own code but cannot use segments
|
||||
* from this software for such purposes. Copyright of this software
|
||||
* remains with BladeX.
|
||||
* <p>
|
||||
* Using this software signifies agreement to this License, and the software
|
||||
* must not be used for illegal purposes.
|
||||
* <p>
|
||||
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
|
||||
* not liable for any claims arising from secondary or illegal development.
|
||||
* <p>
|
||||
* Author: Chill Zhuang (bladejava@qq.com)
|
||||
*/
|
||||
package org.springblade.transport.controller;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springblade.core.boot.ctrl.BladeController;
|
||||
import org.springblade.core.tool.api.R;
|
||||
import org.springblade.core.tool.utils.StringUtil;
|
||||
import org.springblade.thirdparty.bfi.pojo.vo.BfiExchangeRateVO;
|
||||
import org.springblade.thirdparty.bfi.service.IBfiService;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 业财融合（BFI）汇率查询控制器
|
||||
*
|
||||
* @author Chill
|
||||
*/
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
@RequestMapping("/bfi")
|
||||
@Tag(name = "BFI汇率", description = "业财融合汇率查询接口")
|
||||
public class BfiExchangeRateController extends BladeController {
|
||||
|
||||
private final IBfiService bfiService;
|
||||
|
||||
@GetMapping("/exchange-rate")
|
||||
@Operation(summary = "BFI汇率查询", description = "根据结算币种编码和汇率日期查询BFI汇率")
|
||||
public R<BfiExchangeRateVO> getBfiExchangeRate(
|
||||
@RequestParam String currencyCode,
|
||||
@RequestParam(required = false) String effectdate) {
|
||||
LocalDate date = StringUtil.isBlank(effectdate) ? LocalDate.now() : LocalDate.parse(effectdate);
|
||||
List<BfiExchangeRateVO> rates = bfiService.queryExchangeRate(date, date);
|
||||
if (rates == null || rates.isEmpty()) {
|
||||
return R.fail("未查询到该日期的BFI汇率数据");
|
||||
}
|
||||
BfiExchangeRateVO matched = rates.stream()
|
||||
.filter(r -> currencyCode.equalsIgnoreCase(r.getOrgcurNumber()))
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
if (matched == null) {
|
||||
return R.fail("未查询到币种 " + currencyCode + " 的汇率数据");
|
||||
}
|
||||
return R.data(matched);
|
||||
}
|
||||
}
|
||||
+1
@@ -236,6 +236,7 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
|
||||
result.put("partyA", contract.getPartyA());
|
||||
result.put("partyB", contract.getPartyB());
|
||||
result.put("contractCategory", contract.getContractCategory());
|
||||
result.put("settlementCurrency", contract.getSettlementCurrency());
|
||||
result.put("fundDemand", project == null ? null : project.getFundDemand());
|
||||
result.put("settlementMode", project == null ? null : project.getSettlementMode());
|
||||
result.put("settlementType", contractSettlementType(contract));
|
||||
|
||||
@@ -1,10 +1,2 @@
|
||||
#服务器端口
|
||||
server:
|
||||
port: 8110
|
||||
|
||||
#数据源配置
|
||||
spring:
|
||||
datasource:
|
||||
url: ${blade.datasource.dev.url}
|
||||
username: ${blade.datasource.dev.username}
|
||||
password: ${blade.datasource.dev.password}
|
||||
# blade-transport 开发环境配置
|
||||
# 数据源等公共配置已在 Nacos 的 blade-dev.yaml 中统一管理
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
server:
|
||||
port: 8110
|
||||
|
||||
spring:
|
||||
application:
|
||||
name: blade-transport
|
||||
config:
|
||||
import:
|
||||
- nacos:blade.yaml?group=DEFAULT_GROUP&refreshEnabled=true
|
||||
- nacos:blade-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&refreshEnabled=true
|
||||
- optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&refreshEnabled=true
|
||||
cloud:
|
||||
nacos:
|
||||
username: ${NACOS_USERNAME:${NACOS_PROD_USERNAME:nacos}}
|
||||
password: ${NACOS_PASSWORD:${NACOS_PROD_PASSWORD:nacos}}
|
||||
server-addr: ${NACOS_HOST:${NACOS_PROD_HOST:127.0.0.1:8848}}
|
||||
discovery:
|
||||
namespace: "${NACOS_NAMESPACE:}"
|
||||
config:
|
||||
file-extension: yaml
|
||||
namespace: "${NACOS_NAMESPACE:}"
|
||||
datasource:
|
||||
url: ${blade.datasource.${spring.profiles.active}.url}
|
||||
username: ${blade.datasource.${spring.profiles.active}.username}
|
||||
password: ${blade.datasource.${spring.profiles.active}.password}
|
||||
|
||||
logging:
|
||||
level:
|
||||
org.springblade.thirdparty.bfi.feign.IBfiClient: DEBUG
|
||||
Reference in New Issue
Block a user