@@ -43,6 +43,12 @@ public interface AdminOrderMapper extends BaseMapper<TOrder> {
AdminOrderDispatchOrderVO selectDispatchOrderById(@Param("id") Long id);
+ /**
+ * 查询订单派单候选商户
+ * @param order
+ * @param query
+ * @return List<AdminOrderDispatchMerchantVO>
+ */
List<AdminOrderDispatchMerchantVO> selectDispatchMerchantCandidates(@Param("order") AdminOrderDispatchOrderVO order, @Param("query") AdminOrderDispatchMerchantQueryDTO query);
/**
@@ -443,7 +443,6 @@
AND addr.is_delete = 0
WHERE t.is_delete = 0
AND t.audit_status = 2
- AND t.n_status2 = 0
AND t.merchant_status = 0
AND addr.longitude IS NOT NULL
AND addr.latitude IS NOT NULL