Merge remote-tracking branch 'origin/master'

admin

2019-07-24 84cf08fda72e96440e7b0e4954e43702362b5c17

Merge remote-tracking branch 'origin/master'

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

@@ -207,8 +207,8 @@
            return;

        }



        // 过期

        userTaoLiJinOriginService.overdueHongBao(uid);

        // 过期 -取消收回

        // userTaoLiJinOriginService.overdueHongBao(uid);



        // 我的淘礼金

        BigDecimal tlj = null;

@@ -575,13 +575,12 @@
            array.add(gson.toJson(extra));

        }



        executor.execute(new Runnable() {

            @Override

            public void run() {

                // 过期

                userTaoLiJinOriginService.overdueHongBao(uid);

            }

        });

        /*// 过期 -取消收回

         * executor.execute(new Runnable() {

         * 
         * @Override public void run() {

         * userTaoLiJinOriginService.overdueHongBao(uid); } });

         */



        JSONObject data = new JSONObject();

        data.put("count", array.size());


 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java

@@ -228,8 +228,8 @@
            throw new UserTaoLiJinRecordException(101, "红包余额不足");

        }



        // 过期

        userTaoLiJinOriginService.overdueHongBao(uid);

        // 过期 -取消收回

        // userTaoLiJinOriginService.overdueHongBao(uid);

        

        // 总推广红包

        BigDecimal totalMoney = MoneyBigDecimalUtil.mul(perface, new BigDecimal(totalNum));