Skip to content

Y
yd-csf
Commit d8e51c8c by zhangxingmin
Options

Merge remote-tracking branch 'origin/test' into test

parents 8e3d44b1 1f3877e1
Showing with 15 additions and 21 deletions
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java
...@@ -2,6 +2,9 @@ package com.yd.csf.api.service.impl; ...@@ -2,6 +2,9 @@ package com.yd.csf.api.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.WriteSheet;
...@@ -9,7 +12,6 @@ import com.alibaba.fastjson.JSON; ...@@ -9,7 +12,6 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.type.TypeReference;
import com.yd.auth.core.dto.AuthUserDto; import com.yd.auth.core.dto.AuthUserDto;
import com.yd.auth.core.utils.SecurityUtil; import com.yd.auth.core.utils.SecurityUtil;
import com.yd.base.feign.client.exchangerate.ApiExchangeRateFeignClient; import com.yd.base.feign.client.exchangerate.ApiExchangeRateFeignClient;
...@@ -32,7 +34,6 @@ import com.yd.csf.service.dto.QueryPolicyBrokerDto; ...@@ -32,7 +34,6 @@ import com.yd.csf.service.dto.QueryPolicyBrokerDto;
import com.yd.csf.service.enums.FortuneStatusEnum; import com.yd.csf.service.enums.FortuneStatusEnum;
import com.yd.csf.service.model.*; import com.yd.csf.service.model.*;
import com.yd.csf.service.service.*; import com.yd.csf.service.service.*;
import com.yd.csf.service.utils.GSONUtil;
import com.yd.csf.service.vo.ExpectedFortuneExportDTO; import com.yd.csf.service.vo.ExpectedFortuneExportDTO;
import com.yd.csf.service.vo.ExpectedFortuneStatisticsVO; import com.yd.csf.service.vo.ExpectedFortuneStatisticsVO;
import com.yd.csf.service.vo.PayableReportVO; import com.yd.csf.service.vo.PayableReportVO;
...@@ -357,9 +358,6 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -357,9 +358,6 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
} }
private void updateHkdAmountBatch(List<ExpectedFortune> expectedFortuneList, QueryPolicyAndBrokerDto queryPolicyAndBrokerDto) { private void updateHkdAmountBatch(List<ExpectedFortune> expectedFortuneList, QueryPolicyAndBrokerDto queryPolicyAndBrokerDto) {
//查询转介人职级比例
//查询结算币种 //查询结算币种
ApiAnnouncementCommissionRatioListRequest request = new ApiAnnouncementCommissionRatioListRequest(); ApiAnnouncementCommissionRatioListRequest request = new ApiAnnouncementCommissionRatioListRequest();
request.setProductLaunchBizId(queryPolicyAndBrokerDto.getPlanBizId()); request.setProductLaunchBizId(queryPolicyAndBrokerDto.getPlanBizId());
...@@ -370,22 +368,24 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -370,22 +368,24 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
log.info("查询结算币种->入参request：{}，出参result：{}", JSON.toJSONString(request), JSON.toJSONString(result)); log.info("查询结算币种->入参request：{}，出参result：{}", JSON.toJSONString(request), JSON.toJSONString(result));
if (result.getCode() == 200) { if (result.getCode() == 200) {
// 直接使用Map来处理数据，避免复杂的类型转换 // 使用 Map 来处理数据
Object data = result.getData(); Object data = result.getData();
// 将数据转换为JSONObject进行解析
List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList = GSONUtil.fromJson(JSON.toJSONString(data), new TypeReference<List<ApiAnnouncementCommissionRatioListResponse>>() { JSONArray announcementRatioList = JSONUtil.parseArray(data);
}.getType());
//查询默认结算汇率 //查询默认结算汇率
if (CollUtil.isNotEmpty(announcementRatioList)) { if (!announcementRatioList.isEmpty()) {
ApiAnnouncementCommissionRatioListResponse announcementRatio = announcementRatioList.get(0); JSONObject announcementRatio = announcementRatioList.get(0, JSONObject.class);
String currency = announcementRatio.getCurrency(); String currency = announcementRatio.getStr("currency");
log.info("结算币种：{}", currency);
BigDecimal exchangeRate = queryExchangeRateByFeign(queryPolicyAndBrokerDto.getCurrency(), currency); BigDecimal exchangeRate = queryExchangeRateByFeign(queryPolicyAndBrokerDto.getCurrency(), currency);
log.info("结算汇率：{}", exchangeRate);
for (ExpectedFortune expectedFortune : expectedFortuneList) { for (ExpectedFortune expectedFortune : expectedFortuneList) {
//设置结算货币 //设置结算货币
expectedFortune.setCurrency(currency); expectedFortune.setCurrency(currency);
...@@ -393,14 +393,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -393,14 +393,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
expectedFortune.setDefaultExchangeRate(exchangeRate); expectedFortune.setDefaultExchangeRate(exchangeRate);
//设置港币金额（标准发佣金额 * 默认结算汇率） //设置港币金额（标准发佣金额 * 默认结算汇率）
expectedFortune.setHkdAmount(expectedFortune.getAmount().multiply(exchangeRate)); expectedFortune.setHkdAmount(expectedFortune.getAmount().multiply(exchangeRate));
//设置转介人职级比例
iExpectedFortuneService.lambdaUpdate() iExpectedFortuneService.updateById(expectedFortune);
.set(ExpectedFortune::getCurrency, currency)
.set(ExpectedFortune::getDefaultExchangeRate, exchangeRate)
.set(ExpectedFortune::getHkdAmount, expectedFortune.getHkdAmount())
.eq(ExpectedFortune::getId, expectedFortune.getId());
} }
} else { } else {
log.error("查询结算币种失败，未查询到默认结算汇率->入参request：{}，出参result：{}", JSON.toJSONString(request), JSON.toJSONString(result)); log.error("查询结算币种失败，未查询到默认结算汇率->入参request：{}，出参result：{}", JSON.toJSONString(request), JSON.toJSONString(result));
......
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