Commit 538e4e80 authored by 332784038@qq.com's avatar 332784038@qq.com

收款明细补充新的汇率业务值

parent 545558ed
......@@ -991,7 +991,7 @@ public class ReceiptItemServiceImpl extends AbstractService<ReceiptItemMapper, R
receiptItemCreateReqVO.setTargetAmount(batchCreateReqVO.getTargetAmount());
receiptItemCreateReqVO.setTargetCurrencyCode(batchCreateReqVO.getTargetCurrencyCode());
receiptItemCreateReqVO.setWriteOffCurrencyId(Long.parseLong(batchCreateReqVO.getSettleCurrency()));
receiptItemCreateReqVO.setWriteOffAmount(receiptItemCreateReqVO.getAmount().multiply(batchCreateReqVO.getSettleRateRatio()));
receiptItemCreateReqVO.setWriteOffAmount(receiptItemCreateReqVO.getAmount().multiply(batchCreateReqVO.getTargetAmount()).divide(batchCreateReqVO.getSourceAmount(), 2, RoundingMode.HALF_UP));
receiptItemCreateReqVO.setRemark(batchCreateReqVO.getRemark());
receiptItemCreateReqVO.setOrderNo(orderByNo.getOrderNo());
receiptItemCreateReqVO.setBatchRate(batchCreateReqVO.getSettleRate());
......@@ -1079,13 +1079,17 @@ public class ReceiptItemServiceImpl extends AbstractService<ReceiptItemMapper, R
}
// TODO 汇率逻辑修改
createReqVO.setSettleRateRatio(rate2.divide(rate1, 6, RoundingMode.HALF_UP));
createReqVO.setSourceAmount(rate1);
createReqVO.setTargetAmount(rate2);
}
for (CurrencyRespDTO value : allCurrency.values()) {
if (value.getTitleEn().equals(createReqVO.getPayCurrency())) {
createReqVO.setPayCurrency(value.getId().toString());
createReqVO.setSourceCurrencyCode(value.getFuhao());
}
if (value.getTitleEn().equals(createReqVO.getSettleCurrency())) {
createReqVO.setSettleCurrency(value.getId().toString());
createReqVO.setTargetCurrencyCode(value.getFuhao());
}
}
List<BankAccountDTO> accounts = bankApi.getBankAccountByAccountNo(createReqVO.getPayAccount());
......
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