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

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

@@ -45,6 +45,14 @@ public enum OwnerAccountEnum {
         private final Integer code;
         private final String msg;
 
+        public static Optional<OwnerAccountEnum.TopUpStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(OwnerAccountEnum.TopUpStatus::getMsg).orElse(null);
+        }
+
     }
 
     @Getter

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/OwnerLoanAccountApproveVO.java

@@ -43,6 +43,14 @@ public class OwnerLoanAccountApproveVO {
     @ApiModelProperty("待审批 10，审批成功 20，审批拒绝 30")
     private Integer status;
 
+
+    @ApiModelProperty("待审批 审批成功 审批拒绝 ")
+    private String statusMsg;
+
+    public String getStatusMsg(){
+        return OwnerAccountEnum.TopUpStatus.getMsgByCode(status);
+    }
+
     
     @ApiModelProperty("审批时间")
     private String approveTime;

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

@@ -41,6 +41,9 @@ import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
@@ -75,6 +78,8 @@ public class OrderChildLoanComponent {
 
     private final ApplicationEventPublisher applicationEventPublisher;
 
+
+
     /**
      * 接单校验判断
      *
@@ -177,8 +182,8 @@ public class OrderChildLoanComponent {
      * @param settlementDriverDetail
      * @param settlementOwnerDetail
      */
-    @Transactional(rollbackFor = Exception.class)
     public void childLoanConfirmAfterProcess(SettlementDriverDetail settlementDriverDetail, SettlementOwnerDetail settlementOwnerDetail, OrderChild orderChild) {
+
         log.info("1.运单确认收货后借款相关处理执行");
         //临时结算金额,借款抵扣后需要重新赋值结算金额为0,如果不需要借款相关逻辑,正常设置结算金额
         settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));

performance-web/src/main/java/com/clx/performance/listener/OwnerLoanListener.java

@@ -17,6 +17,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
 
 /**
  * 处理货主借款监听器
@@ -36,9 +39,14 @@ public class OwnerLoanListener {
 
     private final SettlementDriverDetailDao settlementDriverDetailDao;
 
+    private final PlatformTransactionManager platformTransactionManager;
+
+    private final TransactionDefinition transactionDefinition;
 
     @RabbitListener(queues = RabbitKeyConstants.OWNER_LOAN_QUEUE)
     public void onMessage(String message) {
+        TransactionStatus transactionStatus = platformTransactionManager.getTransaction(transactionDefinition);
+
         log.info("处理货主借款监听器执行,数据为{}", message);
         OwnerLoanMqDTO param = JSONUtil.toBean(message, OwnerLoanMqDTO.class);
         SettlementOwnerDetail settlementOwnerDetail = param.getSettlementOwnerDetail();
@@ -53,6 +61,7 @@ public class OwnerLoanListener {
             settlementDriverDetail.setLoanFlag(OwnerLoanRecordEnum.LoanFlag.NO_LOAN.getCode());
             applicationEventPublisher.publishEvent(new SettlementUpdateEvent(this, settlementDriverDetail, settlementOwnerDetail));
             log.error("处理货主借款监听器执行异常,数据为{}", message, e);
+            platformTransactionManager.commit(transactionStatus);
 
             return;
         }
@@ -62,5 +71,7 @@ public class OwnerLoanListener {
 
         // 发送mq 通过开票标识
         settlementMqService.invoiceTypeSync(settlementDriverDetail.getChildNo(), settlementDriverDetail.getInvoiceType());
+        platformTransactionManager.commit(transactionStatus);
+
     }
 }

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

@@ -66,6 +66,14 @@ public class OwnerLoanAccountApproveServiceImpl  implements OwnerLoanAccountAppr
     @Override
     public void openOwnerLoanAccountApprove() {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        PageOwnerLoanAccountApproveParam param = new PageOwnerLoanAccountApproveParam();
+        param.setOwnerUserNo(String.valueOf(loginUserInfo.getUserNo()));
+        param.setStatus(OwnerLoanAccountApproveEnum.Status.APPROVE_WAIT.getCode());
+        IPage<OwnerLoanAccountApprove> page = ownerLoanAccountApproveDao.pageOwnerLoanAccountApprove(param);
+        if(page.getTotal() > 0){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"您已经申请过借款用户，请勿重复申请");
+        }
+
         Optional<OwnerLoanAccount> optional = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo,
                 loginUserInfo.getUserNo());
         if(optional.isPresent()){