1.判断是否缴纳过押金接口

2.根据运营区获取收费方式列表

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

@@ -129,14 +129,13 @@ public class AppController extends BaseController
 
 
     /**
-     * 查询收费方式列表
+     * 根据运营区获取收费方式列表
      */
     @GetMapping("/fee/list")
-    public TableDataInfo feeList(EtFeeRule etFeeRule)
+    public AjaxResult feeList(EtFeeRule etFeeRule)
     {
-        startPage();
+        List<EtFeeRule> list = etFeeRuleService.selectEtFeeRuleListByAreaId(etFeeRule.getAreaId());
-        List<EtFeeRule> list = etFeeRuleService.selectEtFeeRuleList(etFeeRule);
+        return success(list);
-        return getDataTable(list);
     }
 
     /**

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

@@ -638,4 +638,14 @@ public class AppVerifyController extends BaseController
         }
     }
 
+    /**
+     * 是否缴纳过押金
+     */
+    @GetMapping(value = "/checkIsDeposit")
+    public AjaxResult checkIsDeposit(Long userId)
+    {
+        Boolean aBoolean = asUserService.checkIsDeposit(userId);
+        return AjaxResult.success("操作成功",aBoolean);
+    }
+
 }

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

@@ -24,6 +24,10 @@ public class EtFeeRule extends BaseEntity
     @Excel(name = "套餐名称")
     private String name;
 
+    /** 运营区id */
+    @Excel(name = "运营区id")
+    private Long areaId;
+
     /** 说明 */
     @Excel(name = "说明")
     private String explain;
@@ -141,4 +145,8 @@ public class EtFeeRule extends BaseEntity
     /** 骑行价格说明*/
     @Excel(name = "骑行价格说明")
     private BigDecimal instructions;
+
+    /** 是否缴纳过押金*/
+    @Excel(name = "是否缴纳过押金")
+    private Boolean isDeposit;
 }

electripper-system/src/main/java/com/ruoyi/system/mapper/EtFeeRuleMapper.java

@@ -68,6 +68,15 @@ public interface EtFeeRuleMapper
      */
     public List<Long> selectRuleListByAreaId(Long areaId);
 
+    /**
+     * 根据区域ID获取收费方式列表
+     *
+     * @param areaId 用户ID
+     * @return 选中收费方式ID列表
+     */
+    public List<EtFeeRule> selectRuleInfoListByAreaId(Long areaId);
+
+
     /**
      * 根据区域ID获取收费方式名称选择框列表
      *

electripper-system/src/main/java/com/ruoyi/system/service/IEtFeeRuleService.java

@@ -28,6 +28,15 @@ public interface IEtFeeRuleService
      */
     public List<EtFeeRule> selectEtFeeRuleList(EtFeeRule etFeeRule);
 
+    /**
+     * 根据运营区获取收费方式列表
+     *
+     * @param areaId 运营区id
+     * @return 收费方式集合
+     */
+    public List<EtFeeRule> selectEtFeeRuleListByAreaId(Long areaId);
+
+
     /**
      * 新增收费方式
      *

electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFeeRuleServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.service.IAsUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.EtFeeRuleMapper;
@@ -44,6 +45,17 @@ public class EtFeeRuleServiceImpl implements IEtFeeRuleService
         return etFeeRuleMapper.selectEtFeeRuleList(etFeeRule);
     }
 
+    /**
+     * 根据运营区获取收费方式列表
+     *
+     * @param areaId 运营区id
+     * @return 结果
+     */
+    @Override
+    public List<EtFeeRule> selectEtFeeRuleListByAreaId(Long areaId) {
+        return etFeeRuleMapper.selectRuleInfoListByAreaId(areaId);
+    }
+
     /**
      * 新增收费方式
      *

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

@@ -52,6 +52,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.area_id = #{areaId}
     </select>
 
+    <select id="selectRuleInfoListByAreaId" parameterType="Long" resultMap="EtFeeRuleResult">
+        select r.rule_id, r.`name`, r.`explain`,
+               r.status, r.auto_refund_deposit, r.order_exceed_minutes, r.order_exceed_warn,
+               r.free_ride_time, r.rental_unit, r.riding_rule, r.riding_rule_json, r.charging_cycle, r.charging_cycle_value,
+               r.capped_amount, r.instructions, r.create_by, r.create_time
+        from et_fee_rule r
+                 left join et_area_rule ar on ar.rule_id = r.rule_id
+                 left join et_operating_area a  on a.area_id = ar.area_id
+        where a.area_id = #{areaId}
+    </select>
+
     <select id="selectRuleNameListByAreaId" parameterType="Long" resultType="java.lang.String">
         select r.`name`
         from et_fee_rule r