订单

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

@@ -81,13 +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 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 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

@@ -95,10 +95,15 @@ public class IssueOrderPageRequest extends JpaPageableDataRequest<IssueOrderinfo
         hql.append(" and insertTime >= :startTime", startTime);
         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 (orderStep == IssueOrderStep.ACTIVED){
+                hql.append(" and orderStatus = 'ACTIVE'");
+            }else {
+                hql.append(" and orderStatus = 'NORMAL'");
+            }
+        }else{
+            hql.append(" and orderStatus = :orderStatus", orderStatus);
         }
         if (!agencyId.equals("52010106004") && !"MANAGER".equals(identityType)){//黔通管理员可以查所有
             hql.append(" and agencyId = :agencyId", agencyId);