1、收回红包无需在统计中显示，只需要在明细中显示被收回的记录。 2、账户等级福利，首次提示语是领取成功，再进入提示语 本月领取

yujian

2019-07-16 8ddaf104744ee8a5f840499f3ae38766a816e943

1、收回红包无需在统计中显示，只需要在明细中显示被收回的记录。
2、账户等级福利，首次提示语是领取成功，再进入提示语 本月领取

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java

@@ -228,11 +228,26 @@
        BigDecimal thisMonthWin = userTaoLiJinOriginService.countMoneyByDate(uid, 3);

        BigDecimal lastMonthWin = userTaoLiJinOriginService.countMoneyByDate(uid, 4);



        BigDecimal zero = new BigDecimal(0);

        // 消耗

        BigDecimal todayUse = userTaoLiJinDetailService.countUseMoneyByDate(uid, 1);

        if (todayUse == null || todayUse.compareTo(zero) > 0) {

            todayUse = zero;

        }

		
        BigDecimal yesterdayUse = userTaoLiJinDetailService.countUseMoneyByDate(uid, 2);

        if (yesterdayUse == null || yesterdayUse.compareTo(zero) > 0) {

            yesterdayUse = zero;

        }

        BigDecimal thisMonthUse = userTaoLiJinDetailService.countUseMoneyByDate(uid, 3);

        if (thisMonthUse == null || thisMonthUse.compareTo(zero) > 0) {

            thisMonthUse = zero;

        }

        BigDecimal lastMonthUse = userTaoLiJinDetailService.countUseMoneyByDate(uid, 4);

        if (lastMonthUse == null || lastMonthUse.compareTo(zero) > 0) {

            lastMonthUse = zero;

        }

		


        // 问号链接

        String helpLink = configTaoLiJinService.getValueByKey("hongbao_help_link");

@@ -404,6 +419,7 @@
        }



        // 登录用户

        boolean isReceive = false;

        JSONObject data = new JSONObject();

        data.put("icon", configTaoLiJinService.getValueByKey("taolijin_system_icon"));



@@ -438,6 +454,7 @@
            UserTaoLiJinOrigin userTaoLiJin = userTaoLiJinOriginService.getRankByThisMonth(uid, type);

            if (userTaoLiJin != null) { // 已领取

                isRank = true;

                isReceive = true;

                hasMoney = userTaoLiJin.getMoney();

            } else {

                isRank = false;

@@ -474,7 +491,11 @@
                data.put("content", "推广红包，好友福利！");

                data.put("type", 1);

                data.put("money", hasMoney.setScale(2).toString());

                data.put("usage", "领取成功，已存入“我的-推广红包”");

                if (isReceive) {

                    data.put("usage", "本月领取，已存入“我的-推广红包”");

                } else {

                    data.put("usage", "领取成功，已存入“我的-推广红包”");

                }

                data.put("jumpName", "去使用");

                data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));

                data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_tip"));


 fanli/src/main/java/com/yeshi/fanli/mapping/tlj/UserTaoLiJinDetailMapper.xml

@@ -67,8 +67,7 @@
  
  <select id="countUseMoneyByDate" resultType="java.math.BigDecimal">
      SELECT IFNULL(SUM(t.`utd_money`),0) FROM `yeshi_ec_user_taolijin_detail` t
    WHERE t.`utd_uid` = #{uid} AND t.`utd_type` <![CDATA[<>]]>'overdue'
          AND t.`utd_money` <![CDATA[<]]> 0
    WHERE t.`utd_uid` = #{uid} AND (t.`utd_type` = 'reduce' OR  t.`utd_type` = 'refund')
        <if test="dateType == 1"> <!-- 今日  -->
            AND TO_DAYS(t.`utd_create_time`) =  TO_DAYS(NOW());
        </if>