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

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

@@ -11,7 +11,7 @@ import java.util.List;
 public class OrderChildCancelEvent extends ApplicationEvent {
 
 
-    private List<String> childNoList;
+    private String childNo;
 
 
     /**
@@ -24,9 +24,10 @@ public class OrderChildCancelEvent extends ApplicationEvent {
         super(source);
     }
 
-    public OrderChildCancelEvent(Object source, List<String> childNoList) {
+
+    public OrderChildCancelEvent(Object source, String childNo) {
         super(source);
-        this.childNoList = childNoList;
+        this.childNo = childNo;
     }
 
 }

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

@@ -13,10 +13,10 @@ import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dto.dts.DataTransportDTO;
 import com.clx.performance.enums.DtsOperationTypeEnum;
 import com.clx.performance.enums.OrderChildEnum;
+import com.clx.performance.event.OrderChildCancelEvent;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.service.LastTruckService;
-import com.clx.performance.struct.OrderChildStruct;
 import com.clx.user.vo.feign.FeignDriverTruckModelVo;
 import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.result.Result;
@@ -26,7 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
 
 import java.util.Objects;
@@ -40,8 +40,9 @@ public class OrderChildDtsListener  {
     private final OrderFeign orderFeign;
     private final LastTruckService lastTruckService;
 
-    @Autowired
-    private DriverService driverService;
+    private final DriverService driverService;
+
+    private final ApplicationEventPublisher applicationEventPublisher;
 
 
     @RabbitListener(queues = RabbitKeyConstants.CLX_PERFORMANCE_ORDER_CHILD_QUEUE)
@@ -96,6 +97,10 @@ public class OrderChildDtsListener  {
             //如果订单是取消操作，同步给交易平台统一 10000 的code
             if(OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){
                 after.setStatus(com.clx.open.sdk.enums.OrderChildEnum.Status.COMMON_CANCEL.getCode());
+                //运单取消释放借款冻结金额
+                log.info("DTS运单取消释放借款冻结金额");
+                applicationEventPublisher.publishEvent(new OrderChildCancelEvent(this, after.getChildNo()));
+
             }
             after.setLastFlag(ResultStatusEnum.NO.getCode());
             OpenCallBackClient client = new OpenCallBackClient(mslAppConfig.getUrl(),mslAppConfig.getAppId(),mslAppConfig.getSecret());

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

@@ -132,7 +132,7 @@ public class OwnerLoanAccountServiceImpl implements OwnerLoanAccountService {
         ownerRepayment.setStatus(OwnerLoanRecordEnum.Status.PAYING.getCode());
         ownerRepayment.setPayChannel(param.getPayChannel());
         OwnerInfoFeignVO ownerInfo = ownerInfoService.getOwnerInfo(TokenUtil.getLoginUserInfo().getUserNo());
-        ownerRepayment.setPayment(ownerInfo.getName());
+        ownerRepayment.setPayment(ownerBindCardRecord.getAccountBankName());
         ownerRepayment.setPaymentAccount(ownerInfo.getOwnerBankAccount());
 
         ownerRepayment.setOperateBy(TokenUtil.getLoginUserInfo().getUserName());