liyg 2 år sedan
förälder
incheckning
4b42ede185

+ 5 - 1
src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -1348,7 +1348,11 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
             result = amsSaleOrderService.updateCapacityNumberInFactory(mapValue);
         }catch (Exception e){
             e.printStackTrace();
-            return failed(e.getMessage());
+            if(e.getMessage()==null || e.getMessage().contains("Exception")){
+                return failed("未知异常,请重试!");
+            }else{
+                return failed(e.getMessage());
+            }
         }
         int result1= (int) result.get("result");
         if (result1 == 0) {

+ 1 - 2
src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -2075,11 +2075,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         //非自提,单次校验且全局校验
         if((selfMention==null || selfMention.equals("否")) && onceCheck && (isCheckGps!=null && isCheckGps==0)){
             Map<String,Object> data = (Map<String,Object>)otmsFeign.getCurrentLocation(capacityNo).getData();
-            Map<String,Object> locationResult = (Map<String,Object>)data.get("result");
             int isGPS=amsSaleOrderMapper.isGPS(capacityNo);
             if(isGPS > 0){
                 System.out.println(capacityNo+"允许无GPS派车");
-            }else if(locationResult==null || locationResult.get("lon")==null || locationResult.get("lat")==null){
+            }else if(data==null || !"1001".equals(""+data.get("status"))){
                 throw new Exception("该车没有GPS定位信息,请联系销售公司物流部,申请是否可以派车。");
             }
         }