From ea05b4dcd5d4a3666d5e6bf4d71005b527b4c483 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Tue, 25 Feb 2025 08:38:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=EF=BC=88?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/service/impl/EtOrderServiceImpl.java | 2 +- .../src/main/resources/mapper/system/EtOrderMapper.xml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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 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