update 地锁逻辑修改

jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java

@@ -4,7 +4,6 @@ import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.pile.domain.OrderPileOccupy;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO;
-import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO;
 
 import java.util.List;
 import java.util.Map;
@@ -105,4 +104,6 @@ public interface OrderPileOccupyService{
      * @return
      */
     int updateOrderInfoForWeb(MakeOrderFreeDTO dto);
+
+    void closeOccupyPileOrder(String pileSn, String connectorCode);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java

@@ -196,8 +196,6 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
      */
     @Override
     public void stopOccupyPileOrder(String pileSn, String connectorCode) {
-        // 两种情况  1是没有停车，地锁自动升起；2是停车完成地锁升起
-
         // 根据充电站sn和枪口号，查询占桩中的占桩订单
         OrderPileOccupy orderPileOccupy = getOccupiedOrder(pileSn, connectorCode);
         if (orderPileOccupy == null) {
@@ -462,6 +460,16 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
         }
     }
 
+    @Override
+    public void closeOccupyPileOrder(String pileSn, String connectorCode) {
+        // 查询草稿状态的占桩订单
+        OrderPileOccupy draftOccupyOrder = getDraftOccupyOrder(pileSn, connectorCode);
+        // 关闭草稿订单
+        draftOccupyOrder.setStatus(Constants.ONE);
+        draftOccupyOrder.setPayStatus(Constants.TWO);
+        updateByPrimaryKey(draftOccupyOrder);
+    }
+
     /*
      * 支付占桩订单
      *