托运订单列表bugfix

承运订单列表bugfix
承运订单-页面自建订单

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/LogisticsOrderEnum.java

@@ -102,6 +102,10 @@ public enum LogisticsOrderEnum {
         return codeList;
     }
 
+    /**
+     * 获取所有的状态
+     * @return
+     */
     public static List<String> getCodeStringList() {
         List<String> codeList = new ArrayList<>(NumberConstant.SIXTEEN);
         for (LogisticsOrderEnum value : LogisticsOrderEnum.values()) {

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

@@ -1,5 +1,6 @@
 package com.sckw.report.service;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.StringConstant;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
@@ -262,6 +263,15 @@ public class KwAcceptCarriageService {
                 arrayList.add(top);
             }
         }
+        if (CollectionUtils.isNotEmpty(arrayList)){
+            /**补全统计【全部字段】*/
+            Integer sum = Math.toIntExact(arrayList.stream().filter(item -> ObjectUtil.isNotEmpty(item.getTotal())).collect(Collectors.summarizingInt(item -> item.getTotal())).getSum());
+            TableTops top = new TableTops();
+            top.setName("全部");
+            top.setValue("all");
+            top.setTotal(sum);
+            arrayList.add(top);
+        }
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.sckw.report.service;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.StringConstant;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
@@ -388,6 +389,15 @@ public class KwConsignService {
                 arrayList.add(top);
             }
         }
+        if (CollectionUtils.isNotEmpty(arrayList)){
+            /**补全统计【全部字段】*/
+            Integer sum = Math.toIntExact(arrayList.stream().filter(item -> ObjectUtil.isNotEmpty(item.getTotal())).collect(Collectors.summarizingInt(item -> item.getTotal())).getSum());
+            TableTops top = new TableTops();
+            top.setName("全部");
+            top.setValue("all");
+            top.setTotal(sum);
+            arrayList.add(top);
+        }
     }
 
 }

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

@@ -64,8 +64,8 @@ public class KwTransportService {
     RemoteSystemService remoteSystemService;
 
     /**
-     * @param sourceList 源数据  [1,2,3]
-     * @param targetList 目标数据 [1]
+     * @param sourceList 源数据  [1]
+     * @param targetList 目标数据 [1,2,3]
      * @Description: 获取targetList中在sourceList中不存在的项
      * @return: List<String>    [2,3]
      */

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

@@ -132,13 +132,13 @@ public class AcceptCarriageOrderService {
         }
         //todo  校验当前登录角色是否具有4P物流角色
         EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(LoginUserHolder.getEntId());
-//        if (entCacheResDto == null) {
-//            log.info("承运订单-分包托运 用户id:{}", LoginUserHolder.getUserId());
-//            throw new RuntimeException("企业信息查询异常");
-//        }
-//        if (!entCacheResDto.getEntTypes().contains(String.valueOf(NumberConstant.THREE))) {
-//            throw new RuntimeException("当前用户企业不具有分包功能权限！");
-//        }
+        if (entCacheResDto == null) {
+            log.info("承运订单-分包托运 用户id:{}", LoginUserHolder.getUserId());
+            throw new RuntimeException("企业信息查询异常");
+        }
+        if (!entCacheResDto.getEntTypes().contains(String.valueOf(NumberConstant.THREE))) {
+            throw new RuntimeException("当前用户企业不具有分包功能权限！");
+        }
         KwtLogisticsOrder order = new KwtLogisticsOrder();
         if (!bo.getIsFullDose()) {
             Long amount = bo.getAmount();
@@ -387,6 +387,12 @@ public class AcceptCarriageOrderService {
             loadOrderAddress.setCreateBy(LoginUserHolder.getUserId());
             loadOrderAddress.setUpdateBy(LoginUserHolder.getUserId());
             loadOrderAddress.setUpdateTime(new Date());
+            loadOrderAddress.setName(orderLoadAddress.getName());
+            loadOrderAddress.setType(orderLoadAddress.getType());
+            loadOrderAddress.setCityCode(orderLoadAddress.getCityCode());
+            loadOrderAddress.setLng(orderLoadAddress.getLng());
+            loadOrderAddress.setRemark(orderLoadAddress.getRemark());
+            loadOrderAddress.setStatus(orderLoadAddress.getStatus());
             logisticsOrderAddressMapper.insert(loadOrderAddress);
         }
         if (!ObjectUtils.isEmpty(orderUnLoadAddress)) {
@@ -405,6 +411,12 @@ public class AcceptCarriageOrderService {
             unloadOrderAddress.setCreateBy(LoginUserHolder.getUserId());
             unloadOrderAddress.setUpdateBy(LoginUserHolder.getUserId());
             unloadOrderAddress.setUpdateTime(new Date());
+            unloadOrderAddress.setName(orderUnLoadAddress.getName());
+            unloadOrderAddress.setType(orderUnLoadAddress.getType());
+            unloadOrderAddress.setCityCode(orderUnLoadAddress.getCityCode());
+            unloadOrderAddress.setLng(orderUnLoadAddress.getLng());
+            unloadOrderAddress.setRemark(orderUnLoadAddress.getRemark());
+            unloadOrderAddress.setStatus(orderUnLoadAddress.getStatus());
             logisticsOrderAddressMapper.insert(unloadOrderAddress);
         }
     }

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

@@ -506,11 +506,16 @@ public class LogisticsConsignmentService {
                     loadOrderAddress.setCreateBy(LoginUserHolder.getUserId());
                     loadOrderAddress.setUpdateBy(LoginUserHolder.getUserId());
                     loadOrderAddress.setUpdateTime(new Date());
+                    loadOrderAddress.setName(detail.getName());
+                    loadOrderAddress.setType(Long.parseLong(detail.getType()));
+                    loadOrderAddress.setCityCode(detail.getCityCode());
+                    loadOrderAddress.setLng(detail.getLng());
+//                    loadOrderAddress.setRemark(detail.getRemark());
+//                    loadOrderAddress.setStatus(detail.getStatus());
                 }
                 if (String.valueOf(NumberConstant.TWO).equals(detail.getAddressType())) {
-                    unloadOrderAddress.setId(new IdWorker(NumberConstant.ONE).nextId());
+                    unloadOrderAddress.setId(new IdWorker(NumberConstant.TWO).nextId());
                     unloadOrderAddress.setAddressType(NumberConstant.TWO);
-                    unloadOrderAddress.setId(new IdWorker(NumberConstant.ONE).nextId());
                     unloadOrderAddress.setContacts(detail.getContacts());
                     unloadOrderAddress.setLOrderId(orderId);
                     unloadOrderAddress.setLat(detail.getLat());
@@ -523,6 +528,12 @@ public class LogisticsConsignmentService {
                     unloadOrderAddress.setCreateBy(LoginUserHolder.getUserId());
                     unloadOrderAddress.setUpdateBy(LoginUserHolder.getUserId());
                     unloadOrderAddress.setUpdateTime(new Date());
+                    unloadOrderAddress.setName(detail.getName());
+                    unloadOrderAddress.setType(Long.valueOf(detail.getType()));
+                    unloadOrderAddress.setCityCode(detail.getCityCode());
+                    unloadOrderAddress.setLng(detail.getLng());
+//                    unloadOrderAddress.setRemark(detail.getRemark());
+//                    unloadOrderAddress.setStatus(detail.getStatus());
                 }
             }
         }

sckw-modules/sckw-transport/src/main/resources/bootstrap-dev.yml

@@ -14,7 +14,7 @@ spring:
         # 配置文件格式
         file-extension: yaml
         # 命名空间
-        namespace: sckw_jc
+        namespace: sckw-service-platform-dev
         # 共享配置
         group: sckw-service-platform
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组

sckw-modules/sckw-transport/src/main/resources/bootstrap.yml

@@ -6,6 +6,7 @@ spring:
     name: sckw-transport
   profiles:
     active: ${DEPLOY_MODE:dev}
+#    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderAddressMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sckw.transport.dao.KwtWaybillOrderAddressMapper">
-    <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtWaybillOrder">
+    <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtWaybillOrderAddress">
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="w_order_id" jdbcType="BIGINT" property="wOrderId"/>
-        <result column="address_type" jdbcType="VARCHAR" property="AddressType"/>
+        <result column="address_type" jdbcType="VARCHAR" property="addressType"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="type" jdbcType="BIGINT" property="type"/>
         <result column="contacts" jdbcType="VARCHAR" property="contacts"/>