Merge remote-tracking branch 'origin/div' into div

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

Merge remote-tracking branch 'origin/div' into div

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

@@ -929,10 +929,7 @@
            redisManager.clearSMSVCode(phone, SMSHistory.TYPE_REMVOE);

        }

        

        UserInfo user = new UserInfo(uid);

        user.setState(UserInfo.STATE_DELETE);

        user.setStateDesc("用户主动注销账户");

        userInfoService.updateByPrimaryKeySelective(user);

        userAccountService.forbiddenUserAll(uid, "用户主动注销账户");

        JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("注销成功"));

    }

    


 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java

@@ -487,7 +487,7 @@
            return;

        long registerTime = register.getCreateTime().getTime();

        // 注册48小时内下单限制

        if (downTime.getTime() > registerTime || downTime.getTime() < registerTime + 1000*60*60*48)

        if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48L)

            return;

                

        // 是否存在上下级关系