优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1624,6 +1624,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     }
                     Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                     updateFlowFiled(map);
+                    //将应收未收中的订金设置为作废
+                    //-------修改应收未收款项表中的款项状态为02作废------------
+                    List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(query.getBusinessSid());
+                    StateQuery stateQuery = new StateQuery();
+                    List<String> busVinSidListState = new ArrayList<>();
+                    if (!vehicleList.isEmpty()) {
+                        vehicleList.stream().forEach(v -> {
+                            busVinSidListState.add(v.getSid());
+                        });
+                        stateQuery.setKxState("02");
+                        stateQuery.setBusVinSid(busVinSidListState);
+                        ResultBean updateStateResultBean = finUncollectedReceivablesDetailedFeign.updateKxState(stateQuery);
+                    }
                     //再加回来
                     BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(query.getBusinessSid());
                     if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(busSalesOrderDeposit.getDepositTypeKey())) {
@@ -1681,6 +1694,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         }
                         Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                         updateFlowFiled(map);
+                        //将应收未收中的订金设置为作废
+                        //-------修改应收未收款项表中的款项状态为02作废------------
+                        List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(query.getBusinessSid());
+                        StateQuery stateQuery = new StateQuery();
+                        List<String> busVinSidListState = new ArrayList<>();
+                        if (!vehicleList.isEmpty()) {
+                            vehicleList.stream().forEach(v -> {
+                                busVinSidListState.add(v.getSid());
+                            });
+                            stateQuery.setKxState("02");
+                            stateQuery.setBusVinSid(busVinSidListState);
+                            ResultBean updateStateResultBean = finUncollectedReceivablesDetailedFeign.updateKxState(stateQuery);
+                        }
                         //再加回来
                         BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(query.getBusinessSid());
                         if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(busSalesOrderDeposit.getDepositTypeKey())) {
@@ -1732,19 +1758,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
 
             }
-            //将应收未收中的订金设置为作废
-            //-------修改应收未收款项表中的款项状态为02作废------------
-            List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(query.getBusinessSid());
-            StateQuery stateQuery = new StateQuery();
-            List<String> busVinSidListState = new ArrayList<>();
-            if (!vehicleList.isEmpty()) {
-                vehicleList.stream().forEach(v -> {
-                    busVinSidListState.add(v.getSid());
-                });
-                stateQuery.setKxState("02");
-                stateQuery.setBusVinSid(busVinSidListState);
-                ResultBean updateStateResultBean = finUncollectedReceivablesDetailedFeign.updateKxState(stateQuery);
-            }
+
         }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }