111

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

@@ -180,13 +180,19 @@ public class AppController extends BaseController
      * 获取运营区详细信息
      */
     @GetMapping(value = "/area/{areaId}")
-    public AjaxResult getInfo(@PathVariable("areaId") Long areaId)
+    public AjaxResult getInfo(@PathVariable("areaId") Long areaId, Long ruleId)
     {
         if(areaId == null){
             logger.info("没有传入areaId参数：【areaId={}】",areaId);
             return error("请传areaId参数"+"【areaId="+areaId+"】");
         }
         EtOperatingArea area = etOperatingAreaService.selectEtOperatingAreaByAreaId(areaId);
+        if(ruleId != null){
+            EtFeeRule etFeeRule = etFeeRuleService.selectEtFeeRuleByRuleId(ruleId);
+            if(etFeeRule!=null){
+                area.setCappedAmount(etFeeRule.getCappedAmount());
+            }
+        }
         return success(area);
     }
 

electripper-system/src/main/java/com/ruoyi/system/domain/EtOperatingArea.java

@@ -238,4 +238,9 @@ public class EtOperatingArea extends BaseEntityPlus implements Serializable
     /** 禁停区数*/
     @TableField(exist = false)
     private Integer bannedRidingAreaNum;
+
+    /** 封顶金额*/
+    @TableField(exist = false)
+    private BigDecimal cappedAmount;
+
 }

electripper-system/src/main/resources/mapper/system/AsUserMapper.xml

@@ -71,6 +71,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="phonenumber != null and phonenumber != ''">
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
+		<if test="appId != null and appId != ''">
+			AND u.appid = #{appId}
+		</if>
+		<if test="appName != null and appName != ''">
+			AND u.app_name like concat('%', #{appName}, '%')
+		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
 		</if>