diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java
index 75a95cd8f..08dd2e001 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java
@@ -70,14 +70,6 @@ public interface OrderPileOccupyMapper {
 
     List<OrderPileOccupy> queryOccupyOrderList(@Param("dto") QueryOccupyOrderDTO dto);
 
-    /**
-     * 根据桩号和枪号查询占桩中的订单
-     *
-     * @param pileSn
-     * @param connectorCode
-     */
-    OrderPileOccupy queryOccupiedOrder(@Param("pileSn") String pileSn, @Param("connectorCode") String connectorCode);
-
     /**
      * 通过memberId查询挂起状态订单
      * @param memberId
@@ -93,12 +85,18 @@ public interface OrderPileOccupyMapper {
     List<OrderPileOccupyVO> getOccupyOrderInfo(String memberId);
 
     /**
-     * 根据桩编号、枪口号查询最近一条占桩订单
+     * 根据桩号和枪号 查询占桩状态的占桩订单
+     *
+     * @param pileSn
+     * @param connectorCode
+     */
+    List<OrderPileOccupy> queryOccupiedOrder(@Param("pileSn") String pileSn, @Param("connectorCode") String connectorCode);
+
+    /**
+     * 根据桩号和枪号 查询草稿状态的占桩订单
      * @param pileSn
      * @param connectorCode
      * @return
      */
-    OrderPileOccupy getOrderInfoByPile(@Param("pileSn") String pileSn, @Param("connectorCode") String connectorCode);
-
-    List<OrderPileOccupy> getDraftOccupyOrder(@Param("pileSn") String pileSn, @Param("connectorCode") String connectorCode);
+    List<OrderPileOccupy> queryDraftOccupyOrder(@Param("pileSn") String pileSn, @Param("connectorCode") String connectorCode);
 }
\ No newline at end of file
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
index 83748a645..7a96bbdfa 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
@@ -187,7 +187,7 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
     @Override
     public void stopOccupyPileOrder(String pileSn, String connectorCode) {
         // 根据充电站sn和枪口号，查询占桩中的占桩订单
-        OrderPileOccupy orderPileOccupy = orderPileOccupyMapper.queryOccupiedOrder(pileSn, connectorCode);
+        OrderPileOccupy orderPileOccupy = getOccupiedOrder(pileSn, connectorCode);
         if (orderPileOccupy == null) {
             return;
         }
@@ -321,13 +321,31 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
      */
     @Override
     public OrderPileOccupy getDraftOccupyOrder(String pileSn, String connectorCode) {
-        List<OrderPileOccupy> list = orderPileOccupyMapper.getDraftOccupyOrder(pileSn, connectorCode);
+        List<OrderPileOccupy> list = orderPileOccupyMapper.queryDraftOccupyOrder(pileSn, connectorCode);
         if (CollectionUtils.isEmpty(list)) {
             return null;
         }
         if (list.size() > 1) {
             List<Integer> collect = list.stream().map(OrderPileOccupy::getId).collect(Collectors.toList());
-            log.info("根据pileSn:{}, connectorCode:{}, 查询出多条占桩订单, ids:{}", pileSn, connectorCode, collect);
+            log.info("根据pileSn:{}, connectorCode:{}, 查询出多条草稿状态的占桩订单, ids:{}", pileSn, connectorCode, collect);
+        }
+        return list.get(0);
+    }
+
+    /**
+     * 查询占桩中的订单
+     * @param pileSn
+     * @param connectorCode
+     * @return
+     */
+    public OrderPileOccupy getOccupiedOrder(String pileSn, String connectorCode) {
+        List<OrderPileOccupy> list = orderPileOccupyMapper.queryOccupiedOrder(pileSn, connectorCode);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        if (list.size() > 1) {
+            List<Integer> collect = list.stream().map(OrderPileOccupy::getId).collect(Collectors.toList());
+            log.info("根据pileSn:{}, connectorCode:{}, 查询出多条占桩中的占桩订单, ids:{}", pileSn, connectorCode, collect);
         }
         return list.get(0);
     }
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml
index 51fb9f2ae..053488100 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml
@@ -818,17 +818,6 @@
         </if>
     </select>
 
-    <select id="queryOccupiedOrder" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from order_pile_occupy
-        where del_flag = '0'
-          and status = '0'
-          and pay_status = '0'
-          and pile_sn = #{pileSn,jdbcType=VARCHAR}
-          and connector_code = #{connectorCode,jdbcType=VARCHAR}
-    </select>
-
     <select id="queryUnPayOrderByMemberId" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
@@ -855,21 +844,18 @@
             member_id = #{memberId,jdbcType=VARCHAR}
     </select>
 
-    <select id="getOrderInfoByPile" resultMap="BaseResultMap">
+    <select id="queryOccupiedOrder" resultMap="BaseResultMap">
         select
-            <include refid="Base_Column_List"/>
-        from
-            order_pile_occupy
-        where
-            pile_sn = #{pileSn,jdbcType=VARCHAR}
-        and
-            connector_code = #{connectorCode,jdbcType=VARCHAR}
-        order by
-            create_time DESC
-        limit 1
+        <include refid="Base_Column_List"/>
+        from order_pile_occupy
+        where del_flag = '0'
+        and status = '0'
+        and pile_sn = #{pileSn,jdbcType=VARCHAR}
+        and connector_code = #{connectorCode,jdbcType=VARCHAR}
+        order by create_time DESC
     </select>
 
-    <select id="getDraftOccupyOrder" resultMap="BaseResultMap">
+    <select id="queryDraftOccupyOrder" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from