refactor(account): 移除AccountExpense相关代码

zss

8 天以前 9347c9a4a91f9e0b6562fe72a25aa06a76a928e7

 src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java

@@ -4,15 +4,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.mapper.BorrowInfoMapper;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.pojo.BorrowInfo;
import com.ruoyi.account.service.AccountExpenseService;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.account.service.BorrowInfoService;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -34,10 +32,9 @@

    private final BorrowInfoMapper borrowInfoMapper;
    private final AccountIncomeService accountIncomeService;
    private final AccountExpenseService accountExpenseService;

    @Override
    public R<?> listPage(Page page, BorrowInfo borrowInfo) {
    public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
        LambdaQueryWrapper<BorrowInfo> borrowInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
        if(borrowInfo != null){
            if(StringUtils.isNotEmpty(borrowInfo.getEntryDateStart()) && StringUtils.isNotEmpty(borrowInfo.getEntryDateEnd())){
@@ -51,11 +48,11 @@
                borrowInfoLambdaQueryWrapper.like(BorrowInfo::getBorrowerName, borrowInfo.getBorrowerName());
            }
        }
        return R.ok(borrowInfoMapper.selectPage(page, borrowInfoLambdaQueryWrapper));
        return AjaxResult.success(borrowInfoMapper.selectPage(page, borrowInfoLambdaQueryWrapper));
    }

    @Override
    public R<?> add(BorrowInfo borrowInfo) {
    public AjaxResult add(BorrowInfo borrowInfo) {
        int insert = borrowInfoMapper.insert(borrowInfo);
        if(insert > 0){
            // 添加成功，进入收入管理
@@ -70,13 +67,13 @@
            accountIncome.setInputTime(DateUtils.getNowDate());
            accountIncome.setInputUser(borrowInfo.getBorrowerName());
            accountIncomeService.save(accountIncome);
            return R.ok(null, "添加成功");
            return AjaxResult.success("添加成功");
        }
        return R.ok(null, "添加失败");
        return AjaxResult.success("添加失败");
    }

    @Override
    public R<?> updateBorrowInfo(BorrowInfo borrowInfo) {
    public AjaxResult updateBorrowInfo(BorrowInfo borrowInfo) {
        int update = borrowInfoMapper.updateById(borrowInfo);
        if(update > 0){
            // 修改成功，修改收入管理
@@ -88,40 +85,21 @@
                one.setIncomeMoney(borrowInfo.getBorrowAmount());
                accountIncomeService.updateById(one);
            }
            // 是否为还款
            if(borrowInfo.getStatus() != null && borrowInfo.getStatus() == 2){
                // 新增支出记录
                AccountExpense accountExpense = new AccountExpense();
                accountExpense.setBusinessId(borrowInfo.getId());
                accountExpense.setBusinessType(2);
                accountExpense.setExpenseDate(DateUtils.toDate(borrowInfo.getRepayDate()));
                accountExpense.setExpenseType("5");
                accountExpense.setExpenseMoney(borrowInfo.getBorrowAmount());
                accountExpense.setExpenseDescribed("还款");
                accountExpense.setExpenseMethod("3");
                accountExpense.setInputTime(DateUtils.getNowDate());
                accountExpense.setInputUser(borrowInfo.getBorrowerName());
                accountExpenseService.save(accountExpense);
            }
            return R.ok(null, "修改成功");
            return AjaxResult.success("修改成功");
        }
        return R.ok(null, "修改失败");
        return  AjaxResult.success("修改失败");
    }

    @Override
    public R<?> delete(List<Long> ids) {
    public AjaxResult delete(List<Long> ids) {
        int delete = borrowInfoMapper.deleteBatchIds(ids);
        if(delete > 0){
            // 删除成功，删除收入管理
            accountIncomeService.remove(new LambdaQueryWrapper<AccountIncome>()
                    .in(AccountIncome::getBusinessId, ids)
                    .eq(AccountIncome::getBusinessType, 2));
            // 删除支出管理
            accountExpenseService.remove(new LambdaQueryWrapper<AccountExpense>()
                    .in(AccountExpense::getBusinessId, ids)
                    .eq(AccountExpense::getBusinessType, 2));
            return R.ok(null, "删除成功");
            return AjaxResult.success("删除成功");
        }
        return R.ok(null, "删除失败");
        return  AjaxResult.success("删除失败");
    }
}