优化资金明细

admin

2018-12-24 46906f31ebc49cde75b65d71bb06f228997148dc

优化资金明细

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

@@ -3,6 +3,7 @@
import java.io.IOException;

import java.io.PrintWriter;

import java.lang.reflect.Type;

import java.util.Calendar;

import java.util.Date;

import java.util.List;



@@ -24,6 +25,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;

import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.vo.money.UserMoneyDetailHistoryVO;



@@ -72,7 +74,12 @@


        if (year != null && month != null) {

            date = new Date(TimeUtil.convertToTimeTemp(year + "-" + month, "yyyy-M"));

            Calendar ca = Calendar.getInstance();

            ca.setTime(date);

            ca.add(Calendar.MONTH, 1);

            date = new Date(ca.getTimeInMillis() - 1);

        }



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

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

        GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringBuilder(new GsonBuilder())

@@ -87,6 +94,7 @@
            public void write(JsonWriter out, UserMoneyDetailTypeEnum arg1) throws IOException {

                out.beginObject();

                out.name("portrait").value(arg1.getPicture());

                if (!StringUtil.isNullOrEmpty(arg1.getHelpUrl()))

                out.name("helpUrl").value(arg1.getHelpUrl());

                out.endObject();

            }


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

@@ -19,12 +19,12 @@
public class UserMoneyDetail {



    public enum UserMoneyDetailTypeEnum {

        share("分享奖金", "", ""), invite("邀请奖金", "", ""), inviteAndShare("奖金收入", "", ""), fanli("返利到账", "",

                ""), fanliWeiQuan("返利扣除", "", ""), inviteWeiQuan("邀请奖金扣除", "", ""), shareWeiQuan("分享奖金扣除", "",

                        ""), weiQuan("售后订单扣款", "", ""), systemEqualize("系统补齐", "", ""), scoreConvert("积分兑换", "",

                                ""), hongbao("官方红包", "", ""), hongbaoDeduct("红包退款", "", ""), buyScore("购买积分", "",

                                        ""), extract("提现", "",

                                                ""), extractVerify("提现验证", "", ""), extractReject("提现被拒", "", "");

        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("奖金收入", "", ""), fanli("返利到账", "",

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

                        ""), weiQuan("售后订单扣款", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_fanli.png", ""), 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://www.baidu.com"), 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;

        private final String picture;

        private final String helpUrl;

@@ -56,6 +56,7 @@
    @Expose

    @Column(name = "umd_money")

    private BigDecimal money;

    @Expose

    @Column(name = "umd_type")

    private UserMoneyDetailTypeEnum type;

    @Expose

@@ -175,4 +176,5 @@
        this.updateTime = updateTime;

    }





}


 fanli/src/main/java/com/yeshi/fanli/mapping/money/UserMoneyDetailMapper.xml

@@ -76,7 +76,7 @@
    <select id="selectCountByUidAndMaxCreateTime" resultType="java.lang.Long">
        SELECT count(umd_id) FROM yeshi_ec_user_money_detail
        where
        umd_uid=#{uid} and d.`umd_createtime`
        umd_uid=#{uid} and `umd_createtime`
        <![CDATA[
            <=
        ]]>

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

@@ -45,7 +45,18 @@
                UserMoneyDetailHistoryVO vo = new UserMoneyDetailHistoryVO();

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

                finalList.add(vo);

            } else {

                if (maxTime != null) {//

                    Calendar calendar = Calendar.getInstance();

                    calendar.setTimeInMillis(maxTime.getTime());

                    UserMoneyDetailHistoryVO vo = new UserMoneyDetailHistoryVO();

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

                    vo.getMonth().setExpend("0");

                    vo.getMonth().setIncome("0");

                    finalList.add(vo);

            }

            }



        } else {// 二次请求



            int size = 21;