qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 调整

Browse Source
This commit is contained in:
邱贞招 2024-09-13 22:23:23 +08:00
parent 0aba990c02
commit 2c6a7a3869
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java
View File

@ -251,7 +251,13 @@ public class AppController extends BaseController
@GetMapping("/fee/list") @GetMapping("/fee/list")
public AjaxResult feeList(EtFeeRule etFeeRule) public AjaxResult feeList(EtFeeRule etFeeRule)
{ {
List<EtFeeRule> list = etFeeRuleService.selectEtFeeRuleListByAreaId(etFeeRule.getAreaId()); List<EtFeeRule> list = null;
Long modelId = etFeeRule.getModelId();
if(modelId != null){
list = etFeeRuleService.selectRuleInfoListByModelId(etFeeRule.getModelId());
}else{
list = etFeeRuleService.selectEtFeeRuleListByAreaId(etFeeRule.getAreaId());
}
return success(list); return success(list);
} }

12
electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
View File

@ -317,7 +317,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.rule_end_time, o.rule_end_time,
o.return_type, o.return_type,
AsText(o.trip_route) trip_route, 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_user u ON u.user_id = o.user_id
LEFT JOIN et_operating_area oa ON o.area_id = oa.area_id LEFT JOIN et_operating_area oa ON o.area_id = oa.area_id
where order_id = #{orderId} where order_id = #{orderId}