Merge remote-tracking branch 'origin/master'

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

@@ -5438,6 +5438,35 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     //推送车款
                     createCarFin(vo, busSalesOrder);
                 }*/
+                //==============================修改车辆的持久状态组装数据
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                            0L, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    Future future1 = pool.submit(() -> {
+                        List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                        List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(bv.getBusinessSid());
+                        vehicleList.removeAll(Collections.singleton(null));
+                        if (!vehicleList.isEmpty()) {
+                            vehicleList.stream().forEach(v -> {
+                                BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                                baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.DDBA_PASS.getTypeKey());
+                                if (StringUtils.isNotBlank(v.getLinkSid())) {
+                                    baseVehicleStateDto.setVinSid(v.getLinkSid());
+                                    baseVehicleStateDto.setVinNo(v.getLinkNo());
+                                }
+                                baseVehicleStateDto.setSaleOrderSid(v.getSalesOrderSid());
+                                baseVehicleStateDto.setBusSid(v.getSid());
+                                dtoList.add(baseVehicleStateDto);
+                            });
+                            ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
                     ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(bv.getBusinessSid());
                     SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
@@ -5469,35 +5498,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     }
 
                 }
-                //==============================修改车辆的持久状态组装数据
-                try {
-                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-                            .setNameFormat("demo-pool-%d").build();
-                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
-                            0L, TimeUnit.MILLISECONDS,
-                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-                    Future future1 = pool.submit(() -> {
-                        List<BaseVehicleStateDto> dtoList = new ArrayList<>();
-                        List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(bv.getBusinessSid());
-                        vehicleList.removeAll(Collections.singleton(null));
-                        if (!vehicleList.isEmpty()) {
-                            vehicleList.stream().forEach(v -> {
-                                BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
-                                baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.DDBA_PASS.getTypeKey());
-                                if (StringUtils.isNotBlank(v.getLinkSid())) {
-                                    baseVehicleStateDto.setVinSid(v.getLinkSid());
-                                    baseVehicleStateDto.setVinNo(v.getLinkNo());
-                                }
-                                baseVehicleStateDto.setSaleOrderSid(v.getSalesOrderSid());
-                                baseVehicleStateDto.setBusSid(v.getSid());
-                                dtoList.add(baseVehicleStateDto);
-                            });
-                            ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
-                        }
-                    });
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+
                 //推送采购渠道待选择
                 if ("3".equals(busSalesOrder.getType())) {
                     ScmPurchaseChannelPush scmPurchaseChannelPush = new ScmPurchaseChannelPush();
@@ -5711,6 +5712,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
     }
 
+    public static void main(String[] args) {
+        System.out.println(new BigDecimal(0.00).compareTo(BigDecimal.ZERO)==0);
+    }
+
     public void createCarFin(AppOrderDetailsVo vo, BusSalesOrder busSalesOrder) {
         //推送款项车款=====================================
         AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo();