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

performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java

@@ -378,12 +378,15 @@ public class OrderChildLoanComponent {
                 waterRecord.setFrozenBalance(account.getFundingFrozenBalance().add(account.getVirtuallyFrozenBalance()));
                 waterRecord.setCreateBy("系统");
                 ownerLoanAccountRunningWaterRecordDao.saveEntity(waterRecord);
+
+                ownerLoanRecordService.loanRecordResidueAdd(loanNo, balance);
                 break;
             }
         }
 
     }
 
+
     public void childWriteOffOwnerLoanAccount(List<OwnerLoanAccountRunningWaterRecord> frozenList) {
         log.info("5. 执行核销扣除,相关流水{}", JSONUtil.parse(frozenList));
         while (true) {

performance-web/src/main/java/com/clx/performance/dao/impl/loan/OwnerLoanRecordDaoImpl.java

@@ -12,9 +12,11 @@ import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanRecordOfOwner;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
+import com.msl.common.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
 
@@ -67,7 +69,7 @@ public class OwnerLoanRecordDaoImpl extends BaseDaoImpl<OwnerLoanRecordMapper, O
                 lQrWrapper().in(OwnerLoanRecord::getStatus, OwnerLoanRecordEnum.Status.APPROVE_PASS.getCode(), OwnerLoanRecordEnum.Status.PAY_SUCCESS.getCode())
                         .eq(OwnerLoanRecord::getOwnerUserNo , userNo)
                         .gt(OwnerLoanRecord::getLoanResidueBalance, 0)
-                        .orderByAsc(OwnerLoanRecord::getId)
+                        .orderByAsc(OwnerLoanRecord:: getId)
         );
     }
 
@@ -112,5 +114,11 @@ public class OwnerLoanRecordDaoImpl extends BaseDaoImpl<OwnerLoanRecordMapper, O
         return baseMapper.selectOne(lQrWrapper().eq(OwnerLoanRecord::getLoanNo, loanNo));
     }
 
+    @Override
+    public Integer updateCasLoanRecord(OwnerLoanRecord update) {
+        String nowStr = DateUtils.formatDateTime(LocalDateTime.now()).get();
+        return baseMapper.updateCasLoanRecord(update, nowStr);
+    }
+
 
 }

performance-web/src/main/java/com/clx/performance/dao/loan/OwnerLoanRecordDao.java

@@ -31,4 +31,6 @@ public interface OwnerLoanRecordDao extends BaseDao<OwnerLoanRecordMapper, Owner
     boolean updateStatusById(OwnerLoanRecord item);
 
     OwnerLoanRecord selectOneByLoanNo(Long loanNo);
+
+    Integer updateCasLoanRecord(OwnerLoanRecord update);
 }

performance-web/src/main/java/com/clx/performance/event/EventListenerComponent.java

@@ -180,8 +180,7 @@ public class EventListenerComponent {
 
     }
 
-    @Async
-    @TransactionalEventListener(classes = {OwnerLoanThawEvent.class},phase = TransactionPhase.BEFORE_COMMIT,fallbackExecution = true)
+    @EventListener(classes = {OwnerLoanThawEvent.class})
     public void listen(OwnerLoanThawEvent event) {
         log.info("OwnerLoanThawEvent事件执行");
         log.info("需要解冻借款的的运单号:{}", event.getChildNo());

performance-web/src/main/java/com/clx/performance/mapper/loan/OwnerLoanRecordMapper.java

@@ -9,6 +9,7 @@ import com.clx.performance.sqlProvider.loan.OwnerLoanRecordSqlProvider;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * @author kavin
@@ -23,4 +24,10 @@ public interface OwnerLoanRecordMapper extends BaseMapper<OwnerLoanRecord> {
     @SelectProvider(type = OwnerLoanRecordSqlProvider.class, method = "pageByParam")
     IPage<OwnerLoanRecordVO> pageByParam(@Param("page") Page<OwnerLoanRecordVO> page, @Param("param") PageOwnerLoanRecordOfOwner param);
 
+
+    @Update("update owner_loan_record set loan_residue_balance = loan_residue_balance + #{loanResidueBalance}" +
+           ",modified_time=#{now}"
+            + "where id = #{account.id} and modified_time = #{account.modifiedTime}"
+    )
+    Integer updateCasLoanRecord(@Param("account") OwnerLoanRecord update, @Param("now") String nowStr);
 }

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

@@ -701,6 +701,21 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         }
     }
 
+    @Override
+    public void loanRecordResidueAdd(Long loanNo, BigDecimal balance) {
+        while (true) {
+            log.info("执行借款单余额增加,借款单号{},金额：{}", loanNo, balance);
+            OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getOneByField(OwnerLoanRecord::getLoanNo, loanNo).get();
+            OwnerLoanRecord update = new OwnerLoanRecord();
+            update.setId(ownerLoanRecord.getId());
+            update.setLoanResidueBalance(balance);
+            Integer flag = ownerLoanRecordDao.updateCasLoanRecord(update);
+            if (flag > 0) {
+                break;
+            }
+        }
+    }
+
     @Override
     public void ownerLoanRecordRetryPay(String loanNo) {
         OwnerLoanRecord ownerLoanRecord = ownerLoanRecordDao.getOneByField(OwnerLoanRecord::getLoanNo, loanNo)

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

@@ -11,6 +11,7 @@ import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
 import com.clx.performance.vo.pc.loan.carrier.CarrierOwnerOrderPaymentDetailVO;
 import com.clx.performance.vo.pc.loan.owner.OwnerLoanRecordDetail;
 
+import java.math.BigDecimal;
 
 
 /**
@@ -57,4 +58,6 @@ public interface OwnerLoanRecordService {
     Integer ownerLoanRecordSubmitNbBank(CarrierOwnerLoanRecordApproveParam param);
 
     void orderChildLoanProcess(Long ownerUserNo);
+
+    void loanRecordResidueAdd(Long loanNo, BigDecimal balance);
 }