加盟商新增时撤回密码默认修改

xuhy

2 天以前 c6d53fb96a2e7ac88108155b604ddcef83f2fb37

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java

@@ -52,6 +52,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -908,6 +909,11 @@
        if(!list1.isEmpty()){
            return R.passwordError("该管理员账号已存在！");
        }
        // 设置加盟商初始密码
        List<Franchisee> franchiseeList = franchiseeService.list();
        if (!CollectionUtils.isEmpty(franchiseeList)){
            franchisee.setPayPassword(franchiseeList.get(0).getPayPassword());
        }
        boolean save = franchiseeService.save(franchisee);
        // 生成sysUser账号
        SysUser sysUser = new SysUser();
@@ -1068,14 +1074,20 @@
    @ApiOperation(value = "设置加盟商操作密码【202506】", tags = {"后台-加盟商管理"})
    @PutMapping(value = "/setPayPassword")
    public R<String> setPayPassword(@RequestParam(value = "payPassword") String payPassword) {
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser sysUser = sysUserService.getById(userid);
        if(Objects.isNull(sysUser.getFranchiseeId())){
            return R.fail("加盟商信息不存在！");
        List<Franchisee> franchisee = franchiseeService.list();
        for (Franchisee franchisee1 : franchisee) {
            franchisee1.setPayPassword(payPassword);
        }
        Franchisee franchisee = franchiseeService.getById(sysUser.getFranchiseeId());
        franchisee.setPayPassword(SecurityUtils.encryptPassword(payPassword));
        return franchiseeService.updateById(franchisee) ? R.ok() : R.fail();
        return franchiseeService.updateBatchById(franchisee) ? R.ok() : R.fail();
    }
    @ApiOperation(value = "获取加盟商操作密码", tags = {"后台-加盟商管理"})
    @PutMapping(value = "/getPayPassword")
    public R<String> getPayPassword() {
        List<Franchisee> franchisee = franchiseeService.list();
        if (!franchisee.isEmpty()){
            return R.ok(franchisee.get(0).getPayPassword());
        }
        return R.ok();
    }

    /**
@@ -1086,22 +1098,17 @@
    @PutMapping(value = "/balanceWithdraw")
    public R<String> balanceWithdraw(@RequestParam(value = "id") Integer id,
                                     @RequestParam(value = "payPassword") String payPassword) {

        TFranchiseeBalanceChange balanceChange = balanceChangeService.getById(id);

        Franchisee franchisee = franchiseeService.getById(balanceChange.getFranchiseeId());

        if(!SecurityUtils.matchesPassword(payPassword, franchisee.getPayPassword())){
        if(!payPassword.equals(franchisee.getPayPassword())){
            return R.fail("密码错误！");
        }

        franchisee.setBalance(franchisee.getBalance().add(balanceChange.getAmount()));
        franchiseeService.updateById(franchisee);

        // 删除操作记录
        balanceChangeService.removeById(id);

        return R.ok();
    }


}