Merge remote-tracking branch 'origin/dev' into dev

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/RequestCheckFilter.java

@@ -67,7 +67,7 @@ public class RequestCheckFilter implements Filter {
             EXCLUDEPATH.addAll(Arrays.asList(links.split(Global.COMMA)));
         }
 
-        String importLinks = customConfig.getImportLinks();
+        String importLinks = customConfig.getSpecialLinks();
         if (StringUtils.isNotBlank(importLinks)) {
             IMPORT_PASS_PATH.addAll(Arrays.asList(links.split(Global.COMMA)));
         }

sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/config/CustomConfig.java

@@ -22,8 +22,8 @@ public class CustomConfig {
     /**
      * 直接放行的请求链接
      */
-    @Value("${importLinks}")
-    private String importLinks;
+    @Value("${specialLinks}")
+    private String specialLinks;
 
 //    /**
 //     * 是否允许一个账号绑定多个角色

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

@@ -220,6 +220,7 @@ public class KwtLogisticsConsignmentService {
         }
 
         Long orderId = new IdWorker(NumberConstant.ONE).nextId();
+        order.setId(orderId);
         long contractId = Long.parseLong(bo.getContractId());
         List<Long> contractList = new ArrayList<>();
         contractList.add(contractId);

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

@@ -1,11 +1,10 @@
 package com.sckw.transport.service;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
-import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
@@ -27,7 +26,6 @@ import com.sckw.transport.model.dto.OrderManualCompletionDto;
 import com.sckw.transport.model.param.GoodsUnitParam;
 import com.sckw.transport.model.param.LogisticsConsignmentParam;
 import com.sckw.transport.model.vo.GoodsUnitVo;
-import com.sckw.transport.model.vo.LogisticsCountVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -168,7 +166,7 @@ public class KwtLogisticsOrderGoodsService {
         if (CollectionUtils.isNotEmpty(assistUnit)) {
             assistUnit.forEach(e -> {
                 //车辆运单统计(运输中的物流订单+车辆运单审核通过)
-                Map<String, Object> params = new HashMap<>(NumberConstant.SIXTEEN){{
+                Map<String, Object> params = new HashMap<>(NumberConstant.SIXTEEN) {{
                     put("unit", e.getUnit());
                     put("type", NumberConstant.ONE);
                     put("lOrderId", lOrderId);
@@ -182,10 +180,10 @@ public class KwtLogisticsOrderGoodsService {
                 //更新物流订单商品辅助单位-装卸货量
                 e.setLoadAmount(BigDecimal.valueOf(loadAmount));
                 e.setUnloadAmount(BigDecimal.valueOf(unloadAmount));
-                goodsUnitMapper.update(e,new LambdaUpdateWrapper<KwtLogisticsOrderGoodsUnit>()
-                        .set(KwtLogisticsOrderGoodsUnit::getLoadAmount,BigDecimal.valueOf(loadAmount))
-                        .set(KwtLogisticsOrderGoodsUnit::getUnloadAmount,BigDecimal.valueOf(unloadAmount))
-                        .eq(KwtLogisticsOrderGoodsUnit::getId,e.getId())
+                goodsUnitMapper.update(e, new LambdaUpdateWrapper<KwtLogisticsOrderGoodsUnit>()
+                        .set(KwtLogisticsOrderGoodsUnit::getLoadAmount, BigDecimal.valueOf(loadAmount))
+                        .set(KwtLogisticsOrderGoodsUnit::getUnloadAmount, BigDecimal.valueOf(unloadAmount))
+                        .eq(KwtLogisticsOrderGoodsUnit::getId, e.getId())
                 );
             });
         }
@@ -204,7 +202,7 @@ public class KwtLogisticsOrderGoodsService {
         if (CollectionUtils.isNotEmpty(assistUnit)) {
             assistUnit.forEach(e -> {
                 //下级物流订单-辅助单位
-                KwtLogisticsOrderGoodsUnit unitCount = goodsUnitMapper.findGoodsUnitCount(new HashMap<>(NumberConstant.SIXTEEN){{
+                KwtLogisticsOrderGoodsUnit unitCount = goodsUnitMapper.findGoodsUnitCount(new HashMap<>(NumberConstant.SIXTEEN) {{
                     put("belowlOrderId", lOrderId);
                     put("unit", e.getUnit());
                 }});
@@ -379,12 +377,13 @@ public class KwtLogisticsOrderGoodsService {
         List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findGoodsUnit(new HashMap<>(NumberConstant.SIXTEEN) {{
             put("lOrderId", logisticsOrder.getId());
         }});
+        log.info("assistUnit:{}", JSONObject.toJSONString(assistUnit));
         //住单位
         BigDecimal amount = logisticsOrder.getAmount();
         loadingParams.add(new GoodsLoadingParam(logisticsOrder.getUnit(), operator ? amount : amount.negate(), logisticsOrder.getTotalLoadAmount()));
 
         //数据处理
-        if (CollectionUtils.isNotEmpty(assistUnit)) {
+        if (CollectionUtils.isNotEmpty(assistUnit) && (assistUnit.size() > 0)) {
             assistUnit.forEach(ee -> {
                 BigDecimal loadAmount = ee.getTotalLoadAmount() == null ? new BigDecimal("0.00") : ee.getTotalLoadAmount();
                 BigDecimal conversionValue = ee.getConversionValue();

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

@@ -481,9 +481,12 @@ public class KwtWaybillManagementService {
                     if (statusVO.getCode().equals(kwtWaybillOrderTrack.getStatus())) {
                         statusVO.setStatus(true);
                         statusVO.setId(kwtWaybillOrderTrack.getId());
-                        statusVO.setCreateTime(DateUtil.getDateTime(kwtWaybillOrderTrack.getCreateTime()).substring(0, 15));
+//                        statusVO.setCreateTime(DateUtil.getDateTime(kwtWaybillOrderTrack.getCreateTime()).substring(0, 15));
+//                        statusVO.setOperateTime(kwtWaybillOrderTrack.getOperateTime() == null
+//                                ? null : DateUtil.getDateTime(kwtWaybillOrderTrack.getOperateTime()).substring(0, 15));
                         statusVO.setOperateTime(kwtWaybillOrderTrack.getOperateTime() == null
-                                ? null : DateUtil.getDateTime(kwtWaybillOrderTrack.getOperateTime()).substring(0, 15));
+                                ? null : cn.hutool.core.date.DateUtil.format(kwtWaybillOrderTrack.getOperateTime(),"yyyy-MM-dd HH:mm:ss"));
+                        statusVO.setCreateTime(cn.hutool.core.date.DateUtil.format(kwtWaybillOrderTrack.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
                         statusVO.setCreateByName(usersMap.get(kwtWaybillOrderTrack.getCreateBy()) == null
                                 ? null : usersMap.get(kwtWaybillOrderTrack.getCreateBy()).getName());
                         break;