Merge branch 'dev-hongbao'

admin

2019-01-09 baacd1378b33c4a84ee7a4998fb08fd9979ee4e1

Merge branch 'dev-hongbao'

 fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java

@@ -22,7 +22,7 @@
        share("分享奖金", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_share.png", ""), invite("邀请奖金", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_invite.png", ""), inviteAndShare("奖金收入", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_share.png", ""), fanli("返利到账", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_fanli.png",

                ""), fanliWeiQuan("返利扣除", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_fanli.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), inviteWeiQuan("邀请奖金扣除", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_invite.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), shareWeiQuan("分享奖金扣除", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_share.png",

                        "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), weiQuan("售后订单扣款", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_fanli.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), systemEqualize("系统补齐", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_system.png", ""), scoreConvert("积分兑换", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_score.png",

                                ""), hongbao("官方红包", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_hongbao.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), hongbaoDeduct("红包退款", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_hongbao.png",

                                ""), hongbao("官方红包", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_hongbao.png", ""), hongbaoDeduct("红包退款", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_hongbao.png",

                                        ""), buyScore("购买积分", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_score.png", ""), extract("提现", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_extract.png",

                                                ""), extractVerify("提现验证", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_extract.png", ""), extractReject("提现被拒", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_extract.png", "");

        private final String desc;


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

@@ -95,7 +95,19 @@
            list = tempList;

        }



        if (list != null)

        if (list != null) {

            if (userMoneyDetailId != null&&list.size()>0) {

                UserMoneyDetail umd = userMoneyDetailMapper.selectByPrimaryKey(userMoneyDetailId);

                if (!TimeUtil.getGernalTime(umd.getCreateTime().getTime(), "yyyy-MM")

                        .equalsIgnoreCase(TimeUtil.getGernalTime(list.get(0).getCreateTime().getTime(), "yyyy-MM"))) {

                    Calendar calendar = Calendar.getInstance();

                    calendar.setTimeInMillis(list.get(0).getCreateTime().getTime());

                    UserMoneyDetailHistoryVO vo = new UserMoneyDetailHistoryVO();

                    vo.setMonth(new UserMonthMoneyVO(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1));

                    finalList.add(vo);

                }



            }

            for (int i = 0; i < list.size(); i++) {

                if (i > 0 && !TimeUtil.getGernalTime(list.get(i - 1).getCreateTime().getTime(), "yyyy-MM")

                        .equalsIgnoreCase(TimeUtil.getGernalTime(list.get(i).getCreateTime().getTime(), "yyyy-MM"))) {// 本条数据与上条数据不是同一月则插入月份

@@ -109,6 +121,7 @@
                vo.setDetail(list.get(i));

                finalList.add(vo);

            }

        }



        // 统计月资金



@@ -137,7 +150,8 @@
            keys = monthMap.keySet().iterator();

            while (keys.hasNext()) {

                Integer key = keys.next();

                finalList.get(key).getMonth().setExpend(voList.get(p).getExpend());

                // 去除支出负号

                finalList.get(key).getMonth().setExpend(voList.get(p).getExpend().replace("-", ""));

                finalList.get(key).getMonth().setIncome(voList.get(p).getIncome());

                p++;

            }