diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java
index d36403e1..5050d522 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java
+++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java
@@ -37,15 +37,16 @@ public class OrderLogController extends BaseController {
     }
 
 
-    @GetMapping("/{orderId}")
-    public TableDataInfo getOrderDetailPage(@PathVariable("orderId") String orderId){
+    @GetMapping("/detail")
+    public TableDataInfo getOrderDetailPage(@RequestParam("orderId") String orderId){
         startPage();
         return getDataTable(orderLogService.getOrderDetailPage(orderId));
     }
 
 
-    @GetMapping("/export")
+    @PostMapping("/export")
     public void export(HttpServletResponse response,
+                       @RequestParam(required = false) String orderId,
                        @RequestParam(required = false) String tenantId,
                        @RequestParam(required = false) Integer number,
                        @RequestParam(required = false) String serialNumber) throws Exception {
@@ -55,6 +56,7 @@ public class OrderLogController extends BaseController {
         params.put("number", number);
         params.put("serialNumber", serialNumber);
         params.put("tenantId", tenantId);
+        params.put("orderId", orderId);
         orderLogService.export(response, params);
     }
 
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java
index 7351eb23..62c8da67 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java
+++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java
@@ -49,6 +49,7 @@ public class PileLogController extends BaseController {
 
     @PostMapping("/export")
     public void export(HttpServletResponse response,
+                       @RequestParam("pileId") String pileId,
                        @RequestParam(required = false) String tenantId,
                        @RequestParam(required = false) Integer number,
                         @RequestParam(required = false) String startTime,
@@ -63,6 +64,7 @@ public class PileLogController extends BaseController {
         params.put("tenantId", tenantId);
         params.put("startTime", startTime);
         params.put("endTime", endTime);
+        params.put("pileId", pileId);
         pileLogService.export(response, params);
     }
 
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java
index ab805788..c9f267ad 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java
+++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java
@@ -17,4 +17,11 @@ public interface XhpcDeviceMessageMapper {
 
 
     List<Map<String, Object>> selectListByParams(@Param("params")Map params);
+
+
+    List<Map<String, Object>> selectListByChargeOrderNo(@Param("chargeOrderNo") String chargeOrderNo);
+
+
+
+    List<Map<String, Object>> getOrderMessageByParams(@Param("params")Map params);
 }
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java
index 015256f4..e67291d5 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java
+++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java
@@ -4,6 +4,7 @@ package com.xhpc.log.service.impl;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
+import com.xhpc.log.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.log.mapper.XhpcHistoryOrderMapper;
 import com.xhpc.log.mapper.XhpcMessageMapper;
 import com.xhpc.log.service.OrderLogService;
@@ -21,8 +22,9 @@ public class OrderLogServiceImpl implements OrderLogService {
     @Resource
     XhpcHistoryOrderMapper historyOrderMapper;
 
+
     @Resource
-    XhpcMessageMapper messageMapper;
+    XhpcDeviceMessageMapper deviceMessageMapper;
 
 
     @Override
@@ -33,13 +35,13 @@ public class OrderLogServiceImpl implements OrderLogService {
 
     @Override
     public List<Map<String, Object>> getOrderDetailPage(String orderId){
-        return messageMapper.getOrderMessagePage(orderId);
+        return deviceMessageMapper.selectListByChargeOrderNo(orderId);
     }
 
 
     @Override
     public void export(HttpServletResponse response, Map<String, Object> params) throws Exception{
-        List<Map<String, Object>> list = messageMapper.getOrderMessageByParams(params);
+        List<Map<String, Object>> list = deviceMessageMapper.getOrderMessageByParams(params);
 
         ExcelWriter writer = ExcelUtil.getWriter(true);
         writer.addHeaderAlias("serialNumber", "订单号");
diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml
index cd1a96ae..18b1c9f6 100644
--- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml
+++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml
@@ -28,6 +28,26 @@
     </select>
 
 
+
+    <select id="selectListByChargeOrderNo" resultType="map">
+        select
+        device_message_id as 'deviceMessageId',
+        type as 'type',
+        serial_number as 'serialNumber',
+        content as 'content',
+        charge_order_no as 'chargeOrderNo',
+        status as 'status',
+        remark as 'remark',
+        create_time as 'createTime',
+        create_by as 'createBy',
+        update_time as 'updateTime',
+        update_by as 'updateBy'
+        from xhpc_device_message
+        where charge_order_no=#{chargeOrderNo}
+        order by create_time desc
+    </select>
+
+
     <select id="selectListByParams" resultType="java.util.Map">
         select
             concat(cp.name,'号桩') as 'chargingPileName',
@@ -59,6 +79,9 @@
         <if test="params.type!=null and params.type!=''">
             and m.type=#{params.type}
         </if>
+        <if test="params.pileId!=null and params.pileId!=''">
+            and m.serial_number=#{params.pileId}
+        </if>
         <if test="params.tenantId != null and params.tenantId != ''">
             and cp.tenant_id = #{params.tenantId}
         </if>
@@ -78,4 +101,48 @@
 
     </select>
 
+
+    <select id="getOrderMessageByParams" resultType="java.util.Map">
+        select
+        co.serial_number as 'serialNumber',
+        co.source as 'source',
+        case co.source when 0 then 'C端用户'
+        when 1 then '流量方用户'
+        when 2 then '社区用户'
+        when 3 then 'B端用户' end as 'sourceName',
+        co.start_time as 'startTime',
+        co.end_time as 'endTime',
+        co.charging_degree as 'chargingDegree',
+        co.amount_charged as 'amountCharged',
+        co.charging_time as 'chargingTime',
+        co.start_soc as 'startSOc',
+        co.end_soc as 'endSoc',
+        m.device_message_id as 'messageId',
+        m.charge_order_no as 'chargeOrderNo',
+        m.content as 'content',
+        m.status as 'status',
+        m.remark as 'remark',
+        m.create_time as 'createTime'
+        from xhpc_device_message m
+        LEFT JOIN xhpc_charge_order as co on co.serial_number = m.charge_order_no
+        left join xhpc_charging_station as st on st.charging_station_id = co.charging_station_id
+        where co.del_flag =0
+        <if test="params.number !=0 and params.number ==1">
+            and co.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId})
+        </if>
+        <if test="params.number !=0 and params.number ==2">
+            and co.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.operatorId})
+        </if>
+        <if test="params.tenantId != null and params.tenantId != ''">
+            and co.tenant_id = #{params.tenantId}
+        </if>
+        <if test="params.serialNumber !=null and params.serialNumber !=''">
+            and co.serial_number=#{params.serialNumber}
+        </if>
+        <if test="params.orderId !=null and params.orderId !=''">
+            and m.charge_order_no=#{params.orderId}
+        </if>
+        order by m.charge_order_no asc, m.create_time asc
+    </select>
+
 </mapper>