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

hx-account/src/main/java/com/fjhx/account/controller/loan/LoanInfoController.java

@@ -0,0 +1,63 @@
+package com.fjhx.account.controller.loan;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.loan.dto.LoanInfoDto;
+import com.fjhx.account.entity.loan.dto.LoanInfoSelectDto;
+import com.fjhx.account.entity.loan.po.LoanInfo;
+import com.fjhx.account.entity.loan.vo.LoanInfoVo;
+import com.fjhx.account.service.loan.LoanInfoService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 借款信息 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-09-15
+ */
+@RestController
+@RequestMapping("/loanInfo")
+public class LoanInfoController {
+
+    @Autowired
+    private LoanInfoService loanInfoService;
+
+    /**
+     * 借款信息分页
+     */
+    @PostMapping("/page")
+    public Page<LoanInfoVo> page(@RequestBody LoanInfoSelectDto dto) {
+        return loanInfoService.getPage(dto);
+    }
+
+    /**
+     * 借款人列表
+     */
+    @GetMapping("/getLoanUserList")
+    public List<LoanInfo> getLoanUserList() {
+        return loanInfoService.getLoanUserList();
+    }
+
+    /**
+     * 借款信息明细
+     */
+    @PostMapping("/detail")
+    public LoanInfoVo detail(@RequestBody BaseSelectDto dto) {
+        return loanInfoService.detail(dto.getId());
+    }
+
+    /**
+     * 借款信息新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody LoanInfoDto loanInfoDto) {
+        loanInfoService.add(loanInfoDto);
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/controller/repayment/RepaymentRecordsController.java

@@ -0,0 +1,46 @@
+package com.fjhx.account.controller.repayment;
+
+import com.fjhx.account.entity.repayment.dto.RepaymentRecordsDto;
+import com.fjhx.account.entity.repayment.dto.RepaymentRecordsSelectDto;
+import com.fjhx.account.entity.repayment.vo.RepaymentRecordsVo;
+import com.fjhx.account.service.repayment.RepaymentRecordsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 还款记录 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-09-15
+ */
+@RestController
+@RequestMapping("/repaymentRecords")
+public class RepaymentRecordsController {
+
+    @Autowired
+    private RepaymentRecordsService repaymentRecordsService;
+
+    /**
+     * 还款记录列表
+     */
+    @PostMapping("/list")
+    public List<RepaymentRecordsVo> list(@RequestBody RepaymentRecordsSelectDto dto) {
+        return repaymentRecordsService.getList(dto);
+    }
+
+    /**
+     * 还款记录新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody RepaymentRecordsDto repaymentRecordsDto) {
+        repaymentRecordsService.add(repaymentRecordsDto);
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/entity/account/enums/AccountRunningWaterEnum.java

@@ -13,6 +13,8 @@ public enum AccountRunningWaterEnum {
     TAX_REFUND("40", "退税"),
     INTERNAL_TRANSFER("50", "内部转账"),
     EXCHANGE_SETTLEMENT("60", "结汇"),
+    LOAN("70", "借款"),
+    REPAYMENT("80", "还款"),
     ;
     private static Map<String, String> map = new LinkedHashMap<>();
     private String key;

hx-account/src/main/java/com/fjhx/account/entity/loan/dto/LoanInfoDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.loan.dto;
+
+import com.fjhx.account.entity.loan.po.LoanInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 借款信息新增编辑入参实体
+ *
+ * @author
+ * @since 2023-09-15
+ */
+@Getter
+@Setter
+public class LoanInfoDto extends LoanInfo {
+
+}

hx-account/src/main/java/com/fjhx/account/entity/loan/dto/LoanInfoSelectDto.java

@@ -0,0 +1,27 @@
+package com.fjhx.account.entity.loan.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 借款信息列表查询入参实体
+ *
+ * @author
+ * @since 2023-09-15
+ */
+@Getter
+@Setter
+public class LoanInfoSelectDto extends BaseSelectDto {
+
+    /**
+     * 归属公司id
+     */
+    private Long corporationId;
+
+    /**
+     * 还款状态 0未还款 1部分还款 2已还款
+     */
+    private Integer repaymentStatus;
+
+}

hx-account/src/main/java/com/fjhx/account/entity/loan/po/LoanInfo.java

@@ -0,0 +1,64 @@
+package com.fjhx.account.entity.loan.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 借款信息
+ * </p>
+ *
+ * @author
+ * @since 2023-09-15
+ */
+@Getter
+@Setter
+@TableName("loan_info")
+public class LoanInfo extends BasePo {
+
+    /**
+     * 多公司id
+     */
+    private Long corporationId;
+
+    /**
+     * 借款人
+     */
+    private String loanUserName;
+
+    /**
+     * 借款时间
+     */
+    private Date loanTime;
+
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
+
+    /**
+     * 付款(借款)账户
+     */
+    private Long loanAccountId;
+
+    /**
+     * 借款备注
+     */
+    private String remarks;
+
+    /**
+     * 还款状态 0未还款 1部分还款 2已还款
+     */
+    private Integer repaymentStatus;
+
+}

hx-account/src/main/java/com/fjhx/account/entity/loan/vo/LoanInfoVo.java

@@ -0,0 +1,32 @@
+package com.fjhx.account.entity.loan.vo;
+
+import com.fjhx.account.entity.loan.po.LoanInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 借款信息列表查询返回值实体
+ *
+ * @author
+ * @since 2023-09-15
+ */
+@Getter
+@Setter
+public class LoanInfoVo extends LoanInfo {
+
+    /**
+     * 归属公司名称
+     */
+    private String corporationName;
+
+    /**
+     * 付款账号名称
+     */
+    private String loanAccountName;
+
+    /**
+     * 创建人名称
+     */
+    private String createUserName;
+
+}

hx-account/src/main/java/com/fjhx/account/entity/repayment/dto/RepaymentRecordsDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.repayment.dto;
+
+import com.fjhx.account.entity.repayment.po.RepaymentRecords;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 还款记录新增编辑入参实体
+ *
+ * @author
+ * @since 2023-09-15
+ */
+@Getter
+@Setter
+public class RepaymentRecordsDto extends RepaymentRecords {
+
+}

hx-account/src/main/java/com/fjhx/account/entity/repayment/dto/RepaymentRecordsSelectDto.java

@@ -0,0 +1,21 @@
+package com.fjhx.account.entity.repayment.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 还款记录列表查询入参实体
+ *
+ * @author
+ * @since 2023-09-15
+ */
+@Getter
+@Setter
+public class RepaymentRecordsSelectDto extends BaseSelectDto {
+
+    /**
+     * 借款id
+     */
+    private Long loanId;
+}

hx-account/src/main/java/com/fjhx/account/entity/repayment/po/RepaymentRecords.java

@@ -0,0 +1,54 @@
+package com.fjhx.account.entity.repayment.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 还款记录
+ * </p>
+ *
+ * @author
+ * @since 2023-09-15
+ */
+@Getter
+@Setter
+@TableName("repayment_records")
+public class RepaymentRecords extends BasePo {
+
+    /**
+     * 借款id
+     */
+    private Long loanId;
+
+    /**
+     * 收款账户
+     */
+    private Long repaymentAccountId;
+
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
+
+    /**
+     * 还款时间
+     */
+    private Date repaymentTime;
+
+    /**
+     * 还款备注
+     */
+    private String remarks;
+
+}

hx-account/src/main/java/com/fjhx/account/entity/repayment/vo/RepaymentRecordsVo.java

@@ -0,0 +1,22 @@
+package com.fjhx.account.entity.repayment.vo;
+
+import com.fjhx.account.entity.repayment.po.RepaymentRecords;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 还款记录列表查询返回值实体
+ *
+ * @author
+ * @since 2023-09-15
+ */
+@Getter
+@Setter
+public class RepaymentRecordsVo extends RepaymentRecords {
+
+    /**
+     * 登记
+     */
+    private String createUserName;
+
+}

hx-account/src/main/java/com/fjhx/account/mapper/loan/LoanInfoMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.account.mapper.loan;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.loan.po.LoanInfo;
+import com.fjhx.account.entity.loan.vo.LoanInfoVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 借款信息 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-09-15
+ */
+public interface LoanInfoMapper extends BaseMapper<LoanInfo> {
+
+    /**
+     * 借款信息分页
+     */
+    Page<LoanInfoVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<LoanInfo> wrapper);
+
+}

hx-account/src/main/java/com/fjhx/account/mapper/repayment/RepaymentRecordsMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.account.mapper.repayment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.account.entity.repayment.po.RepaymentRecords;
+import com.fjhx.account.entity.repayment.vo.RepaymentRecordsVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 还款记录 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-09-15
+ */
+public interface RepaymentRecordsMapper extends BaseMapper<RepaymentRecords> {
+
+    /**
+     * 还款记录列表
+     */
+    List<RepaymentRecordsVo> getList(@Param("ew") IWrapper<RepaymentRecords> wrapper);
+
+}

hx-account/src/main/java/com/fjhx/account/service/loan/LoanInfoService.java

@@ -0,0 +1,43 @@
+package com.fjhx.account.service.loan;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.loan.dto.LoanInfoDto;
+import com.fjhx.account.entity.loan.dto.LoanInfoSelectDto;
+import com.fjhx.account.entity.loan.po.LoanInfo;
+import com.fjhx.account.entity.loan.vo.LoanInfoVo;
+import com.ruoyi.common.core.service.BaseService;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 借款信息 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-09-15
+ */
+public interface LoanInfoService extends BaseService<LoanInfo> {
+
+    /**
+     * 借款信息分页
+     */
+    Page<LoanInfoVo> getPage(LoanInfoSelectDto dto);
+
+    /**
+     * 借款人列表
+     */
+    List<LoanInfo> getLoanUserList();
+
+    /**
+     * 借款信息明细
+     */
+    LoanInfoVo detail(Long id);
+
+    /**
+     * 借款信息新增
+     */
+    void add(LoanInfoDto loanInfoDto);
+
+}

hx-account/src/main/java/com/fjhx/account/service/loan/impl/LoanInfoServiceImpl.java

@@ -0,0 +1,131 @@
+package com.fjhx.account.service.loan.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.account.entity.account.enums.AccountRunningWaterEnum;
+import com.fjhx.account.entity.account.po.AccountManagement;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
+import com.fjhx.account.entity.loan.dto.LoanInfoDto;
+import com.fjhx.account.entity.loan.dto.LoanInfoSelectDto;
+import com.fjhx.account.entity.loan.po.LoanInfo;
+import com.fjhx.account.entity.loan.vo.LoanInfoVo;
+import com.fjhx.account.mapper.loan.LoanInfoMapper;
+import com.fjhx.account.service.account.AccountManagementService;
+import com.fjhx.account.service.account.AccountRunningWaterService;
+import com.fjhx.account.service.loan.LoanInfoService;
+import com.fjhx.common.entity.corporation.po.Corporation;
+import com.fjhx.common.service.corporation.CorporationService;
+import com.fjhx.common.utils.Assert;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
+import com.ruoyi.system.utils.UserUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 借款信息 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-09-15
+ */
+@Service
+public class LoanInfoServiceImpl extends ServiceImpl<LoanInfoMapper, LoanInfo> implements LoanInfoService {
+
+    @Autowired
+    private CorporationService corporationService;
+    @Autowired
+    private AccountManagementService accountManagementService;
+    @Autowired
+    private AccountRunningWaterService accountRunningWaterService;
+
+    @Override
+    public Page<LoanInfoVo> getPage(LoanInfoSelectDto dto) {
+        IWrapper<LoanInfo> wrapper = getWrapper();
+        //归属公司
+        wrapper.eq(LoanInfo::getCorporationId, dto.getCorporationId());
+        //到款状态
+        wrapper.eq(LoanInfo::getRepaymentStatus, dto.getRepaymentStatus());
+        //关键字
+        wrapper.keyword(dto.getKeyword(),
+                new SqlField(LoanInfo::getLoanUserName),
+                new SqlField(LoanInfo::getAmount),
+                new SqlField(LoanInfo::getLoanTime)
+        );
+        //排序 借款时间>创建时间>id
+        wrapper.orderByDesc("li", LoanInfo::getLoanTime);
+        wrapper.orderByDesc("li", LoanInfo::getCreateTime);
+        wrapper.orderByDesc("li", LoanInfo::getId);
+        Page<LoanInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<LoanInfoVo> records = page.getRecords();
+        //赋值归属公司名称
+        corporationService.attributeAssign(records, LoanInfoVo::getCorporationId, (item, corporation) -> {
+            item.setCorporationName(corporation.getName());
+        });
+        //赋值创建人名称
+        UserUtil.assignmentNickName(records, LoanInfoVo::getCreateUser, LoanInfoVo::setCreateUserName);
+        return page;
+    }
+
+    /**
+     * 借款人列表
+     */
+    @Override
+    public List<LoanInfo> getLoanUserList() {
+        List<LoanInfo> list = this.list(q -> q
+                .select(LoanInfo::getLoanUserName)
+                .groupBy(LoanInfo::getLoanUserName)
+                .isNotNull(LoanInfo::getLoanUserName)
+                .eq(LoanInfo::getCreateUser, SecurityUtils.getUserId())
+        );
+        return list;
+    }
+
+    @Override
+    public LoanInfoVo detail(Long id) {
+        Assert.notEmpty(id, "借款id不能为空");
+        LoanInfo LoanInfo = this.getById(id);
+        LoanInfoVo result = BeanUtil.toBean(LoanInfo, LoanInfoVo.class);
+        //赋值归属公司名称
+        Corporation corporation = corporationService.getById(result.getCorporationId());
+        if (ObjectUtil.isNotEmpty(corporation)) {
+            result.setCorporationName(corporation.getName());
+        }
+        //赋值付款账号名称
+        AccountManagement accountManagement = accountManagementService.getById(result.getLoanAccountId());
+        if (ObjectUtil.isNotEmpty(accountManagement)) {
+            result.setLoanAccountName(accountManagement.getName());
+        }
+        return result;
+    }
+
+    @Override
+    @DSTransactional
+    public void add(LoanInfoDto loanInfoDto) {
+        loanInfoDto.setRepaymentStatus(0);
+        this.save(loanInfoDto);
+        //创建支出流水
+        AccountRunningWater accountRunningWater = new AccountRunningWater();
+        accountRunningWater.setStatus("20");
+        accountRunningWater.setType(AccountRunningWaterEnum.LOAN.getKey());
+        accountRunningWater.setRemarks(loanInfoDto.getRemarks());
+        accountRunningWater.setTransactionTime(loanInfoDto.getLoanTime());
+        accountRunningWater.setAccountManagementId(loanInfoDto.getLoanAccountId());
+        accountRunningWater.setAmount(loanInfoDto.getAmount());
+        Assert.notEmpty(loanInfoDto.getCurrency(), "借款币种不能为空");
+        accountRunningWater.setCurrency(loanInfoDto.getCurrency());
+        accountRunningWater.setBusinessId(loanInfoDto.getId());
+        //操作余额
+        accountRunningWaterService.changeRemainder(accountRunningWater);
+        accountRunningWaterService.save(accountRunningWater);
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/service/repayment/RepaymentRecordsService.java

@@ -0,0 +1,31 @@
+package com.fjhx.account.service.repayment;
+
+import com.fjhx.account.entity.repayment.dto.RepaymentRecordsDto;
+import com.fjhx.account.entity.repayment.dto.RepaymentRecordsSelectDto;
+import com.fjhx.account.entity.repayment.po.RepaymentRecords;
+import com.fjhx.account.entity.repayment.vo.RepaymentRecordsVo;
+import com.ruoyi.common.core.service.BaseService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 还款记录 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-09-15
+ */
+public interface RepaymentRecordsService extends BaseService<RepaymentRecords> {
+
+    /**
+     * 还款记录列表
+     */
+    List<RepaymentRecordsVo> getList(RepaymentRecordsSelectDto dto);
+
+    /**
+     * 还款记录新增
+     */
+    void add(RepaymentRecordsDto repaymentRecordsDto);
+
+}

hx-account/src/main/java/com/fjhx/account/service/repayment/impl/RepaymentRecordsServiceImpl.java

@@ -0,0 +1,88 @@
+package com.fjhx.account.service.repayment.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.account.entity.account.enums.AccountRunningWaterEnum;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
+import com.fjhx.account.entity.loan.po.LoanInfo;
+import com.fjhx.account.entity.repayment.dto.RepaymentRecordsDto;
+import com.fjhx.account.entity.repayment.dto.RepaymentRecordsSelectDto;
+import com.fjhx.account.entity.repayment.po.RepaymentRecords;
+import com.fjhx.account.entity.repayment.vo.RepaymentRecordsVo;
+import com.fjhx.account.mapper.repayment.RepaymentRecordsMapper;
+import com.fjhx.account.service.account.AccountRunningWaterService;
+import com.fjhx.account.service.loan.LoanInfoService;
+import com.fjhx.account.service.repayment.RepaymentRecordsService;
+import com.fjhx.common.utils.Assert;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.utils.UserUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 还款记录 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-09-15
+ */
+@Service
+public class RepaymentRecordsServiceImpl extends ServiceImpl<RepaymentRecordsMapper, RepaymentRecords> implements RepaymentRecordsService {
+
+    @Autowired
+    private AccountRunningWaterService accountRunningWaterService;
+    @Autowired
+    private LoanInfoService loanInfoService;
+
+    @Override
+    public List<RepaymentRecordsVo> getList(RepaymentRecordsSelectDto dto) {
+        IWrapper<RepaymentRecords> wrapper = getWrapper();
+        //借款id过滤
+        Assert.notEmpty(dto.getLoanId(), "借款id不能为空");
+        wrapper.eq(RepaymentRecords::getLoanId, dto.getLoanId());
+        //排序 付款时间>创建时间>id
+        wrapper.orderByDesc("rr", RepaymentRecords::getRepaymentTime);
+        wrapper.orderByDesc("rr", RepaymentRecords::getCreateTime);
+        wrapper.orderByDesc("rr", RepaymentRecords::getId);
+        List<RepaymentRecordsVo> list = this.baseMapper.getList(wrapper);
+        //赋值登记人名称
+        UserUtil.assignmentNickName(list, RepaymentRecordsVo::getCreateUser, RepaymentRecordsVo::setCreateUserName);
+        return list;
+    }
+
+    @Override
+    @DSTransactional
+    public void add(RepaymentRecordsDto repaymentRecordsDto) {
+        Assert.notEmpty(repaymentRecordsDto.getLoanId(), "借款id不能为空");
+        this.save(repaymentRecordsDto);
+        //创建收入流水
+        AccountRunningWater accountRunningWater = new AccountRunningWater();
+        accountRunningWater.setStatus("10");
+        accountRunningWater.setType(AccountRunningWaterEnum.REPAYMENT.getKey());
+        accountRunningWater.setRemarks(repaymentRecordsDto.getRemarks());
+        accountRunningWater.setTransactionTime(repaymentRecordsDto.getRepaymentTime());
+        accountRunningWater.setAccountManagementId(repaymentRecordsDto.getRepaymentAccountId());
+        accountRunningWater.setAmount(repaymentRecordsDto.getAmount());
+        Assert.notEmpty(repaymentRecordsDto.getCurrency(), "还款币种不能为空");
+        accountRunningWater.setCurrency(repaymentRecordsDto.getCurrency());
+        accountRunningWater.setBusinessId(repaymentRecordsDto.getId());
+        //操作余额
+        accountRunningWaterService.changeRemainder(accountRunningWater);
+        accountRunningWaterService.save(accountRunningWater);
+        //修改借款状态
+        LoanInfo loanInfo = loanInfoService.getById(repaymentRecordsDto.getLoanId());
+        List<RepaymentRecords> repaymentRecordsList = this.list(q -> q.eq(RepaymentRecords::getLoanId, repaymentRecordsDto.getLoanId()));
+        BigDecimal repaymentAmount = repaymentRecordsList.stream().map(RepaymentRecords::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        if (repaymentAmount.compareTo(loanInfo.getAmount()) < 0) {
+            loanInfo.setRepaymentStatus(1);//部分还款
+        } else {
+            loanInfo.setRepaymentStatus(2);//已还款
+        }
+        loanInfoService.updateById(loanInfo);
+    }
+
+}

hx-account/src/main/resources/mapper/loan/LoanInfoMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.account.mapper.loan.LoanInfoMapper">
+    <select id="getPage" resultType="com.fjhx.account.entity.loan.vo.LoanInfoVo">
+        select li.id,
+               li.corporation_id,
+               li.loan_user_name,
+               li.loan_time,
+               li.amount,
+               li.currency,
+               li.loan_account_id,
+               li.remarks,
+               li.repayment_status,
+               li.create_user,
+               li.create_time,
+               li.update_user,
+               li.update_time
+        from loan_info li
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-account/src/main/resources/mapper/repayment/RepaymentRecordsMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.account.mapper.repayment.RepaymentRecordsMapper">
+    <select id="getList" resultType="com.fjhx.account.entity.repayment.vo.RepaymentRecordsVo">
+        select rr.id,
+               rr.loan_id,
+               rr.repayment_account_id,
+               rr.amount,
+               rr.currency,
+               rr.repayment_time,
+               rr.remarks,
+               rr.create_user,
+               rr.create_time,
+               rr.update_user,
+               rr.update_time
+        from repayment_records rr
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>