Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'…

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -130,6 +130,7 @@ public enum PerformanceResultEnum implements ResultEnum {
 
     OWNER_LOAN_RECORD_PAY_STATUS_ERROR(1850, "状态已变更无法支付"),
     OWNER_LOAN_RECORD_CANCEL_STATUS_ERROR(1851, "状态已变更无法取消"),
+    OWNER_LOAN_RECORD_ADJUST_STATUS_ERROR(1851, "状态已变更无法核销"),
     OWNER_LOAN_RECORD_PAY_WAIT_ERROR(1852,"当前借款单状态不是待付款"),
     OWNER_LOAN_PAYMENT_STATUS_ERROR(1851, "状态已变变更"),
 

performance-web/src/main/java/com/clx/performance/controller/pc/loan/carrier/CarrierOwnerRepaymentController.java

@@ -56,7 +56,7 @@ public class CarrierOwnerRepaymentController {
     @ApiOperation(value = "核销",notes = "<br>By:姜文业")
     @GetMapping("/adjust")
     public Result<Object> adjust(@RequestParam("id") @NotNull(message = "id不能为空") Integer id) {
-
+        ownerRepaymentService.adjust(id);
         return Result.ok();
     }
 

performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanAccountApproveServiceImpl.java

@@ -3,9 +3,11 @@ package com.clx.performance.service.impl.loan;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.loan.OwnerLoanAccountApproveDao;
+import com.clx.performance.dao.loan.OwnerLoanAccountDao;
 import com.clx.performance.enums.OwnerAccountEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.loan.OwnerLoanAccountApproveEnum;
+import com.clx.performance.model.loan.OwnerLoanAccount;
 import com.clx.performance.model.loan.OwnerLoanAccountApprove;
 import com.clx.performance.param.pc.loan.carrier.OwnerLoanAccountApproveParam;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountApproveParam;
@@ -13,6 +15,8 @@ import com.clx.performance.service.loan.OwnerLoanAccountApproveService;
 import com.clx.performance.service.loan.OwnerLoanAccountService;
 import com.clx.performance.struct.loan.OwnerLoanAccountApproveStruct;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountApproveVO;
+import com.msl.common.base.Optional;
+import com.msl.common.exception.ServiceSystemException;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
@@ -38,6 +42,7 @@ public class OwnerLoanAccountApproveServiceImpl  implements OwnerLoanAccountAppr
     private final OwnerLoanAccountApproveStruct ownerLoanAccountApproveStruct;
 
     private final OwnerLoanAccountService ownerLoanAccountService;
+    private final OwnerLoanAccountDao ownerLoanAccountDao;
     @Override
     public IPage<OwnerLoanAccountApproveVO> pageOwnerLoanAccountApprove(PageOwnerLoanAccountApproveParam param) {
         IPage<OwnerLoanAccountApprove> page = ownerLoanAccountApproveDao.pageOwnerLoanAccountApprove(param);
@@ -61,6 +66,12 @@ public class OwnerLoanAccountApproveServiceImpl  implements OwnerLoanAccountAppr
     @Override
     public void openOwnerLoanAccountApprove() {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Optional<OwnerLoanAccount> optional = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo,
+                loginUserInfo.getUserNo());
+        if(optional.isPresent()){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"您已经申请过借款用户，请勿重复申请");
+        }
+
         OwnerLoanAccountApprove entity = new OwnerLoanAccountApprove();
         entity.setAccountType(OwnerAccountEnum.AccountTypeStatus.LOAN_ACCOUNT.getCode());
         entity.setOwnerUserNo(loginUserInfo.getUserNo());

performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerRepaymentServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.message.feign.ClxMessageOpenapiFeign;
 import com.clx.message.req.message.AliSmsMessageReq;
+import com.clx.order.enums.ResultEnum;
 import com.clx.performance.component.IdGenerateSnowFlake;
 import com.clx.performance.config.ClxMessageConfig;
 import com.clx.performance.config.loan.ClxPayeeConfig;
@@ -309,5 +310,22 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
         ownerRepaymentDao.updateStatusById(ownerRepayment);
     }
 
+    @Override
+    public void adjust(Integer id) {
+        OwnerRepayment ownerRepayment = ownerRepaymentDao.getEntityByKey(id).orElseThrow(ResultEnum.DATA_NOT_FIND);
+        if (!ownerRepayment.getStatus().equals(OwnerRePaymentEnum.Status.PAYING.getCode())) {
+            log.info("还款记录状态异常,不是付款中，不能核销");
+            throw new ServiceSystemException(PerformanceResultEnum.OWNER_LOAN_RECORD_ADJUST_STATUS_ERROR);
+        }
+        NbBankOrderResultVO resultVO = bankService.adjust(ownerRepayment.getMerchantRunningWaterNo(),ownerRepayment.getRepaymentBalance().intValue());
+        if(Objects.equals(resultVO.getStatus(),NbBankStatusEnum.Status.SUCCESS.getCode())){
+            ownerRepayment.setStatus(OwnerRePaymentEnum.Status.PAY_SUCCESS.getCode());
+        }else{
+            ownerRepayment.setStatus(OwnerRePaymentEnum.Status.PAY_FAIL.getCode());
+        }
+        // 更新借款信息
+        ownerRepaymentDao.updateStatusById(ownerRepayment);
+    }
+
 
 }

performance-web/src/main/java/com/clx/performance/service/loan/OwnerRepaymentService.java

@@ -40,4 +40,6 @@ public interface OwnerRepaymentService {
     void paySuccess(String merSeqNo);
 
     void payFail(String merSeqNo);
+
+    void adjust(Integer id);
 }