Merge branch 'v21.1_jianzhuang_20240807' into test

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

@@ -579,7 +579,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
     }
 
     @Override
-    // todo ：jiangwujie 事务判断 ，其他也检查一下
+    @Transactional(rollbackFor = Exception.class)
     public void removeLoadLimit(ArtificialCancelOrderParam param) {
         OrderChild orderChild = orderChildDao.getByChildNo(param.getOrderChildNo()).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         //判断运单状态【已接单】【前往货源地】【到达货源地】时可对该运单解除装车限制，否则toast：不可操作

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

@@ -3719,58 +3719,17 @@ public class OrderChildServiceImpl implements OrderChildService {
     public NeedAlertSuperviseInfoResultVO needAlertSuperviseInfo(NeedAlertSuperviseInfoParam param) {
         //查询运单信息
         OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(DATA_NOT_FIND);
+        SuperviseInfo superviseInfo = getSuperviseInfoWithSubStatus(orderChild.getOrderNo(), orderChild.getChildNo(), orderChild.getTruckNo());
         //返回对象
         NeedAlertSuperviseInfoResultVO result = new NeedAlertSuperviseInfoResultVO();
-        App app = appConfig.getPurchaseManageApp();//对接马上来供应链配置信息
-        //组装配置信息
-        RequestConfig config = new RequestConfig()
-                .setAppId(app.getAppNo())
-                .setAppKey(app.getAppKey())
-                .setGatewayUrl(app.getCallback());
-
-        //通过订单号查询监装监卸信息
-        SupplyChainSupervisionLoadAction action = new SupplyChainSupervisionLoadAction();
-        action.setOrderNo(orderChild.getOrderNo());
-        action.setType(param.getType());
-
-        log.info("请求获取监装监卸信息参数,{}",action);
-        Result<SupervisionLoadInfoDto> supervisionLoadInfoDto = OpenClient.doAction(config, action);
-        if(!supervisionLoadInfoDto.succeed()){//接口调用失败
-            result.setNeedAlert(0);
-            return result;
-            //throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "获取监装监卸信息失败");
-        }
-        SupervisionLoadInfoDto supervisionLoadInfo = supervisionLoadInfoDto.getData();//监装信息
-        if(Objects.nonNull(supervisionLoadInfo)){//有监装信息
-            //通过运单号查询监装监卸子任务状态
-            SupplyChainSupervisionLoadTruckAction truckAction = new SupplyChainSupervisionLoadTruckAction();
-            truckAction.setChildNo(param.getChildNo());
-            truckAction.setType(param.getType());
-            log.info("请求获取监装监卸子任务信息参数,{}",truckAction);
-
-            Result<SupervisionLoadTruckInfoDto> supervisionLoadTruckInfoDto = OpenClient.doAction(config, truckAction);
-            if(!supervisionLoadTruckInfoDto.succeed()){//接口调用失败
-                result.setNeedAlert(0);
-                return result;
-                //throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "获取监装监卸信息子任务失败");
-            }
-
-            SupervisionLoadTruckInfoDto supervisionLoadTruckInfo = supervisionLoadTruckInfoDto.getData();
-            if(Objects.nonNull(supervisionLoadTruckInfo)){
-                // 未监装并且监装车辆与运单车辆一致
-                if(supervisionLoadTruckInfo.getLoadStatus()
-                        && Objects.equals(supervisionLoadTruckInfo.getTruckNo(), orderChild.getTruckNo())){
-                    result.setNeedAlert(1);
-                    result.setLocation(supervisionLoadInfo.getTaskAddress());
-                    result.setMobile(supervisionLoadInfo.getTaskMobile());
-                    result.setSupervisor(supervisionLoadInfo.getTaskContracts());
+        if (superviseInfo != null) {
+            result.setNeedAlert(OrderChildEnum.NeedAlertEnum.FAIL.getCode());
+            result.setLocation(superviseInfo.getTaskAddress());
+            result.setMobile(superviseInfo.getSuperviseMobile());
+            result.setSupervisor(superviseInfo.getSuperviseContacts());
             return result;
         }
-            }
-
-        }
-
-        result.setNeedAlert(0);
+        result.setNeedAlert(OrderChildEnum.NeedAlertEnum.OK.getCode());
         return result;
     }
 }