提交全图监控

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/RemoteContractService.java

@@ -102,4 +102,6 @@ public interface RemoteContractService {
      * @return
      */
     List<Long> queryTradeContractInfo(Long contractId);
+
+    TradeContractResDto queryContractByContractId(Long contractId);
 }

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/param/AddLogisticOrderParam.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.api.model.param;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
@@ -9,6 +10,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 
 
@@ -222,4 +224,18 @@ public class AddLogisticOrderParam implements Serializable {
      */
     @NotNull(message = "计费方式不能为空")
     private String billingMode;
+
+    /**
+     * 计划卸货时间
+     */
+    @NotNull(message = "计划卸货时间不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate endTime;
+
+    /**
+     * 计划发货时间
+     */
+    @NotNull(message = "计划发货时间不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate startTime;
 }

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/param/LogisticInfo.java

@@ -74,19 +74,6 @@ public class LogisticInfo implements Serializable {
         private Long priceType;
 
 
-        /**
-         * 计划卸货时间
-         */
-        @NotNull(message = "计划卸货时间不能为空")
-        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-        private LocalDate endTime;
-
-        /**
-         * 计划发货时间
-         */
-        @NotNull(message = "计划发货时间不能为空")
-        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-        private LocalDate startTime;
 
 
         /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -303,6 +303,19 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         return kwcContractTradeService.queryTradeContractInfo(contractId);
     }
 
+    @Override
+    public TradeContractResDto queryContractByContractId(Long contractId) {
+        KwcContractTrade kwcContractTrade = kwcContractTradeMapper.selectById(contractId);
+        if (Objects.nonNull(kwcContractTrade)) {
+            TradeContractResDto tradeContractResDto = BeanUtils.toBean(kwcContractTrade, TradeContractResDto.class);
+            tradeContractResDto.setId(kwcContractTrade.getId());
+            tradeContractResDto.setContactName(kwcContractTrade.getName());
+            tradeContractResDto.setContractNo(kwcContractTrade.getContractNo());
+            return tradeContractResDto;
+        }
+        return new TradeContractResDto();
+    }
+
 
     private ContractCommonInfoResDto fillContractLogistics(KwcContractLogistics kwcContractLogistics) {
         ContractCommonInfoResDto contractCommonInfoResDto = new ContractCommonInfoResDto();

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportServiceImpl.java

@@ -1296,6 +1296,8 @@ public class TransportServiceImpl implements TransportRemoteService {
         addLogisticOrderDTO.setUnloadLat(param.getUnloadLat());
         addLogisticOrderDTO.setUnloadLng(param.getUnloadLng());
         addLogisticOrderDTO.setBillingMode(param.getBillingMode());
+        addLogisticOrderDTO.setStartTime(param.getStartTime());
+        addLogisticOrderDTO.setEndTime(param.getEndTime());
         return addLogisticOrderDTO;
     }
 
@@ -1311,8 +1313,6 @@ public class TransportServiceImpl implements TransportRemoteService {
         info.setAcceptCompany(logistic.getAcceptCompany());
         info.setPrice(logistic.getPrice());
         info.setPriceType(logistic.getPriceType());
-        info.setEndTime(logistic.getEndTime());
-        info.setStartTime(logistic.getStartTime());
 //        info.setUnloadId(logistic.getUnloadId());
 //        info.setUnloadName(logistic.getUnloadName());
 //        info.setUnloadCityCode(logistic.getUnloadCityCode());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/AddLogisticOrderDTO.java

@@ -1,11 +1,13 @@
 package com.sckw.transport.model.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.*;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 
 
@@ -220,4 +222,18 @@ public class AddLogisticOrderDTO implements Serializable {
      * 计费方式
      */
     private String billingMode;
+
+    /**
+     * 计划卸货时间
+     */
+    @NotNull(message = "计划卸货时间不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate endTime;
+
+    /**
+     * 计划发货时间
+     */
+    @NotNull(message = "计划发货时间不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate startTime;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/LogisticData.java

@@ -77,20 +77,6 @@ public  class LogisticData implements Serializable {
         private Long priceType;
 
 
-        /**
-         * 计划卸货时间
-         */
-        @NotNull(message = "计划卸货时间不能为空")
-        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-        private LocalDate endTime;
-
-        /**
-         * 计划发货时间
-         */
-        @NotNull(message = "计划发货时间不能为空")
-        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-        private LocalDate startTime;
-
 
         /**
          * 总量

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtAcceptCarriageOrderService.java

@@ -3453,10 +3453,10 @@ public class KwtAcceptCarriageOrderService {
         kwtLogisticsOrder.setLossUnit(x.getLossUnit());
         kwtLogisticsOrder.setGoodsPrice(orderDTO.getGoodsPrice());
         kwtLogisticsOrder.setGoodsPriceUnit(orderDTO.getGoodsPriceUnit());
-        kwtLogisticsOrder.setStartTime(Objects.isNull(x.getStartTime()) ?
-                null : DateUtil.localDateToLocalDateTimeStart(x.getStartTime()));
-        kwtLogisticsOrder.setEndTime(Objects.isNull(x.getEndTime()) ?
-                null : DateUtil.localDateToLocalDateTimeStart(x.getEndTime()));
+        kwtLogisticsOrder.setStartTime(Objects.isNull(orderDTO.getStartTime()) ?
+                null : DateUtil.localDateToLocalDateTimeStart(orderDTO.getStartTime()));
+        kwtLogisticsOrder.setEndTime(Objects.isNull(orderDTO.getEndTime()) ?
+                null : DateUtil.localDateToLocalDateTimeStart(orderDTO.getEndTime()));
         BigDecimal decimal = BigDecimal.ZERO ;
         kwtLogisticsOrder.setSubcontractAmount(decimal);
         kwtLogisticsOrder.setEntrustAmount(decimal);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -17,6 +17,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.contract.api.model.dto.res.ContractCommonInfoResDto;
+import com.sckw.contract.api.model.vo.TradeContractResDto;
 import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.common.enums.enums.ErrorCodeEnum;
@@ -2516,6 +2517,7 @@ public class KwtLogisticsConsignmentService {
         }
         //根据物流订单号查询物流合同
         KwtLogisticsOrderContract orderContract = logisticsOrderContractRepository.queryByLogOrderId(logisticsOrder.getId());
+        TradeContractResDto tradeContractResDto = contractService.queryContractByContractId(orderContract.getContractId());
         //根据订单号查询物流公司信息
         List<KwtLogisticsOrderUnit> unitList = logisticsOrderUnitRepository.queryByLOrderId(logisticsOrder.getId());
         Map<String, KwtLogisticsOrderUnit> logOrderIdUnitTypeKeyAndUnitMap = Maps.newHashMap();
@@ -2544,17 +2546,17 @@ public class KwtLogisticsConsignmentService {
         List<KwtWaybillOrderSubtask> waybillOrderSubtasks = waybillOrderSubtaskRepository.queryByLogId(logisticsOrder.getId());
 
         //获取返回信息
-        return getLogisticsOrderDetailResp(orderContract, logOrderIdUnitTypeKeyAndUnitMap, logisticsOrder, kwpGoods,
+        return getLogisticsOrderDetailResp(orderContract,tradeContractResDto, logOrderIdUnitTypeKeyAndUnitMap, logisticsOrder, kwpGoods,
                 logOrderIdAndUnitTypeKeyAndAddressMap, waybillOrderSubtasks);
 
     }
 
     @NotNull
-    private static LogisticsOrderDetailResp getLogisticsOrderDetailResp(KwtLogisticsOrderContract orderContract, Map<String, KwtLogisticsOrderUnit> logOrderIdUnitTypeKeyAndUnitMap, KwtLogisticsOrder logisticsOrder,
+    private static LogisticsOrderDetailResp getLogisticsOrderDetailResp(KwtLogisticsOrderContract orderContract,TradeContractResDto tradeContractResDto, Map<String, KwtLogisticsOrderUnit> logOrderIdUnitTypeKeyAndUnitMap, KwtLogisticsOrder logisticsOrder,
                                                                         KwpGoods kwpGoods, Map<String, KwtLogisticsOrderAddress> logOrderIdAndUnitTypeKeyAndAddressMap, List<KwtWaybillOrderSubtask> waybillOrderSubtasks) {
         LogisticsOrderDetailResp logisticsOrderDetailResp = new LogisticsOrderDetailResp();
         //设置合同信息
-        setContractInfo(orderContract, logisticsOrderDetailResp);
+        setContractInfo(orderContract, tradeContractResDto,logisticsOrderDetailResp);
         //设置单位信息
         setUnitInfo(logOrderIdUnitTypeKeyAndUnitMap, logisticsOrder, logisticsOrderDetailResp);
 
@@ -2587,7 +2589,7 @@ public class KwtLogisticsConsignmentService {
         performanceInfoVO.setBillingMode(logisticsOrder.getBillingMode());
         performanceInfoVO.setBillingModeDesc(DictEnum.getLabel(DictTypeEnum.CHARGING_TYPE.getType(),
                 logisticsOrder.getBillingMode()));
-        performanceInfoVO.setCompletedCarNum(String.valueOf(logisticsOrder.getTotalTake()));
+        performanceInfoVO.setCompletedCarNum(Objects.isNull(logisticsOrder.getTotalTake()) ? "0" : String.valueOf(logisticsOrder.getTotalTake()));
         performanceInfoVO.setOrderAmount(String.valueOf(waybillOrderSubtasks.size()));
         BigDecimal loadAmount = BigDecimal.ZERO;
         BigDecimal unloadAmount = BigDecimal.ZERO;
@@ -2672,11 +2674,11 @@ public class KwtLogisticsConsignmentService {
         logisticsOrderDetailResp.setUnitInfoVO(unitInfoVO);
     }
 
-    private static void setContractInfo(KwtLogisticsOrderContract orderContract, LogisticsOrderDetailResp logisticsOrderDetailResp) {
+    private static void setContractInfo(KwtLogisticsOrderContract orderContract,TradeContractResDto tradeContractResDto, LogisticsOrderDetailResp logisticsOrderDetailResp) {
         LogisticsOrderDetailResp.ContractInfoVO contractInfoVO = new LogisticsOrderDetailResp.ContractInfoVO();
-        if (Objects.nonNull(orderContract)){
-            contractInfoVO.setContractNo(orderContract.getContractNo());
-            contractInfoVO.setContractName(orderContract.getContractName());
+        if (Objects.nonNull(tradeContractResDto)){
+            contractInfoVO.setContractNo(tradeContractResDto.getContractNo());
+            contractInfoVO.setContractName(tradeContractResDto.getContactName());
         }
         logisticsOrderDetailResp.setContractInfoVO(contractInfoVO);
     }