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

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

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

@@ -4,13 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.Franchisee;
import com.ruoyi.admin.entity.FranchiseeWithdraw;
import com.ruoyi.admin.entity.RecoveryServe;
import com.ruoyi.admin.entity.TFranchiseeBalanceChange;
import com.ruoyi.admin.entity.*;
import com.ruoyi.admin.request.AuditFranchiseeWithdrawDTO;
import com.ruoyi.admin.request.FranchiseeWithdrawDTO;
import com.ruoyi.admin.service.FranchiseeService;
import com.ruoyi.admin.service.SysUserService;
import com.ruoyi.admin.service.TFranchiseeBalanceChangeService;
import com.ruoyi.admin.service.TFranchiseeWithdrawService;
import com.ruoyi.common.core.domain.R;
@@ -58,7 +56,8 @@
    @Resource
    private TFranchiseeWithdrawService franchiseeWithdrawService;


    @Resource
    private SysUserService sysUserService;

    @PostMapping("/applyWithdraw")
    @ApiOperation(value = "APP-加盟商申请提现", tags = {"提现"})
@@ -67,7 +66,9 @@
        if (loginUser==null){
            return R.fail("登录失效");
        }
        Franchisee franchisee = franchiseeService.getById(loginUser.getUserid());
        SysUser user = sysUserService.getById(loginUser.getUserid());

        Franchisee franchisee = franchiseeService.getById(user.getFranchiseeId());
        if (franchisee.getBalance().subtract(dto.getMoney()).compareTo(BigDecimal.ZERO)>=0){
            BigDecimal subtract = franchisee.getBalance().subtract(dto.getMoney());
            franchisee.setBalance(subtract);
@@ -108,8 +109,9 @@
        if (null == loginWorker) {
            return R.loginExpire("登录失效！");
        }
        SysUser user = sysUserService.getById(loginWorker.getUserid());
        IPage<FranchiseeWithdraw> franchiseeWithdrawList = franchiseeWithdrawService
                .lambdaQuery().eq(FranchiseeWithdraw::getFranchiseeId, loginWorker.getUserid())
                .lambdaQuery().eq(FranchiseeWithdraw::getFranchiseeId, user.getFranchiseeId())
                .orderByDesc(FranchiseeWithdraw::getCreateTime)
                .page(Page.of(pageNum, pageSize));
        return R.ok(franchiseeWithdrawList);
@@ -121,8 +123,10 @@
        if (null == loginWorker) {
            return R.loginExpire("登录失效！");
        }
        SysUser byId = sysUserService.getById(loginWorker.getUserid());

        LambdaQueryWrapper<FranchiseeWithdraw> franchiseeWithdrawLambdaQueryWrapper = new LambdaQueryWrapper<>();
        franchiseeWithdrawLambdaQueryWrapper.eq(FranchiseeWithdraw::getFranchiseeId, loginWorker.getUserid())
        franchiseeWithdrawLambdaQueryWrapper
                .orderByDesc(FranchiseeWithdraw::getCreateTime);
        if (StringUtils.hasLength(franchiseeWithdrawDTO.getFranchiseeName())){
            List<Integer> ids = franchiseeService.lambdaQuery().like(Franchisee::getName, franchiseeWithdrawDTO.getFranchiseeName()).list()
@@ -173,10 +177,12 @@
        if (null == loginWorker) {
            return R.loginExpire("登录失效！");
        }
        SysUser byId = sysUserService.getById(loginWorker.getUserid());
        FranchiseeWithdraw franchiseeWithdraw = franchiseeWithdrawService.getById(auditFranchiseeWithdrawDTO.getId());
        franchiseeWithdraw.setStatus(auditFranchiseeWithdrawDTO.getStatus());
        franchiseeWithdraw.setResult(auditFranchiseeWithdrawDTO.getResult());
        franchiseeWithdraw.setImg(auditFranchiseeWithdrawDTO.getImg());
        franchiseeWithdraw.setUpdateBy(byId.getNickName());
        franchiseeWithdraw.setUpdateTime(new Date());
        franchiseeWithdraw.setUpdateBy(loginWorker.getUsername());
        franchiseeWithdrawService.updateById(franchiseeWithdraw);