managew 订单查询筛选正常订单

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderQueryManageImpl.java

@@ -382,7 +382,7 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
         activeInfoModel.setObuId(issueOrderinfo.getObuId());
         QtkCardInfo cardInfo = qtkCardInfoRepo.findByCardId(issueOrderinfo.getCardId());
         activeInfoModel.setWarrantyDate(cardInfo.getWarrantyDate());
-        return null;
+        return activeInfoModel;
     }
 
     @Override

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/repo/jpa/request/IssueOrderExaminePageRequest.java

@@ -81,11 +81,13 @@ public class IssueOrderExaminePageRequest extends JpaPageableDataRequest<IssueOr
         hql.append(" and promotionModes = :promotionModes", promotionModes);
         if (pass == 1){//待领取
             hql.append(" and orderStep = :orderStep", IssueOrderStep.WAITING_AUDIT);
+            hql.append(" and orderStatus = :orderStatus", "NORMAL");
             hql.append(" and  ");
             hql.append("(receiveStatus is null or receiveStatus = 0)");
         }
         if (pass == 2){//待审核
             hql.append(" and orderStep = :orderStep", IssueOrderStep.WAITING_AUDIT);
+            hql.append(" and orderStatus = :orderStatus", "NORMAL");
             hql.append(" and receiveStatus = :receiveStatus", true);
         }
         if (pass == 3){//审核不通过

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/repo/jpa/request/IssueOrderPageRequest.java

@@ -96,6 +96,10 @@ public class IssueOrderPageRequest extends JpaPageableDataRequest<IssueOrderinfo
         hql.append(" and insertTime <= :endTime", endTime);
         hql.append(" and orderStep = :orderStep", orderStep);
         hql.append(" and orderStatus = :orderStatus", orderStatus);
+        //查阶段时候，只查正常订单
+        if (orderStatus == null && orderStep != null){
+            hql.append(" and orderStatus != :orderStatus", "NORMAL");
+        }
         if (!agencyId.equals("52010106004") && !"MANAGER".equals(identityType)){//黔通管理员可以查所有
             hql.append(" and agencyId = :agencyId", agencyId);
         }