fix

sckw-modules/sckw-message/src/main/java/com/sckw/message/model/vo/req/SelectMessagesReqVO.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.core.model.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -33,7 +32,7 @@ public class SelectMessagesReqVO extends PageRequest {
     /**
      * 消息状态（0未读，1已读）
      */
-    @NotNull(message = "消息状态不能为空")
+//    @NotNull(message = "消息状态不能为空")
     @Schema(description = "消息状态 （0未读，1已读）", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
     private Integer status;
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/dubbo/TradeOrderInfoServiceImpl.java

@@ -690,7 +690,7 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
     }
 
     private List<BigDecimal> getData(List<String> times, List<TradeSaleVo> data) {
-        Map<String, BigDecimal> map = data.stream().collect(Collectors.toMap(TradeSaleVo::getTimePeriod, TradeSaleVo::getAmount, (a, b) -> a));
+        Map<String, BigDecimal> map = data.stream().collect(Collectors.toMap(TradeSaleVo::getTimePeriod, vo -> vo.getAmount() == null ? BigDecimal.ZERO : vo.getAmount(), (a, b) -> a));
         return times.stream().map(d -> {
             BigDecimal bigDecimal = map.get(d);
             if (Objects.isNull(bigDecimal)) {
@@ -925,6 +925,7 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
             return tradeOrderContractVo;
         }).collect(Collectors.toList());
     }
+
     public List<OrderSaleVo> queryRecentSale(LocalDateTime start, LocalDateTime end) {
         return kwoTradeOrderService.queryRecentSale(start, end);
     }

sckw-modules/sckw-order/src/main/java/com/sckw/order/task/TradeOrderTask.java

@@ -67,7 +67,7 @@ public class TradeOrderTask {
             for (KwoTradeOrder kwoTradeOrder : kwoTradeOrders) {
                 List<KwtLogisticsOrderVO> logisticOrderList = transportRemoteService.getLogisticOrderList(new OrderFinishParam(kwoTradeOrder.getId()));
                 if (logisticOrderList.stream().anyMatch(d -> Objects.equals(d.getStatus(), LogisticsOrderV1Enum.NEARING_COMPLETION.getCode()))) {
-                    return;
+                    continue;
                 }
                 threadPoolExecutor.execute(() -> {
                     try {

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwHomeService.java

@@ -144,10 +144,10 @@ public class KwHomeService {
         Long aLong = tradeOrderInfoService.orderCount();
         Long aLong1 = transportRemoteService.queryCount();
         TodoCountVo todoCountVo = new TodoCountVo();
-        todoCountVo.setTradeContractCount(new ViewUrl(contractCountVo.getTradeContractCount(), ""));
-        todoCountVo.setLogisticsContractCount(new ViewUrl(contractCountVo.getLogisticsContractCount(), ""));
-        todoCountVo.setTradeOrderCount(new ViewUrl(aLong, ""));
-        todoCountVo.setLogisticsOrderCount(new ViewUrl(aLong1, ""));
+        todoCountVo.setTradeContractCount(new ViewUrl(contractCountVo.getTradeContractCount(), "/contractManagement/tradeContract/list"));
+        todoCountVo.setLogisticsContractCount(new ViewUrl(contractCountVo.getLogisticsContractCount(), "/contractManagement/logisticsContract/list"));
+        todoCountVo.setTradeOrderCount(new ViewUrl(aLong, "/orderManagement/tradeOrder/list"));
+        todoCountVo.setLogisticsOrderCount(new ViewUrl(aLong1, "/operatManagement/logisticsWaybill/list"));
         return todoCountVo;
     }
 }