修改逻辑

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

@@ -75,99 +75,90 @@ public class SettlementServiceImpl implements SettlementService {
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        // 开票金额
-        settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(),settlementOwnerDetail));
-
-        // 结算金额
-        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(),settlementOwnerDetail));
-
-
-        settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
 
         if (settlementOwnerDetail.getInvoiceType() != null) {return;}
 
-        //设置司机预付运费标示
-        if (settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
-            settlementDriverDetail.setPrepayFreightFlag(1);
-        } else {
-            settlementDriverDetail.setPrepayFreightFlag(0);
-        }
-
-
-
-        // 货主结算金额<0走普通单
-        if (settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) < 0){
-            invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
-            settlementDriverDetail.setPrepayFreightFlag(0);
-        } else {
-            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();
-                BigDecimal ans = settlementOwnerDetail.getFreight().subtract(settlementOwnerDetail.getLossFreight());
-                if (status == 1) {
-                    //通过风控
-                    invoiceType = SettlementOwnerEnum.InvoiceType.ONLINE.getCode();
-                    List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderChild.getOrderNo());
-                    BigDecimal frozen = runningWaterRecordList.stream().filter(item -> {
-                        return item.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.FROZEN.getCode());
-                    }).map(OwnerRunningWaterRecord::getAlterationBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
-
-                    BigDecimal takeOut = runningWaterRecordList.stream().filter(item -> {
-                        return item.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.TAKE_OUT.getCode());
-                    }).map(OwnerRunningWaterRecord::getAlterationBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
-                    BigDecimal subtract = frozen.subtract(takeOut);
-                    if (subtract.compareTo(BigDecimal.ZERO) <= 0) {
-                        settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
-                    }
-                    if (subtract.subtract(ans).compareTo(BigDecimal.ZERO) >= 0) {
-                        OwnerAccount account = ownerAccountDao.getAccountByOwnerUserNoAndAccountType(orderChild.getOwnerUserNo(),
-                                OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
-
-                        settlementOwnerDetail.setPrepayFreight(ans);
-                        //生成扣除流水
-                        OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord();
-                        runningWaterRecord.setOwnerUserName(orderChild.getOwnerName());
-                        runningWaterRecord.setMobile(orderChild.getDriverMobile());
-                        runningWaterRecord.setCreateBy("系统");
-                        runningWaterRecord.setOrderId(orderChild.getId());
-                        runningWaterRecord.setOrderNo(orderChild.getOrderNo());
-
-                        runningWaterRecord.setRelationId(null);
-                        runningWaterRecord.setAlterationBalance(ans);
-                        runningWaterRecord.setFrozenBalance(ans);
-                        runningWaterRecord.setUsableBalance(account.getUsableBalance());
-                        runningWaterRecord.setTakeOutBalance(BigDecimal.ZERO);
-                        runningWaterRecord.setAccountBalance(account.getAccountBalance());
-                        runningWaterRecord.setOwnerUserNo(account.getOwnerUserNo());
-
-                        runningWaterRecord.setAccountType(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
-                        runningWaterRecord.setRunningWaterType(OwnerAccountEnum.RunningWaterStatus.TAKE_OUT.getCode());
-                        runningWaterRecord.setRunningWaterNo(idGenerateSnowFlake.nextId(IdTypeEnum.Type.TAKE_OUT.getCode()));
-                        ownerRunningWaterRecordDao.saveEntity(runningWaterRecord);
-                    } else {
-                        settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
-                    }
+        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();
+            BigDecimal ans = settlementOwnerDetail.getFreight().subtract(settlementOwnerDetail.getLossFreight());
+            if (status == 1) {
+                //通过风控
+                invoiceType = SettlementOwnerEnum.InvoiceType.ONLINE.getCode();
+                List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderChild.getOrderNo());
+                BigDecimal frozen = runningWaterRecordList.stream().filter(item -> {
+                    return item.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.FROZEN.getCode());
+                }).map(OwnerRunningWaterRecord::getAlterationBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+                BigDecimal takeOut = runningWaterRecordList.stream().filter(item -> {
+                    return item.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.TAKE_OUT.getCode());
+                }).map(OwnerRunningWaterRecord::getAlterationBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
+                BigDecimal subtract = frozen.subtract(takeOut);
+                if (subtract.compareTo(BigDecimal.ZERO) <= 0) {
+                    settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
+                }
+                if (subtract.subtract(ans).compareTo(BigDecimal.ZERO) >= 0) {
+                    OwnerAccount account = ownerAccountDao.getAccountByOwnerUserNoAndAccountType(orderChild.getOwnerUserNo(),
+                            OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
+
+                    settlementOwnerDetail.setPrepayFreight(ans);
+                    //生成扣除流水
+                    OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord();
+                    runningWaterRecord.setOwnerUserName(orderChild.getOwnerName());
+                    runningWaterRecord.setMobile(orderChild.getDriverMobile());
+                    runningWaterRecord.setCreateBy("系统");
+                    runningWaterRecord.setOrderId(orderChild.getId());
+                    runningWaterRecord.setOrderNo(orderChild.getOrderNo());
+
+                    runningWaterRecord.setRelationId(null);
+                    runningWaterRecord.setAlterationBalance(ans);
+                    runningWaterRecord.setFrozenBalance(ans);
+                    runningWaterRecord.setUsableBalance(account.getUsableBalance());
+                    runningWaterRecord.setTakeOutBalance(BigDecimal.ZERO);
+                    runningWaterRecord.setAccountBalance(account.getAccountBalance());
+                    runningWaterRecord.setOwnerUserNo(account.getOwnerUserNo());
+
+                    runningWaterRecord.setAccountType(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
+                    runningWaterRecord.setRunningWaterType(OwnerAccountEnum.RunningWaterStatus.TAKE_OUT.getCode());
+                    runningWaterRecord.setRunningWaterNo(idGenerateSnowFlake.nextId(IdTypeEnum.Type.TAKE_OUT.getCode()));
+                    ownerRunningWaterRecordDao.saveEntity(runningWaterRecord);
                 } else {
-                    invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
+                    settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
                 }
             } else {
-                throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_SYNC_ERROR);
-
+                settlementDriverDetail.setPrepayFreightFlag(0);
+                invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
+                settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
+                settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
             }
+        } else {
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_SYNC_ERROR);
 
-            if (SettlementOwnerEnum.InvoiceType.ONLINE.getCode().equals(invoiceType) && settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
-                settlementDriverDetail.setPrepayFreightFlag(1);
-            }
         }
 
+        if (SettlementOwnerEnum.InvoiceType.ONLINE.getCode().equals(invoiceType) && settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
+            settlementDriverDetail.setPrepayFreightFlag(1);
+        }
+
+
         settlementOwnerDetail.setInvoiceType(invoiceType);
         settlementDriverDetail.setInvoiceType(invoiceType);
+        // 开票金额
+        settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(),settlementOwnerDetail));
+        // 结算金额
+        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(),settlementOwnerDetail));
+        //设置司机预付运费标示
+        if (settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
+            settlementDriverDetail.setPrepayFreightFlag(1);
+        } else {
+            settlementDriverDetail.setPrepayFreightFlag(0);
+        }
 
 //        // 网运单更新预付运费
 //        if (Objects.equals(settlementOwnerDetail.getInvoiceType(), SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {