资金明细接口增加筛选

admin

2019-11-26 ea022e84777312b730257dfcf2a33e865c8e07b7

资金明细接口增加筛选

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java

@@ -82,11 +82,14 @@
     *            年份

     * @param month

     *            月份

     * @param type

     *            1-收入 2-支出 0-全部

     * 
     * @param out

     */

    @RequestMapping(value = "getUserMoneyDetailList")

    public void getUserMoneyDetailList(AcceptData acceptData, Long uid, Long index, Integer year, Integer month,

            PrintWriter out) {

            Integer type, PrintWriter out) {

        if (uid == null || uid == 0) {

            out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

            return;

@@ -107,8 +110,8 @@
            date = new Date(ca.getTimeInMillis() - 1);

        }



        List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, date);

        long count = userMoneyDetailService.countUserMoneyDetailForClient(uid, index, date);

        List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, 0, date);

        long count = userMoneyDetailService.countUserMoneyDetailForClient(uid, index, 0, date);

        GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();

        gsonBuilder.registerTypeAdapter(UserMoneyDetailTypeEnum.class, new TypeAdapter<UserMoneyDetailTypeEnum>() {

            @Override


 fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDetailServiceImpl.java

@@ -39,7 +39,8 @@
    }



    @Override

    public List<UserMoneyDetailHistoryVO> listUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime) {

    public List<UserMoneyDetailHistoryVO> listUserMoneyDetailForClient(Long uid, Long userMoneyDetailId,int type, Date maxTime) {

        //TODO 增加type筛选

        List<UserMoneyDetailHistoryVO> finalList = new ArrayList<>();

        List<UserMoneyDetail> list = null;

        if (userMoneyDetailId == null) {// 首次请求

@@ -191,7 +192,8 @@
    }



    @Override

    public long countUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime) {

    public long countUserMoneyDetailForClient(Long uid, Long userMoneyDetailId,int type, Date maxTime) {

        //TODO 增加type筛选

        long monthCount = 0L;

        long detailCount = 0L;

        // 未通过时间筛选，查询所有


 fanli/src/main/java/com/yeshi/fanli/service/inter/money/UserMoneyDetailService.java

@@ -33,7 +33,7 @@
     * @param maxTime

     * @return

     */

    public List<UserMoneyDetailHistoryVO> listUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime);

    public List<UserMoneyDetailHistoryVO> listUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, int type, Date maxTime);



    /**

     * 客户端查询用户的资金记录的条数（计算月统计）

@@ -43,7 +43,7 @@
     * @param maxTime

     * @return

     */

    public long countUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime);

    public long countUserMoneyDetailForClient(Long uid, Long userMoneyDetailId,int type, Date maxTime);



    /**

     * 资金明细详情列表（老版本）