1. 调整
This commit is contained in:
parent
0aba990c02
commit
2c6a7a3869
|
@ -251,7 +251,13 @@ public class AppController extends BaseController
|
|||
@GetMapping("/fee/list")
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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}
|
||||
|
|
Loading…
Reference in New Issue
Block a user