解决冲突

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementServiceImpl.java

@@ -73,76 +73,6 @@ public class SettlementServiceImpl implements SettlementService {
             settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
             settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
         } else {
-            Message message = MessageBuilder.withBody(JSONUtil.parse(orderChild).toString().getBytes()).build();
-            rabbitTemplate.send(
-                    RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_EXCHANGE, RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_ROUTE_KEY, message
-            );
-            return;
-//            OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
-//            //是否通过风控,调用网络货运
-//            ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
-//            HttpDTO httpDTOResult = transportFeignService.orderChildSync(param);
-//            String decrypt = ThirdComponent.decrypt(httpDTOResult.getData());
-//            OrderChildSyncDTO bean = JSONUtil.toBean(decrypt, OrderChildSyncDTO.class);
-//            log.info("OrderChildSyncDTO信息为:{}", JSONUtil.parse(bean));
-//            if (bean.getCode() == 0) {
-//                Integer status = bean.getData().getStatus();
-//                if (status == 1) {
-//                    //通过风控
-//                    List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderChild.getOrderNo());
-//                    BigDecimal frozen = runningWaterRecordList.stream().filter(item -> {
-//                        return item.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.FROZEN.getCode())
-//                                && item.getAccountType().equals(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode())
-//                                ;
-//                    }).map(OwnerRunningWaterRecord::getAlterationBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
-//
-//                    BigDecimal takeOut = runningWaterRecordList.stream().filter(item -> {
-//                        return item.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.TAKE_OUT.getCode())
-//                                && item.getAccountType().equals(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode())
-//                                ;
-//                    }).map(OwnerRunningWaterRecord::getAlterationBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
-//                    //设置预付运费金额
-//                    BigDecimal ans = getPrepayFreightPay(orderChild.getSettlementWay(), settlementOwnerDetail, frozen);
-//                    BigDecimal subtract = frozen.subtract(takeOut);
-//                    log.info("冻结预付运费:{}, 扣除的流水总和：{}", frozen, takeOut);
-//                    invoiceType = SettlementOwnerEnum.InvoiceType.ONLINE.getCode();
-//                    settlementDriverDetail.setPrepayFreight(ans);
-//                    //冻结的预付运费为0 或者 此刻预付运费也可能为0，那么就不用生成扣除相关流水逻辑
-//                    if (subtract.compareTo(BigDecimal.ZERO) <= 0  || ans.compareTo(BigDecimal.ZERO) == 0) {
-//                        settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
-//                        settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
-//                    } else {
-//                        if (subtract.subtract(ans).compareTo(BigDecimal.ZERO) >= 0) {
-//                            //账户扣钱并生成扣除流水
-//                            generateTakeOutRunningWatter(orderChild, ans, settlementOwnerDetail, settlementDriverDetail);
-//                            try {
-//                                //网络货运钱包账户
-//                                networkDriverRunningWaterRecordService.generateNetworkDriverRunningWaterRecord(
-//                                        settlementDriverDetail,
-//                                        NetworkDriverAccountEnum.RunningWaterStatus.SETTLEMENT.getCode()
-//                                );
-//                                //生成提现记录
-//                                networkDriverRunningWaterRecordService.generateNetworkCaseOutRecord(settlementDriverDetail);
-//                            }catch (Exception e) {
-//                                log.info("运单同步网络货运生成司机运单结算流水失败：{}", e.getMessage());
-//                            }
-//
-//                        } else {
-//                            settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
-//                            settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
-//
-//                        }
-//                    }
-//
-//                } else {
-//                    settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
-//                    settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
-//                    settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
-//                }
-//            } else {
-//                throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_SYNC_ERROR);
-//
-//            }
             if(Objects.equals(orderChild.getReportFlag(), OrderEnum.ReportFlag.YES.getCode())){
                 log.info("运单号:{}，对应的开票公司上报标识为【是】",orderChild.getChildNo());
                 Message message = MessageBuilder.withBody(JSONUtil.parse(orderChild).toString().getBytes()).build();