diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStopChargingOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStopChargingOrderController.java
new file mode 100644
index 00000000..3de42e69
--- /dev/null
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStopChargingOrderController.java
@@ -0,0 +1,49 @@
+package com.xhpc.order.controller;
+
+import com.xhpc.common.core.web.controller.BaseController;
+import com.xhpc.common.core.web.domain.AjaxResult;
+import com.xhpc.common.core.web.page.TableDataInfo;
+import com.xhpc.order.api.XhpcChargeOrderController;
+import com.xhpc.order.service.IXhpcStopChargingOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * program: ruoyi
+ * User: HongYun
+ * Date:2021-09-07 15
+ */
+@RestController
+@RequestMapping(value = "/stopChargingOrder")
+public class XhpcStopChargingOrderController extends BaseController {
+
+    @Autowired
+    private IXhpcStopChargingOrderService iXhpcStopChargingOrderService;
+
+    @Autowired
+    private XhpcChargeOrderController xhpcChargeOrderController;
+
+    @GetMapping("/list")
+    public TableDataInfo list(Long userId, Long chargingStationId, Long terminalId){
+
+        startPage();
+        return getDataTable(iXhpcStopChargingOrderService.list(userId, chargingStationId, terminalId));
+    }
+
+    /**
+     * 停止充电
+     * @param userId
+     * @param serialNumber   终端编码
+     * @param chargingOrderId   充电id
+     * @return
+     */
+    @GetMapping("/stopUp")
+    public AjaxResult stopUp(@RequestParam Long userId, @RequestParam String terminalSerialNumber, @RequestParam Long chargingOrderId){
+
+        return xhpcChargeOrderController.stopUp(userId, terminalSerialNumber, chargingOrderId);
+    }
+}
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStopChargingOrderMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStopChargingOrderMapper.java
new file mode 100644
index 00000000..91bc0012
--- /dev/null
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStopChargingOrderMapper.java
@@ -0,0 +1,16 @@
+package com.xhpc.order.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * program: ruoyi
+ * User: HongYun
+ * Date:2021-09-07 15
+ */
+public interface XhpcStopChargingOrderMapper {
+
+    List<Map<String,Object>> list(@Param("userId")Long userId, @Param("chargingStationId") Long chargingStationId, @Param("terminalId") Long terminalId);
+}
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcStopChargingOrderService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcStopChargingOrderService.java
new file mode 100644
index 00000000..edd7273c
--- /dev/null
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcStopChargingOrderService.java
@@ -0,0 +1,14 @@
+package com.xhpc.order.service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * program: ruoyi
+ * User: HongYun
+ * Date:2021-09-07 15
+ */
+public interface IXhpcStopChargingOrderService {
+
+    List<Map<String,Object>> list(Long userId, Long chargingStationId, Long terminalId);
+}
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStopChargingOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStopChargingOrderServiceImpl.java
new file mode 100644
index 00000000..6999bfc7
--- /dev/null
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStopChargingOrderServiceImpl.java
@@ -0,0 +1,28 @@
+package com.xhpc.order.service.impl;
+
+import com.xhpc.order.mapper.XhpcStopChargingOrderMapper;
+import com.xhpc.order.service.IXhpcStopChargingOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * program: ruoyi
+ * User: HongYun
+ * Date:2021-09-07 15
+ */
+@Service
+public class XhpcStopChargingOrderServiceImpl implements IXhpcStopChargingOrderService {
+
+
+    @Autowired
+    private XhpcStopChargingOrderMapper xhpcStopChargingOrderMapper;
+
+    @Override
+    public List<Map<String, Object>> list(Long userId, Long chargingStationId, Long terminalId) {
+
+        return xhpcStopChargingOrderMapper.list(userId, chargingStationId, terminalId);
+    }
+}
diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStopChargingMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStopChargingMapper.xml
new file mode 100644
index 00000000..184168a3
--- /dev/null
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStopChargingMapper.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhpc.order.mapper.XhpcStopChargingOrderMapper">
+
+
+    <select id="list" resultType="map">
+          select cs.name as stationName,
+          cs.charging_station_id as chargingStationId,
+          t.terminal_id as terminalId,
+          t.name as terminalName,
+          o.user_id as userId,
+          o.charge_order_id as chargeOrderId,
+          t.serial_number as termialSerialNumber
+          from xhpc_charge_order as o
+          left join xhpc_charging_station as cs
+          on o.charging_station_id = cs.charging_station_id
+          left join xhpc_terminal as t
+          on o.terminal_id = t.terminal_id
+          where o.status=1
+          <if test="userId!=null">
+            and o.user_id = #{userId}
+          </if>
+          <if test="chargingStationId!=null">
+            and cs.charging_station_id = #{chargingStationId}
+          </if>
+          <if test="terminalId!=null">
+            and t.terminal_id = #{terminalId}
+          </if>
+
+    </select>
+</mapper>
\ No newline at end of file