Merge remote-tracking branch 'origin/dev' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTourVerificationBiz.java

@@ -68,7 +68,7 @@ public class OrderTourVerificationBiz{
         if(baseOrder==null){
             return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
         }
-        if(baseOrder.getStatus()!=OrderStatusEnum.ORDER_TOSTART.getCode()){
+        if(baseOrder.getHasPay()==0){
             return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_PAY.getCode(), ResCode.ORDER_IS_NOT_PAY.getDesc());
         }
        Integer orderId=baseOrder.getId();

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1467,6 +1467,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         Example example = new Example(Vehicle.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("code", code);
+        criteria.andEqualTo("isDel",0);
         if (StringUtils.isNotEmpty(id)) {
             criteria.andNotEqualTo("id", id);
         }