提交 b43a8df9 authored 作者: huyufan's avatar huyufan

修改BUG

上级 d22025d2
...@@ -512,11 +512,11 @@ public class OrderChildLoanComponent { ...@@ -512,11 +512,11 @@ public class OrderChildLoanComponent {
if (CollectionUtil.isNotEmpty(fList)) { if (CollectionUtil.isNotEmpty(fList)) {
fSize = fList.size(); fSize = fList.size();
} }
if (vSize > 1 if (vSize >= 1
&& fSize > 1 && fSize >= 1
) { ) {
return OwnerLoanRecordEnum.LoanTypeFlag.V_F.getCode(); return OwnerLoanRecordEnum.LoanTypeFlag.V_F.getCode();
} else if (vSize > 1) { } else if (vSize >= 1) {
return OwnerLoanRecordEnum.LoanTypeFlag.VIRTUAL_CURRENCY.getCode(); return OwnerLoanRecordEnum.LoanTypeFlag.VIRTUAL_CURRENCY.getCode();
} else { } else {
return OwnerLoanRecordEnum.LoanTypeFlag.FUND.getCode(); return OwnerLoanRecordEnum.LoanTypeFlag.FUND.getCode();
......
...@@ -46,7 +46,7 @@ public class LargeScreenListener { ...@@ -46,7 +46,7 @@ public class LargeScreenListener {
private final MongoTemplate mongoTemplate; private final MongoTemplate mongoTemplate;
@Transactional(rollbackFor = Exception.class) //@Transactional(rollbackFor = Exception.class)
@RabbitListener(queues = RabbitKeyConstants.ORDER_LARGE_SCREEN_QUEUE) @RabbitListener(queues = RabbitKeyConstants.ORDER_LARGE_SCREEN_QUEUE)
public void onMessage(String message) { public void onMessage(String message) {
try { try {
...@@ -66,7 +66,7 @@ public class LargeScreenListener { ...@@ -66,7 +66,7 @@ public class LargeScreenListener {
if (CollectionUtil.isNotEmpty(list)) { if (CollectionUtil.isNotEmpty(list)) {
log.info("当前地址已经记录receiveAddressId{}, sendAddressId{}", receiveAddressId, sendAddressId); log.info("当前地址已经记录receiveAddressId{}, sendAddressId{}", receiveAddressId, sendAddressId);
} else { } else {
/* ReceiveAndSendAddressVO feignAddressVO = Optional.of(addressFeign.getSendAndReceiveSystemAddress(sendAddressId, receiveAddressId)).filter(Result::succeed) ReceiveAndSendAddressVO feignAddressVO = Optional.of(addressFeign.getSendAndReceiveSystemAddress(sendAddressId, receiveAddressId)).filter(Result::succeed)
.map(Result::getData).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND); .map(Result::getData).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
log.info("查询出标准地址相关坐标经纬度:{}", JSONUtil.parse(feignAddressVO)); log.info("查询出标准地址相关坐标经纬度:{}", JSONUtil.parse(feignAddressVO));
BigDecimal sendAddressLatitude = feignAddressVO.getSendAddressVo().getLatitude().setScale(4, RoundingMode.DOWN); BigDecimal sendAddressLatitude = feignAddressVO.getSendAddressVo().getLatitude().setScale(4, RoundingMode.DOWN);
...@@ -99,7 +99,7 @@ public class LargeScreenListener { ...@@ -99,7 +99,7 @@ public class LargeScreenListener {
.receiveName(receiveName) .receiveName(receiveName)
.sendName(sendName) .sendName(sendName)
.build(); .build();
largeScreenAddressRouteDao.saveEntity(build);*/ largeScreenAddressRouteDao.saveEntity(build);
} }
} catch (Exception e) { } catch (Exception e) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论