Merge branch 'v1.0_init_contract_20240306' into dev

performance-web/src/main/java/com/clx/performance/listener/breakcontract/BreakContractOwnerRecordDtsListener.java

@@ -4,20 +4,16 @@ import com.alibaba.fastjson.JSON;
 import com.clx.open.sdk.callback.OpenCallBackClient;
 import com.clx.open.sdk.callback.message.BreakContractOwnerRecordMessage;
 import com.clx.order.enums.SyncPlatformEnum;
-import com.clx.order.feign.OrderFeign;
 import com.clx.performance.config.ThirdAppConfig;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dto.dts.DataTransportDTO;
 import com.clx.performance.enums.DtsOperationTypeEnum;
-import com.clx.performance.extranal.user.DriverService;
-import com.clx.performance.service.LastTruckService;
 import com.msl.common.result.Result;
 import com.msl.common.utils.DtsMapConvertUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
 
 import java.util.Objects;
@@ -26,10 +22,7 @@ import java.util.Objects;
 @Component
 @AllArgsConstructor
 public class BreakContractOwnerRecordDtsListener {
-    private final OrderFeign orderFeign;
-    private final LastTruckService lastTruckService;
-    private final DriverService driverService;
-    private final ApplicationEventPublisher applicationEventPublisher;
+
     private final ThirdAppConfig thirdAppConfig;
 
 

performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractOwnerRecord.java

@@ -55,6 +55,10 @@ public class BreakContractOwnerRecord   implements HasKey<Integer> {
     @ApiModelProperty("货主名称")
     private String ownerName;
 
+    @TableField("owner_company_no")
+    @ApiModelProperty("货主用户编号")
+    private Long ownerCompanyNo;
+
     @TableField("figure")
     @ApiModelProperty("违约金（分）")
     private BigDecimal figure;

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractOwnerRecordServiceImpl.java

@@ -83,6 +83,7 @@ public class BreakContractOwnerRecordServiceImpl  implements BreakContractOwnerR
 
         BreakContractOwnerRecord record = new BreakContractOwnerRecord();
         record.setOrderSource(orderInfo.getOrderSource());
+        record.setOwnerCompanyNo(orderInfo.getCompanyNo());
         record.setBreakNo(breakNo);
         record.setTriggerType(BreakContractRecordEnum.TriggerType.MANUAL.getCode());
         if (Objects.equals(param.getBreakContractPartyType(), BreakContractRecordEnum.BreakContractPartyType.OWNER.getCode())) {
@@ -166,6 +167,7 @@ public class BreakContractOwnerRecordServiceImpl  implements BreakContractOwnerR
         BreakContractOwnerRecord record = new BreakContractOwnerRecord();
         record.setBreakNo(breakNo);
         record.setOrderSource(orderInfo.getOrderSource());
+        record.setOwnerCompanyNo(orderInfo.getCompanyNo());
         record.setTriggerType(BreakContractRecordEnum.TriggerType.SYSTEM.getCode());
         record.setBreakContractPartyType(BreakContractRecordEnum.BreakContractPartyType.OWNER.getCode());