优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -1019,10 +1019,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                                     }
                                 }
                             }
-                            BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
-                            if (oneBillMoney == null) {
-                                busSalesOrderService.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), busBillApplication.getOneBillMoney().toString());
-                            }
+                        }
+                        BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
+                        if (oneBillMoney == null) {
+                            busSalesOrderService.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), busBillApplication.getOneBillMoney().toString());
                         }
                     }else {
                         //推送开票申请数据
@@ -2696,7 +2696,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         String sid = resultBean.getData();
         busDeliveredApply = fetchBySid(sid);
-        if ("1".equals(dto.getHasInvoiceKey())){
+        if ("1".equals(busDeliveredApply.getHasInvoiceKey())){
             BusBillApplicationDetailsVo busBillApplicationDetailsVo = busBillApplicationService.fetchDetailByCkSid(sid);
             if (busBillApplicationDetailsVo == null){
                 return rb.setMsg("未保存开票信息，无法提交");

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java

@@ -544,11 +544,6 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                             }
                         }
                     }
-                    BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busValcustFiling.getSaleOrderSid());
-                    BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
-                    if (oneBillMoney == null) {
-                        busSalesOrderService.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
-                    }
                 }
             } else {
                 //极光推送

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -885,10 +885,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                             }
                         }
                     }
-                    BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
-                    if (oneBillMoney == null) {
-                        busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
-                    }
+                }
+                BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
+                if (oneBillMoney == null) {
+                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
                 }
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@@ -1257,6 +1257,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            //修改车辆表状态
             //极光推送
             finBillApplication = fetchBySid(businessSid);
             try {
@@ -2383,10 +2384,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                             }
                         }
                     }
-                    BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
-                    if (oneBillMoney == null) {
-                        busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
-                    }
+                }
+                BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
+                if (oneBillMoney == null) {
+                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
                 }
             } else {
                 //极光推送

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1734,11 +1734,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             }
                         }
                     }
-                    BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finSelectedReceivablesDetailedVo.getContractNo()).getData();
-                    BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
-                    if (oneBillMoney == null) {
-                        busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
-                    }
                 }else {//出库开票申请
 
                 }