From 2c6a7a3869f48387dda7910dca1cafa6ad672a8a Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Fri, 13 Sep 2024 22:23:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/controller/app/AppController.java | 8 +++++++- .../main/resources/mapper/system/EtOrderMapper.xml | 12 +++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java index cfc72b3..abc7ce0 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java @@ -251,7 +251,13 @@ public class AppController extends BaseController @GetMapping("/fee/list") public AjaxResult feeList(EtFeeRule etFeeRule) { - List list = etFeeRuleService.selectEtFeeRuleListByAreaId(etFeeRule.getAreaId()); + List list = null; + Long modelId = etFeeRule.getModelId(); + if(modelId != null){ + list = etFeeRuleService.selectRuleInfoListByModelId(etFeeRule.getModelId()); + }else{ + list = etFeeRuleService.selectEtFeeRuleListByAreaId(etFeeRule.getAreaId()); + } return success(list); } diff --git a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml index e5fb5b9..57211e5 100644 --- a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml @@ -317,7 +317,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" o.rule_end_time, o.return_type, AsText(o.trip_route) trip_route, - o.trip_route_str from et_order o + o.trip_route_str, + o.rental_unit, + o.riding_rule, + o.riding_rule_json, + o.charging_cycle, + o.charging_cycle_value, + o.capped_amount, + o.handling_charge, + o.platform_service_fee, + o.operator_dividend + 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 where order_id = #{orderId}