调整

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/ass/selfServiceOrder/SelfServiceOrderPageRequest.java

@@ -43,7 +43,8 @@ public class SelfServiceOrderPageRequest extends JpaPageableDataRequest<SelfServ
             hql.append(" and receiveStatus = null");
         }else if (receiveStatus == 3){
             // 待处理
-            hql.append(" and receiveStatus = null");
+            hql.append(" and receiveStatus = 1");
+            hql.append(" and orderStatus = 0");
             hql.append(" and receiveId = :receiveId", receiveId);
         }else {
 

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/selfService/SelfServiceManagerImpl.java

@@ -57,7 +57,9 @@ public class SelfServiceManagerImpl extends AbstractCommManager implements SelfS
         BeanTools.copyProperties(reqDto, pageRequest);
         Pagination page = new Pagination();
         if (reqDto.getOrderSource() == SourceType.SERVICE_HALL || reqDto.getOrderSource() == SourceType.WEB){
-            if (reqDto.getReceiveStatus() == 3) pageRequest.setReceiveId(findOpenIdByToken(reqDto.getAccessToken()));
+            if (reqDto.getReceiveStatus() == 3) {
+                pageRequest.setReceiveId(findOpenIdByToken(reqDto.getAccessToken()));
+            }
             pageRequest.setOrderSource(reqDto.getSourceTypePage());
             pageRequest.setOpenId(null);
             page = orderRepo.page(pageRequest);