Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerServiceImpl.java

@@ -29,10 +29,12 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Slf4j
 @Service
 public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
+    private static final String LONG_TERM_TIME = "2099-01-01 00:00:00";
 
     @Autowired
     private BrokerService brokerService;
@@ -141,7 +143,9 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         driverInfo.setCardNo(driverUserIdCardVO.getCardNo());
         driverInfo.setIdCardAddress(driverUserIdCardVO.getAddress());
         driverInfo.setCardStartTime(driverUserIdCardVO.getCardStartTime());
-        driverInfo.setCardEndTime(driverUserIdCardVO.getCardEndTime());
+        driverInfo.setCardEndTime(Objects.equals(driverUserIdCardVO.getCardLongTerm(), 1)
+                ? LONG_TERM_TIME
+                : driverUserIdCardVO.getCardEndTime());
         driverInfo.setCardLongTerm(driverUserIdCardVO.getCardLongTerm());
         driverInfo.setCardFrontImg(host + driverUserIdCardVO.getCardFaceImg());
         driverInfo.setCardBackImg(host + driverUserIdCardVO.getCardBackImg());
@@ -154,7 +158,9 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         driverInfo.setLicenceImg(host + driverLicenceFeignVO.getLicenceImg());
         driverInfo.setLicenceBackImg(host + driverLicenceFeignVO.getLicenceBackImg());
         driverInfo.setLicenceStartTime(DateUtils.formatDateTime(driverLicenceFeignVO.getLicenceStartTime()).get());
-        driverInfo.setLicenceEndTime(DateUtils.formatDateTime(driverLicenceFeignVO.getLicenceEndTime()).get());
+        driverInfo.setLicenceEndTime(Objects.equals(driverLicenceFeignVO.getLicenceLongTerm(), 1)
+                ? LONG_TERM_TIME
+                : DateUtils.formatDateTime(driverLicenceFeignVO.getLicenceEndTime()).get());
 //        driverInfo.setTransportLicenceImg(truckInfoFeignVo.getTransportLicenceImg());
         driverInfo.setOccupationalLicenceNo(driverLicenceFeignVO.getOccupationalLicenceNo());
         driverInfo.setOccupationalLicenceImg(host + driverLicenceFeignVO.getOccupationalLicenceImg());
@@ -172,7 +178,9 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         ownerInfo.setCardNo(truckOwnerUserIdCardVO.getCardNo());
         ownerInfo.setIdCardAddress(truckOwnerUserIdCardVO.getAddress());
         ownerInfo.setCardStartTime(truckOwnerUserIdCardVO.getCardStartTime());
-        ownerInfo.setCardEndTime(truckOwnerUserIdCardVO.getCardEndTime());
+        ownerInfo.setCardEndTime(Objects.equals(truckOwnerUserIdCardVO.getCardLongTerm(), 1)
+                ? LONG_TERM_TIME
+                : truckOwnerUserIdCardVO.getCardEndTime());
         ownerInfo.setCardLongTerm(truckOwnerUserIdCardVO.getCardLongTerm());
         ownerInfo.setCardFrontImg(host + truckOwnerUserIdCardVO.getCardFaceImg());
         ownerInfo.setCardBackImg(host + truckOwnerUserIdCardVO.getCardBackImg());