Merge branch 'dev_20251130' of https://git.sckaiwu.cn/kaiwu-rep/sckw-service-platform into dev_20251130

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -80,7 +80,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -2187,15 +2186,12 @@ public class KwoTradeOrderService {
                 logisticInfo.setAcceptCompany("");
                 logisticInfo.setPrice(d.getTransportPrice());
                 logisticInfo.setPriceType(0L);
-                logisticInfo.setEndTime(LocalDate.now());
-                logisticInfo.setStartTime(LocalDate.now());
                 logisticInfo.setAmount(new BigDecimal("0"));
                 logisticInfo.setAmountUnit("");
                 logisticInfo.setLoss(new BigDecimal("0"));
                 logisticInfo.setPayment(0L);
                 logisticInfo.setSigningWay(0);
                 logisticInfo.setLossUnit("");
-                logisticInfo.setBillingMode("");
                 logisticInfo.setRemark("");
                 logisticInfo.setType(0);
 
@@ -2218,15 +2214,12 @@ public class KwoTradeOrderService {
                     logisticInfo.setAcceptCompany(d.getFirmName());
                     logisticInfo.setPrice(d.getTransportPrice());
                     logisticInfo.setPriceType(0L);
-                    logisticInfo.setEndTime(LocalDate.now());
-                    logisticInfo.setStartTime(LocalDate.now());
                     logisticInfo.setAmount(new BigDecimal("0"));
                     logisticInfo.setAmountUnit("");
                     logisticInfo.setLoss(new BigDecimal("0"));
                     logisticInfo.setPayment(0L);
                     logisticInfo.setSigningWay(0);
                     logisticInfo.setLossUnit("");
-                    logisticInfo.setBillingMode("");
                     logisticInfo.setRemark("");
                     logisticInfo.setType(0);
 
@@ -2238,6 +2231,9 @@ public class KwoTradeOrderService {
         }
         addLogisticOrderParam.setTradeOrderId(kwoTradeOrder.getId());
         addLogisticOrderParam.setTradeOrderNo(kwoTradeOrder.getTOrderNo());
+        addLogisticOrderParam.setBillingMode(String.valueOf(kwoTradeOrder.getChargeType()));
+        addLogisticOrderParam.setStartTime(DateUtils.dateToLocalDate(kwoTradeOrder.getStartTime()));
+        addLogisticOrderParam.setEndTime(DateUtils.dateToLocalDate(kwoTradeOrder.getEndTime()));
         if (Objects.equals(tradeContractResDto.getConsignment(), 1)) {//买方托运
             KwoTradeOrderUnit kwoTradeOrderUnit = unitMap.get("1");//买方
             if (Objects.nonNull(kwoTradeOrderUnit)) {
@@ -2293,7 +2289,7 @@ public class KwoTradeOrderService {
             addLogisticOrderParam.setLoadLng(kwoTradeOrderAddress.getLng());
         }
 
-        List<KwoTradeOrderAddress> kwoTradeOrderAddresses2 = addressMap.get(String.valueOf(AddressTypeEnum.SHIPMENT.getCode()));
+        List<KwoTradeOrderAddress> kwoTradeOrderAddresses2 = addressMap.get(String.valueOf(AddressTypeEnum.TAKE.getCode()));
         KwoTradeOrderAddress unloadAddress = kwoTradeOrderAddresses2.get(0);
         if (Objects.nonNull(unloadAddress)) {
             addLogisticOrderParam.setUnloadId(unloadAddress.getId());