admin
2019-03-15 c9f28b430799cc8d40c7a7d99fd0f0eeecff6a5c
删除老版密码输入错误的相关代码
4个文件已删除
3个文件已修改
353 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java 140 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/user/PassWordErrorRecordDao.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/PassWordErrorRecord.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/job/DeleteRecordJob.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/PassWordErrorRecordServiceImpl.java 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/user/PassWordErrorRecordService.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -45,7 +45,6 @@
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.ExtractRecord;
import com.yeshi.fanli.entity.bus.user.LostOrder;
import com.yeshi.fanli.entity.bus.user.PassWordErrorRecord;
import com.yeshi.fanli.entity.bus.user.SMSHistory;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
@@ -86,7 +85,6 @@
import com.yeshi.fanli.service.inter.user.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ExtractRecordService;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
@@ -134,9 +132,6 @@
    @Resource
    private ExtractService extractService;
    @Resource
    private PassWordErrorRecordService passWordErrorRecordService;
    @Resource
    private ConfigService configService;
@@ -971,39 +966,6 @@
    }
    /**
     * 客户端提现密码输入错误时调用
     *
     * @param acceptData
     * @param uid
     *            用户id
     * @param out
     */
    @RequestMapping(value = "errormax", method = RequestMethod.POST)
    public void errorMax(AcceptData acceptData, long uid, PrintWriter out) {
        UserInfo user = userInfoService.getUserById(uid);
        if (user == null) {
            out.print(JsonUtil.loadFalseResult("用户不存在"));
            return;
        }
        PassWordErrorRecord record = passWordErrorRecordService.getRecord(user.getId());
        record.setUserInfo(user);
        String maxErrorStr = "5";
        maxErrorStr = configService.get(PASSWORD_MAX_ERROR); // 当日输错密码最多次数
        int maxError = Integer.parseInt(maxErrorStr);
        int count = passWordErrorRecordService.setRecord(record);
        JSONObject data = new JSONObject();
        int c = maxError - count;
        if (c <= 0) { // 当错误次数还未超过当日输错最多次数时,state为1,代表还能继续输入,little为剩余次数。state为2则不能继续输入,提现客户端退出输入密码界面
            data.put("state", "2");
            data.put("little", 0);
        } else {
            data.put("state", "1");
            data.put("little", c);
        }
        out.print(JsonUtil.loadTrueResult(data));
    }
    /**
     * 添加用户提现账号
     * 
     * @param acceptData
@@ -1078,108 +1040,6 @@
        return;
    }
    /**
     * 提现
     *
     * @param acceptData
     * @param uid
     *            用户id
     * @param money
     *            提现金额
     * @param pwd
     *            密码
     * @param request
     * @param type
     *            提现账户类型
     * @param out
     */
    @RequestMapping(value = "extractmoney", method = RequestMethod.POST)
    public void extractMoney(AcceptData acceptData, long uid, double money, String pwd, HttpServletRequest request,
            int type, PrintWriter out) {
        UserInfo user = userInfoService.getUserById(uid);
        LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]");
        if (user == null) {
            LogHelper.userInfo("不存在该用户:uid=" + uid);
            out.print(JsonUtil.loadFalseResult("用户不存在"));
            return;
        }
        BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
                acceptData.getPackages());
        if (system == null) {
            LogHelper.userInfo("提现时,不存在该系统");
            out.print(JsonUtil.loadFalseResult("系统不存在"));
            return;
        }
        PassWordErrorRecord record = passWordErrorRecordService.getRecord(user.getId());
        int errorcount = record.getCount();
        String maxStr = "5";
        maxStr = configService.get(PASSWORD_MAX_ERROR);
        int max = Integer.parseInt(maxStr);
        if (max <= errorcount) {
            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]用户[" + GsonUtil.toJson(user) + "]:提现密码错误已达上限!");
            out.print(JsonUtil.loadFalseResult("提现密码已达到每日错误次数上限,请明日再试!"));
            return;
        }
        if (pwd == null || !pwd.equals(user.getPayPassword())) {
            passWordErrorRecordService.setRecord(record);
            out.print(JsonUtil.loadFalseResult("支付密码错误"));
            return;
        }
        passWordErrorRecordService.deleteRecord(uid);// 当提现密码输入正确时,清除当前用户的密码错误输入记录
        String minMoney = configService.get(EXTRACT_MIN_MONEY); // 单笔提现最小金额
        if (money < 0.1) { // 转帐到支付宝的最小金额
            out.print(JsonUtil.loadFalseResult("单笔提现金额需要大于:" + 0.1 + "元"));
            return;
        }
        double dminMoney = Double.parseDouble(minMoney);
        if (money < dminMoney) { // 后台设置的单笔转账的最小金额
            out.print(JsonUtil.loadFalseResult("单笔提现金额需要大于:" + dminMoney + "元"));
            return;
        }
        String maxMoney = configService.get(EXTRACT_MAX_MONEY); // 单笔提现最大金额
        double dmaxMoney = Double.parseDouble(maxMoney);
        if (dmaxMoney < money) { // 后台设置的单笔转账的最大金额
            out.print(JsonUtil.loadFalseResult("单笔提现金额多为:" + dmaxMoney + "元"));
            return;
        }
        if (type != Constant.ZHIFUBAO && type != Constant.WEIXIN) { // 提现类型必须是支付宝类型或者微信类型,目前(20170506)仅支持支付宝
            out.print(JsonUtil.loadFalseResult(Constant.NOTYPE));
            return;
        }
        BindingAccount bindingAccount = bindingAccountService.getBindingAccountByUidAndType(uid, type);
        if (bindingAccount == null) {
            out.print(JsonUtil.loadFalseResult(Constant.NOACCOUNT));
            return;
        }
        Extract extract = new Extract();
        extract.setIp(IPUtil.getRemotIP(request));
        extract.setAccount(bindingAccount.getAccount());
        extract.setName(bindingAccount.getName());
        extract.setMoney(new BigDecimal(String.valueOf(money)));
        extract.setUserInfo(user);
        extract.setExtractTime(java.lang.System.currentTimeMillis());
        extract.setType(type);
        extract.setState(0);
        extract.setSystem(system);
        Integer etype = extractService.addExtract(extract);
        if (etype == null) {
            out.print(JsonUtil.loadTrueResult("操作成功"));
            return;
        } else if (etype == 1 || etype == 2) {
            out.print(JsonUtil.loadFalseResult("已超过当日提现次数或提现金额"));
        } else if (etype == 3) {
            out.print(JsonUtil.loadFalseResult("提现金额大于我的红包"));
        }
    }
    /**
     * 新版提现
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
@@ -36,7 +36,6 @@
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.user.AccountMessageService;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
@@ -61,9 +60,6 @@
    @Resource
    private ExtractService extractService;
    @Resource
    private PassWordErrorRecordService passWordErrorRecordService;
    @Resource
    private ConfigService configService;
fanli/src/main/java/com/yeshi/fanli/dao/user/PassWordErrorRecordDao.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/PassWordErrorRecord.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/job/DeleteRecordJob.java
@@ -6,7 +6,6 @@
import org.springframework.stereotype.Component;
import com.yeshi.fanli.service.inter.user.ExtractRecordService;
import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;
@Component
public class DeleteRecordJob {
@@ -14,8 +13,6 @@
    @Resource
    private ExtractRecordService extractRecordService;
    
    @Resource
    private PassWordErrorRecordService passWordErrorRecordService;
    
    //每天0点 清除ExtractRecord表中记录
    @Scheduled(cron = "0 0 0 * * ?")
@@ -23,10 +20,5 @@
        extractRecordService.deleteExtractRecord();
    }
    
    //每天0点 清除yeshi_ec_password_error_record表中记录
    @Scheduled(cron = "0 0 0 * * ?")
    public void deletePasswordErrorRecord() {
        passWordErrorRecordService.deletePasswordErrorRecord();
    }
    
}
fanli/src/main/java/com/yeshi/fanli/service/impl/user/PassWordErrorRecordServiceImpl.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/inter/user/PassWordErrorRecordService.java
File was deleted