diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
index e87faa3..8d7c444 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
@@ -194,7 +194,7 @@ public class EtOrderServiceImpl implements IEtOrderService
         }
         // 退款记录
         List<EtRefund> refunds = etRefundService.selectEtRefundByOrderNo(order.getOrderNo());
-        if(ObjectUtils.isNotEmpty(refunds) && refunds.size() > 0){
+        if(ObjectUtils.isNotEmpty(refunds) && !refunds.isEmpty()){
             order.setEtRefunds(refunds);
         }
         return order;
diff --git a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
index 248ed81..42ebe65 100644
--- a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
@@ -478,7 +478,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                o.handling_charge,
                o.platform_service_fee,
                o.operator_dividend,
-               o.cost
+               o.cost,
+               o.used_sn,
+               o.return_mode,
+               o.return_lon,
+               o.return_lat
         from et_order o
         LEFT JOIN et_user u ON u.user_id = o.user_id
         LEFT JOIN et_operating_area oa ON o.area_id = oa.area_id