今日订单中返回未接单的今日订单

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dao/PensionOrderDao.java

@@ -18,6 +18,8 @@ public interface PensionOrderDao extends BaseDao<PensionOrderEntity> {
 
     IPage<PensionOrderEntity> getTodayOrderPage(IPage<PensionOrderEntity> page, Long userId);
 
+    IPage<PensionOrderEntity> getTodayNoProceedOrderPage(IPage<PensionOrderEntity> page);
+
     IPage<PensionOrderEntity> getOrderPageByStatus(IPage<PensionOrderEntity> page, Long userId, Integer status);
 
     IPage<PensionOrderEntity> getNoProceedOrderPage(IPage<PensionOrderEntity> page);

hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionOrderServiceImpl.java

@@ -56,7 +56,8 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
     @Override
     public PageData<PensionOrderDTO> getTodayOrderPage(Map<String, Object> params, Long userId) {
         IPage<PensionOrderEntity> page = getPage(params, Constant.CREATE_DATE, false);
-        IPage<PensionOrderEntity> pensionOrderEntityIPage = pensionOrderDao.getTodayOrderPage(page, userId);
+//        IPage<PensionOrderEntity> pensionOrderEntityIPage = pensionOrderDao.getTodayOrderPage(page, userId); //TODO 今日订单中展示未接单订单
+        IPage<PensionOrderEntity> pensionOrderEntityIPage = pensionOrderDao.getTodayNoProceedOrderPage(page);
         return getPageData(pensionOrderEntityIPage, PensionOrderDTO.class);
     }
 

hmit-api/src/main/resources/mapper/serviceOrder/PensionOrderDao.xml

@@ -36,6 +36,10 @@
         SELECT * FROM pension_order WHERE TO_DAYS(appointment_time) = TO_DAYS(NOW()) and order_recipient_id = #{userId}
     </select>
 
+    <select id="getTodayNoProceedOrderPage" resultType="io.hmit.modules.serviceOrder.entity.PensionOrderEntity">
+        SELECT * FROM pension_order WHERE TO_DAYS(appointment_time) = TO_DAYS(NOW()) AND pension_order.status = 0 AND order_recipient_id IS NULL
+    </select>
+
     <select id="getOrderPageByStatus" resultType="io.hmit.modules.serviceOrder.entity.PensionOrderEntity">
         SELECT * FROM pension_order WHERE pension_order.status = #{status} and order_recipient_id = #{userId}
     </select>