调整

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/issue/IssueOrderinfoRepo.java

@@ -16,6 +16,9 @@ public interface IssueOrderinfoRepo extends AbstractJpaRepo<IssueOrderinfo, Stri
     @Query("from IssueOrderinfo where customerId = ?1 and orderStatus = 'NORMAL' and orderStep = 'WAITING_ACTIVE'")
     List<IssueOrderinfo> listByCustomerId(String customerId);
 
+    @Query("from IssueOrderinfo where vehicleId = ?1 and orderStatus = 'NORMAL' and orderStep = 'WAITING_ACTIVE'")
+    IssueOrderinfo findWaitingActiveByVehicleId(String vehicleId);
+
     IssueOrderinfo findByQdOrderNo(String qdOrderNo);
 
     /**

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/ActiveManagerImpl.java

@@ -156,7 +156,7 @@ public class ActiveManagerImpl extends AbstractCommManager implements ActiveMana
             if(info == null){
                 throw new ManagerException("未查到车辆信息!");
             }
-            IssueOrderinfo orderinfo = issueOrderinfoRepo.findNormalByVehicleId(requestDTO.getVehicleId());
+            IssueOrderinfo orderinfo = issueOrderinfoRepo.findWaitingActiveByVehicleId(requestDTO.getVehicleId());
             if (orderinfo != null){ // 首次激活
                 DeviceReactivateModel model = new DeviceReactivateModel();
                 BeanTools.copyProperties(orderinfo, model);