接单创建门卫取消异步

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/TakingOrderHandler.java

@@ -170,49 +170,47 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
     private void createGatekeeperWaybillOrder(KwtLogisticsOrder logOrder, KwtWaybillOrder waybillOrder,
                                               RTruckVo truck, BigDecimal truckLoadVolume) {
         log.info("开始创建门卫订单，入参参数：{}", JSON.toJSONString(waybillOrder));
-        CompletableFuture.runAsync(() -> {
-            try {
-                // 获取企业id
-                Long entId = getEntId(logOrder);
-
-                KwtGatekeeperWaybillOrder gatekeeper = new KwtGatekeeperWaybillOrder();
-                gatekeeper.setEntId(entId);
-                gatekeeper.setWOrderId(waybillOrder.getId());
-                gatekeeper.setWOrderNo(waybillOrder.getWOrderNo());
-                gatekeeper.setLOrderId(waybillOrder.getLOrderId());
-
-                //查询字典
-                Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(
-                        Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
-                Map<String, String> goodsTypeMap= dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), new HashMap<>());
-                Map<String, String> goodsSpecMap= dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.GOODS_SPEC.getType(), new HashMap<>());
-
-                // 查询商品信息
-                KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsRepository.queryByLogOrderId(waybillOrder.getLOrderId());
-                KwpGoods goods = goodsInfoService.getGoodsById(orderGoods.getGoodsId());
-                if (goods != null) {
-                    gatekeeper.setGoodsId(goods.getId());
-                    gatekeeper.setGoodsName(goods.getName()+"/"+goodsTypeMap.getOrDefault(goods.getGoodsType(),"")+"/"+goodsSpecMap.getOrDefault(goods.getSpec(), ""));
-                }
-
-                gatekeeper.setWaybillAcceptTime(waybillOrder.getCreateTime());
-                gatekeeper.setType(GatekeeperTypeEnum.LOADING.getCode());
-                gatekeeper.setStatus(GatekeeperStatusEnum.PENDING_ENTRY.getCode());
-                gatekeeper.setTruckType(truck.getTruckType());
-                gatekeeper.setEntrustAmount(truckLoadVolume);
-                gatekeeper.setCarAxis(truck.getCarAxis());
-                gatekeeper.setLegalLoad(truck.getLegalLoad());
-                gatekeeper.setCreateTime(new Date());
-                gatekeeper.setCreateUser(waybillOrder.getDriverId());
-                gatekeeper.setUpdateUser(waybillOrder.getDriverId());
-
-                log.debug("开始异步保存门卫订单数据，运单ID:{}", waybillOrder.getId());
-                gatekeeperWaybillOrderRepository.save(gatekeeper);
-                log.debug("门卫订单数据保存成功");
-            } catch (Exception e) {
-                log.error("异步保存门卫订单数据失败！");
+        try {
+            // 获取企业id
+            Long entId = getEntId(logOrder);
+
+            KwtGatekeeperWaybillOrder gatekeeper = new KwtGatekeeperWaybillOrder();
+            gatekeeper.setEntId(entId);
+            gatekeeper.setWOrderId(waybillOrder.getId());
+            gatekeeper.setWOrderNo(waybillOrder.getWOrderNo());
+            gatekeeper.setLOrderId(waybillOrder.getLOrderId());
+
+            //查询字典
+            Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(
+                    Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
+            Map<String, String> goodsTypeMap= dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), new HashMap<>());
+            Map<String, String> goodsSpecMap= dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.GOODS_SPEC.getType(), new HashMap<>());
+
+            // 查询商品信息
+            KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsRepository.queryByLogOrderId(waybillOrder.getLOrderId());
+            KwpGoods goods = goodsInfoService.getGoodsById(orderGoods.getGoodsId());
+            if (goods != null) {
+                gatekeeper.setGoodsId(goods.getId());
+                gatekeeper.setGoodsName(goods.getName()+"/"+goodsTypeMap.getOrDefault(goods.getGoodsType(),"")+"/"+goodsSpecMap.getOrDefault(goods.getSpec(), ""));
             }
-        });
+
+            gatekeeper.setWaybillAcceptTime(waybillOrder.getCreateTime());
+            gatekeeper.setType(GatekeeperTypeEnum.LOADING.getCode());
+            gatekeeper.setStatus(GatekeeperStatusEnum.PENDING_ENTRY.getCode());
+            gatekeeper.setTruckType(truck.getTruckType());
+            gatekeeper.setEntrustAmount(truckLoadVolume);
+            gatekeeper.setCarAxis(truck.getCarAxis());
+            gatekeeper.setLegalLoad(truck.getLegalLoad());
+            gatekeeper.setCreateTime(new Date());
+            gatekeeper.setCreateUser(waybillOrder.getDriverId());
+            gatekeeper.setUpdateUser(waybillOrder.getDriverId());
+
+            log.debug("开始保存门卫订单数据，运单ID:{}", waybillOrder.getId());
+            gatekeeperWaybillOrderRepository.save(gatekeeper);
+            log.debug("门卫订单数据保存成功");
+        } catch (Exception e) {
+            log.error("保存门卫订单数据失败！");
+        }
     }
 
     /**