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/component/OrderChildLoanComponent.java

@@ -135,6 +135,7 @@ public class OrderChildLoanComponent {
             } else {
                 orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(50)).multiply(new BigDecimal(size));
             }
+            log.info("5.1 查询未结算运单, 运单数量{},订单号{}", size, orderGoods.getOrderNo());
             BigDecimal ans = subtract.subtract(orderChildSum);
             log.info("6.当前订单冻结的预付运费还有剩余, 查询查询未结算的运单（没有产生扣除流水的运单）总计{},订单冻结预付运费剩余{}", orderChildSum, subtract);
 

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/dao/impl/loan/OrderChildLoanRetryRecordDaoImpl.java

@@ -17,7 +17,7 @@ import java.util.List;
 public class OrderChildLoanRetryRecordDaoImpl extends BaseDaoImpl<OrderChildLoanRetryRecordMapper, OrderChildLoanRetryRecord, Integer> implements OrderChildLoanRetryRecordDao {
 
     @Override
-    public List<OrderChildLoanRetryRecord> selectListByIdAsc() {
-        return baseMapper.selectList(lQrWrapper().orderByAsc(OrderChildLoanRetryRecord::getId));
+    public List<OrderChildLoanRetryRecord> selectListByOwnerUserNoAndIdAsc(Long userNo) {
+        return baseMapper.selectList(lQrWrapper().eq(OrderChildLoanRetryRecord::getOwnerUserNo, userNo).orderByAsc(OrderChildLoanRetryRecord::getId));
     }
 }

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

@@ -13,5 +13,5 @@ import java.util.List;
  */
 public interface OrderChildLoanRetryRecordDao extends BaseDao<OrderChildLoanRetryRecordMapper, OrderChildLoanRetryRecord, Integer> {
 
-    List<OrderChildLoanRetryRecord> selectListByIdAsc();
+    List<OrderChildLoanRetryRecord> selectListByOwnerUserNoAndIdAsc(Long userNo);
 }

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

@@ -31,6 +31,7 @@ public class EventListenerComponent {
 
     @EventListener(classes = {SettlementUpdateEvent.class})
     public void listen(SettlementUpdateEvent event) {
+        log.info("SettlementUpdateEvent事件执行");
         SettlementOwnerDetail settlementOwnerDetail = event.getSettlementOwnerDetail();
         SettlementDriverDetail settlementDriverDetail = event.getSettlementDriverDetail();
         log.info("当前货主结算信息{},车主结算信息：{}", JSONUtil.parse(settlementOwnerDetail), JSONUtil.parse(settlementDriverDetail));
@@ -46,6 +47,7 @@ public class EventListenerComponent {
 
     @EventListener(classes = {OwnerRepaymentUpdateEvent.class})
     public void listen(OwnerRepaymentUpdateEvent event) {
+        log.info("OwnerRepaymentUpdateEvent事件执行");
         OwnerRepayment update = new OwnerRepayment();
         update.setId(event.getId());
         update.setBeOverdue(OwnerRePaymentEnum.BeOverdue.YES.getCode());

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

@@ -49,12 +49,14 @@ public class OwnerLoanListener {
             //生成借款标识
             orderChildLoanComponent.childLoanConfirmAfterProcess(settlementDriverDetail, settlementOwnerDetail, orderChild);
         } catch (Exception e) {
-            log.error("处理货主借款监听器执行异常,数据为{}", message, e);
             //未借款
             settlementDriverDetail.setLoanFlag(OwnerLoanRecordEnum.LoanFlag.NO_LOAN.getCode());
             applicationEventPublisher.publishEvent(new SettlementUpdateEvent(this, settlementDriverDetail, settlementOwnerDetail));
+            log.error("处理货主借款监听器执行异常,数据为{}", message, e);
+
             return;
         }
+        log.info("处理货主借款监听器执行成功");
         settlementOwnerDetailDao.updateInvoiceType(settlementOwnerDetail);
         settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail);
 

performance-web/src/main/java/com/clx/performance/model/loan/OrderChildLoanRetryRecord.java

@@ -27,6 +27,10 @@ public class OrderChildLoanRetryRecord implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @TableField("owner_user_no")
+    @ApiModelProperty("货主编号")
+    private Long ownerUserNo;
+
     @TableField("settlement_driver_id")
     @ApiModelProperty("车主计费主键")
     private Integer settlementDriverId;

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

@@ -628,7 +628,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
      */
     @Override
     public void orderChildLoanProcess(Long ownerUserNo) {
-        List<OrderChildLoanRetryRecord> orderChildLoanRetryRecordList = orderChildLoanRetryRecordDao.selectListByIdAsc();
+        List<OrderChildLoanRetryRecord> orderChildLoanRetryRecordList = orderChildLoanRetryRecordDao.selectListByOwnerUserNoAndIdAsc(ownerUserNo);
         for (OrderChildLoanRetryRecord retryRecord : orderChildLoanRetryRecordList) {
             //生成借款标识
             SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getEntityByKey(retryRecord.getSettlementDriverId()).get();

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);
 }