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

sckw-auth/src/main/java/com/sckw/auth/controller/AuthController.java

@@ -130,17 +130,4 @@ public class AuthController {
         return HttpResult.ok(authService.getLoginResByToken(clientType, token));
     }
 
-
-    /**
-     * @param id 主键ID
-     * @description 重置密码
-     * @author zk
-     * @date 2023/06/02
-     **/
-    @PostMapping("/resetPassword")
-    public HttpResult resetPassword(@RequestParam Long id) {
-        authService.resetPassword(id);
-        return HttpResult.ok(HttpStatus.MSG_001);
-    }
-
 }

sckw-auth/src/main/java/com/sckw/auth/service/IAuthService.java

@@ -11,37 +11,6 @@ import com.sckw.core.web.response.HttpResult;
  */
 public interface IAuthService {
 
-    /**
-     * 登录
-     * @param reqVo
-     * @return
-     */
-    LoginResVo login(LoginReqVo reqVo) throws SystemException;
-
-    /**
-     * @param reqVo 注册入参
-     * @desc: 用户注册
-     * @author: czh
-     * @date: 2023/6/16
-     */
-    void register(RegisterReqVo reqVo);
-
-    /**
-     * @param reqDto 忘记密码入参
-     * @desc: 忘记密码
-     * @author: czh
-     * @date: 2023/6/19
-     */
-    void forgetPassword(ForgetPasswordReqVo reqDto);
-
-    /**
-     * @param id 用户id
-     * @desc: 重置密码
-     * @author: czh
-     * @date: 2023/7/3
-     */
-    void resetPassword(Long id);
-
     /**
      * 司机端登录
      * @param loginBase

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -1,6 +1,5 @@
 package com.sckw.auth.service.impl;
 
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.sckw.auth.model.vo.req.*;
 import com.sckw.auth.model.vo.res.DeptInfoResVo;
@@ -23,7 +22,6 @@ import com.sckw.fleet.api.model.vo.RDriverDetailVo;
 import com.sckw.redis.constant.RedisConstant;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.req.*;
-import com.sckw.system.api.model.dto.res.KwsRoleResDto;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.web.constant.HttpStatus;
@@ -34,7 +32,6 @@ import com.sckw.system.api.RemoteUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -56,149 +53,6 @@ public class AuthServiceImpl implements IAuthService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteFleetService fleetService;
 
-    @Override
-    public LoginResVo login(LoginReqVo reqDto) {
-//        /*1、根据账号密码或者手机号校验码登录, 手机号后面处理*/
-//        KwsUserResDto kwsUser = checkLogin(reqDto);
-//        LoginResVo loginResVo = new LoginResVo();
-//        loginResVo.setClientType(reqDto.getClientType());
-//        BeanUtils.copyProperties(kwsUser, loginResVo);
-//
-//        //平台管理员直接过了
-//        if (kwsUser.getIsMain() == Global.YES && kwsUser.getSystemType().equals(SystemTypeEnum.MANAGE.getCode())) {
-//            afterProcessor(loginResVo);
-//            return loginResVo;
-//        }
-//        /*2、登录成功，查询角色信息*/
-//        Long userId = kwsUser.getId();
-//        List<KwsRoleResDto> kwsRoleResDtos = remoteUserService.queryRoleInfoByUserId(userId);
-//        loginResVo.setRoleInfo(kwsRoleResDtos);
-//
-//
-//        /*3、查询用户机构*/
-//        List<KwsUserDeptResDto> kwsUserDeptResDtos = remoteUserService.queryUserDeptByUserId(userId);
-//        if (CollectionUtils.isEmpty(kwsUserDeptResDtos)) {
-//            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.USER_DEPT_NOT_EXISTS);
-//        }
-//
-//        List<Long> deptIds = kwsUserDeptResDtos.stream().map(KwsUserDeptResDto::getDeptId).toList();
-//        List<KwsDeptResDto> kwsDepts = remoteUserService.queryDeptByIds(deptIds);
-//        if (CollectionUtils.isEmpty(kwsDepts)) {
-//            //数据不全，直接返回
-//            afterProcessor(loginResVo);
-//            return loginResVo;
-//        }
-//
-//        /*3、查企业*/
-//        //目前一个人只能归属于一个企业，所以这里取第一个就行
-//        Long entId = kwsDepts.get(0).getEntId();
-//        KwsEnterpriseResDto kwsEnterpriseResDto = remoteUserService.queryEnterpriseById(entId);
-//        if (Objects.isNull(kwsEnterpriseResDto)) {
-//            //只要查出了机构，这个if其实不会进的，做保险起见还是加上判空
-//            afterProcessor(loginResVo);
-//            return loginResVo;
-//        }
-//
-//        EntInfoResVo entInfoResVo = new EntInfoResVo();
-//        BeanUtils.copyProperties(kwsEnterpriseResDto, entInfoResVo);
-//        entInfoResVo.setDeptInfo(BeanUtils.copyToList(kwsDepts, DeptInfoResVo.class));
-//
-//        //查企业类型
-//        List<EntTypeResDto> entTypeResDtos = remoteUserService.queryEntTypeById(entId);
-//        if (CollectionUtils.isNotEmpty(entTypeResDtos)) {
-//            entInfoResVo.setEntTypes(String.join(Global.COMMA, entTypeResDtos.stream().map(EntTypeResDto::getType).map(String::valueOf).distinct().toList()));
-//        }
-//        loginResVo.setEntInfo(entInfoResVo);
-//
-//        /* 4、查资质*/
-//        List<EntCertificateResDto> entCertificateResDtoList = remoteUserService.queryCertificateByEntId(entId);
-//        entInfoResVo.setCertificateInfo(entCertificateResDtoList);
-//
-//        //企业资质有效性判断  1、当前资质没过期，且状态是已认证  2、只要有认证过一次就算有效  参数判断
-//        String checkType = String.valueOf(Global.NUMERICAL_TWO);
-//        if (checkType.equals(Global.NUMERICAL_ONE)) {
-//            for (EntCertificateResDto entCertificateResDto : entCertificateResDtoList) {
-//                Date expireTime = entCertificateResDto.getExpireTime();
-//                entInfoResVo.setValid(DateUtil.compare(new Date(), expireTime) <= 0);
-//            }
-//        } else {
-//            List<EntCheckTrackResDto> entCheckTrackResDtoList = remoteUserService.checkTrackByEntId(entId);
-//            if (CollectionUtils.isEmpty(entCheckTrackResDtoList)) {
-//                entInfoResVo.setValid(false);
-//                afterProcessor(loginResVo);
-//                return loginResVo;
-//            }
-//            entInfoResVo.setValid(entCheckTrackResDtoList.stream().anyMatch(item -> item.getStatus() == Global.NO));
-//        }
-//
-//        /*5、生成token，一些信息存redis*/
-//        afterProcessor(loginResVo);
-//        return loginResVo;
-        return null;
-    }
-
-    private KwsUserResDto checkLogin(LoginReqVo reqDto) {
-        List<KwsUserResDto> kwsUsers = remoteUserService.checkUserBase(reqDto.getAccount(), reqDto.getSystemType());
-        KwsUserResDto kwsUser = kwsUsers.get(0);
-        //密码校验、验证码
-        if (StringUtils.isNotBlank(reqDto.getPassword())) {
-            remoteUserService.checkPassword(reqDto.getPassword(), kwsUser.getPassword());
-        } else {
-            String key = Global.USER_LOGIN_CAPTCHA + reqDto.getSystemType() + Global.COLON + kwsUser.getAccount();
-//            String captcha = RedissonUtils.getString(key);
-//            if (StringUtils.isBlank(captcha) || StringUtils.isBlank(reqDto.getCaptcha()) || !reqDto.getCaptcha().equals(captcha)) {
-//                throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.CAPCHA_ERROR);
-//            }
-//            RedissonUtils.delete(key);
-        }
-        return kwsUser;
-    }
-
-    /**
-     * @param loginResVo 登录的返参
-     * @desc: 生成token，存redis
-     * @author: czh
-     * @date: 2023/6/12
-     */
-    private void afterProcessor(LoginResVo loginResVo) {
-        try {
-            //设置token
-            loginResVo.setToken(EncryUtil.encry(Global.PRI_KEY, String.valueOf(loginResVo.getId())));
-
-            //异步存redis
-            AsyncFactory.execute(new AsyncProcess(loginResVo, remoteUserService));
-        } catch (Exception e) {
-            throw new SystemException(HttpStatus.GLOBAL_EXCEPTION_CODE, HttpStatus.GLOBAL_EXCEPTION_MESSAGE);
-        }
-    }
-
-    @Override
-    @Transactional(rollbackFor = {})
-    public void register(RegisterReqVo reqVo) {
-        /*校验验证码*/
-        String key = StringUtils.format(RedisConstant.MESSAGE_SMS_VERIFY_CODE_VALUE_KEY, DictEnum.SMS_REGISTER.getValue(), reqVo.getPhone());
-        String sms = RedissonUtils.getString(key);
-        if (!reqVo.getCaptcha().equals(sms)) {
-            throw new SystemException(HttpStatus.CODE_10301, HttpStatus.CAPTCHA_ERROR);
-        }
-        RegisterReqDto registerReqDto = new RegisterReqDto();
-        BeanUtils.copyProperties(reqVo, registerReqDto);
-        remoteUserService.register(registerReqDto);
-        RedissonUtils.delete(key);
-    }
-
-
-    @Override
-    public void forgetPassword(ForgetPasswordReqVo reqDto) {
-        ForgetPasswordReqDto forgetPasswordReqDto = new ForgetPasswordReqDto();
-        BeanUtils.copyProperties(reqDto, forgetPasswordReqDto);
-        remoteUserService.forgetPassword(forgetPasswordReqDto);
-    }
-
-    @Override
-    public void resetPassword(Long id) {
-        remoteUserService.resetPassword(id);
-    }
 
     static class AsyncProcess implements Runnable {
 
@@ -214,13 +68,13 @@ public class AuthServiceImpl implements IAuthService {
         @Override
         public void run() {
             //存基础信息
-            SaveBaseToCache(loginResVo);
+            saveBaseToCache(loginResVo);
 
             //存菜单权限
-            SaveToCache(loginResVo);
+            saveToCache(loginResVo);
 
             //存登录记录信息
-            SaveLoginInfo(loginResVo);
+            saveLoginInfo(loginResVo);
         }
 
 
@@ -230,7 +84,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/6/28
          */
-        private void SaveBaseToCache(LoginResVo loginResVo) {
+        private void saveBaseToCache(LoginResVo loginResVo) {
             //存用户登录信息
             saveUserLoginInfo();
 
@@ -293,7 +147,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/6/28
          */
-        private void SaveToCache(LoginResVo loginResVo) {
+        private void saveToCache(LoginResVo loginResVo) {
             //存权限菜单
             long id = loginResVo.getId();
             List<UserAccessMenuInfoResDto> userAccessMenuInfo = remoteUserService.queryUserAccessMenu(id);
@@ -319,7 +173,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/6/28
          */
-        private void SaveLoginInfo(LoginResVo loginResVo) {
+        private void saveLoginInfo(LoginResVo loginResVo) {
             long userId = loginResVo.getId();
             UserLoginReqDto currentDayLogin = remoteUserService.currentDayLogin(userId);
             UserLoginReqDto userLoginReqDto = new UserLoginReqDto();
@@ -557,13 +411,13 @@ public class AuthServiceImpl implements IAuthService {
         @Override
         public void run() {
             //司机信息
-            SaveDriverToCache(loginBase, driver);
+            saveDriverToCache(loginBase, driver);
 
             //用户信息
-            SaveUserToCache(loginBase, user);
+            saveUserToCache(loginBase, user);
 
             //企业信息
-            SaveEntToCache(enterprise);
+            saveEntToCache(enterprise);
         }
 
         /**
@@ -572,7 +426,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/7/3
          */
-        private void SaveEntToCache(EntCacheResDto ent) {
+        private void saveEntToCache(EntCacheResDto ent) {
             if (ent == null) {
                 return;
             }
@@ -587,7 +441,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/7/3
          */
-        private void SaveDriverToCache(LoginBase loginBase, RDriverDetailVo driver) {
+        private void saveDriverToCache(LoginBase loginBase, RDriverDetailVo driver) {
             if (driver == null) {
                 return;
             }
@@ -614,7 +468,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/7/3
          */
-        private void SaveUserToCache(LoginBase loginBase, KwsUserResDto user) {
+        private void saveUserToCache(LoginBase loginBase, KwsUserResDto user) {
             if (user == null) {
                 return;
             }
@@ -646,7 +500,7 @@ public class AuthServiceImpl implements IAuthService {
             RedissonUtils.putString(key, JSON.toJSONString(loginUserInfo), Global.APP_TOKEN_EXPIRE);
 
             //存缓存请求地址
-            SaveMenusToCache(user);
+            saveMenusToCache(user);
         }
 
         /**
@@ -655,7 +509,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/6/28
          */
-        private void SaveMenusToCache(KwsUserResDto loginResVo) {
+        private void saveMenusToCache(KwsUserResDto loginResVo) {
             //存权限菜单
             long id = loginResVo.getId();
             List<UserAccessMenuInfoResDto> userAccessMenuInfo = remoteUserService.queryUserAccessMenu(id);
@@ -681,7 +535,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/6/28
          */
-        private void SaveLoginInfo(LoginResVo loginResVo) {
+        private void saveLoginInfo(LoginResVo loginResVo) {
             long userId = loginResVo.getId();
             UserLoginReqDto currentDayLogin = remoteUserService.currentDayLogin(userId);
             UserLoginReqDto userLoginReqDto = new UserLoginReqDto();

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/StringUtils.java

@@ -717,7 +717,7 @@ public class StringUtils {
             return str;
         }
         // cannot be longer than the char array
-        final int newCodePoints[] = new int[strLen];
+        final int [] newCodePoints = new int[strLen];
         int outOffset = 0;
         // copy the first codepoint
         newCodePoints[outOffset++] = newCodePoint;

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/config/easyexcel/CustomCellWeightWeightConfig.java

@@ -7,6 +7,7 @@ import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy;
 import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
@@ -34,7 +35,7 @@ public class CustomCellWeightWeightConfig extends AbstractColumnWidthStyleStrate
         if (needSetWidth) {
             Map<Integer, Integer> maxColumnWidthMap = CACHE.get(writeSheetHolder.getSheetNo());
             if (maxColumnWidthMap == null) {
-                maxColumnWidthMap = new HashMap<>();
+                maxColumnWidthMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
                 CACHE.put(writeSheetHolder.getSheetNo(), maxColumnWidthMap);
             }
 

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/utils/DateUtil.java

@@ -4,6 +4,7 @@ package com.sckw.excel.utils;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.StringUtils;
 import org.springframework.util.Assert;
 
@@ -298,7 +299,7 @@ public class DateUtil {
         String endLastWeekTime = DateTime.now().offset(DateField.DAY_OF_YEAR, lastEndOffset)
                 .setField(DateField.HOUR_OF_DAY, 23).setField(DateField.MINUTE, 59)
                 .setField(DateField.SECOND, 59).setField(DateField.MILLISECOND, 0).toString();
-        Map<String, String> maps = new HashMap();
+        Map<String, String> maps = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         maps.put("startUpLastWeekTime", startUpLastWeekTime);
         maps.put("endUpLastWeekTime", endUpLastWeekTime);
         maps.put("startLastWeekTime", startLastWeekTime);

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/RemoteUserService.java

@@ -43,27 +43,6 @@ public interface RemoteUserService {
      */
     List<KwsDeptResDto> queryDeptByIds(List<Long> ids);
 
-    /**
-     * @param reqDto 用户注册入参
-     * @desc: 用户注册
-     * @author: czh
-     * @date: 2023/6/19
-     */
-    void register(RegisterReqDto reqDto) throws SystemException;
-
-    /**
-     * 校验密码
-     * @param password 入参传的密码
-     * @param currentPwd 当前用户的密码
-     */
-    void checkPassword(String password, String currentPwd) throws SystemException;
-
-    /**
-     * 检验用户信息
-     * @param account
-     * @return
-     */
-    List<KwsUserResDto> checkUserBase(String account, int systemType) throws SystemException;
 
     /**
      * 根基id查企业
@@ -99,15 +78,6 @@ public interface RemoteUserService {
      */
     void saveUserLogin(UserLoginReqDto userLoginReqDto);
 
-
-    /**
-     * @param reqDto 忘记密码入参
-     * @desc: 忘记密码
-     * @author: czh
-     * @date: 2023/6/19
-     */
-    void forgetPassword(ForgetPasswordReqDto reqDto);
-
     /**
      * @param userId 用户id
      * @return 登录
@@ -135,21 +105,6 @@ public interface RemoteUserService {
      */
     List<EntCheckTrackResDto> checkTrackByEntId(Long entId);
 
-    /**
-     * @param updatePassword 修改密码入参
-     * @desc: 修改密码
-     * @author: czh
-     * @date: 2023/7/3
-     */
-    void updatePassword(UpdatePasswordReqDto updatePassword);
-
-    /**
-     * @param id 用户id
-     * @desc: 重置密码
-     * @author: czh
-     * @date: 2023/7/3
-     */
-    void resetPassword(Long id);
 
     /**
      * @param entId 企业id  userId用户id
@@ -168,14 +123,6 @@ public interface RemoteUserService {
      */
     Map<Long, SysDictResDto> querySysDictByIds(List<Long> ids);
 
-    /**
-     * @desc: 校验注册的入参
-     * @param: entName 企业名  phone联系电话  systemType系统类型
-     * @author: czh
-     * @date 2023/7/23
-     */
-    void checkRegisterParam(String entName, String phone, Integer systemType);
-
     /**
      * @param entId 企业id
      * @return EntTypeResDto

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/ContractTrackResVo.java

@@ -1,6 +1,8 @@
 package com.sckw.contract.model.vo.res;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -20,6 +22,8 @@ public class ContractTrackResVo implements Serializable {
     /**
      * 创建时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/LogisticsBaseInfoResVo.java

@@ -1,6 +1,8 @@
 package com.sckw.contract.model.vo.res;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -81,6 +83,8 @@ public class LogisticsBaseInfoResVo implements Serializable {
     /**
      * 终止时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
     private String endTime;
 
     /**
@@ -96,6 +100,7 @@ public class LogisticsBaseInfoResVo implements Serializable {
     /**
      * 生效时间
      */
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
     private Date startTime;
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/TradeBaseInfoResVo.java

@@ -1,6 +1,8 @@
 package com.sckw.contract.model.vo.res;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -31,6 +33,7 @@ public class TradeBaseInfoResVo implements Serializable {
     /**
      * 终止时间
      */
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
     private String endTime;
 
     /**
@@ -86,6 +89,8 @@ public class TradeBaseInfoResVo implements Serializable {
     /**
      * 生效时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
     private Date startTime;
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/CommonBusinessService.java

@@ -173,7 +173,7 @@ public class CommonBusinessService {
         Long entId1 = kwcContractLogisticsUnit.getEntId();
 
         EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(entId1);
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = CollectionUtils.createHashMap();
         map.put("entName", entCacheResDto1.getFirmName());
         map.put("contract_no", kwcContractLogistics.getContractNo());
         map.put("name", kwcContractLogistics.getName());
@@ -205,7 +205,7 @@ public class CommonBusinessService {
             Long entId1 = kwcContractTradeUnit.getEntId();
 
             EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(entId1);
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = CollectionUtils.createHashMap();
             map.put("entName", entCacheResDto1.getFirmName());
             map.put("contract_no", kwcContractTrade.getContractNo());
             map.put("name", kwcContractTrade.getName());

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -471,7 +471,7 @@ public class KwcContractLogisticsService {
             Map<Integer, KwcContractLogisticsUnit> collect = kwcContractLogisticsUnits.stream().collect(Collectors.toMap(KwcContractLogisticsUnit::getUnitType, Function.identity()));
             KwcContractLogisticsUnit kwcContractLogisticsUnit = collect.get(CooperateTypeEnum.CARRIAGE.getCode());
             EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(kwcContractLogisticsUnit.getEntId());
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = CollectionUtils.createHashMap();
             map.put("entName", entCacheResDto.getFirmName());
             map.put("contract_no", kwcContractLogistics.getContractNo());
             map.put("name", kwcContractLogistics.getName());
@@ -637,7 +637,7 @@ public class KwcContractLogisticsService {
             KwcContractLogisticsUnit kwcContractLogisticsUnit = collect.get(CooperateTypeEnum.CARRIAGE.getCode());
             Long entId = kwcContractLogisticsUnit.getEntId();
             EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(entId);
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = CollectionUtils.createHashMap();
             map.put("entName", entCacheResDto.getFirmName());
             map.put("contract_no", kwcContractLogistic.getContractNo());
             map.put("name", kwcContractLogistic.getName());

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -547,7 +547,7 @@ public class KwcContractTradeService {
             Map<Integer, KwcContractTradeUnit> collect = kwcContractTradeUnits.stream().collect(Collectors.toMap(KwcContractTradeUnit::getUnitType, Function.identity()));
             KwcContractTradeUnit kwcContractTradeUnit = collect.get(CooperateTypeEnum.PURCHASER.getCode());
             EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(kwcContractTradeUnit.getEntId());
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = CollectionUtils.createHashMap();
             map.put("entName", entCacheResDto.getFirmName());
             map.put("contract_no", kwcContractTrade.getContractNo());
             map.put("name", kwcContractTrade.getName());
@@ -720,7 +720,7 @@ public class KwcContractTradeService {
             KwcContractTradeUnit kwcContractTradeUnit = collect.get(CooperateTypeEnum.PURCHASER.getCode());
             Long entId = kwcContractTradeUnit.getEntId();
             EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(entId);
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = CollectionUtils.createHashMap();
             map.put("entName", entCacheResDto.getFirmName());
             map.put("contract_no", kwcContractTrade.getContractNo());
             map.put("name", kwcContractTrade.getName());

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -278,37 +278,6 @@ public class KwfTruckController {
         return HttpResult.ok(truckService.queryLocateTrack(params));
     }
 
-    /**
-     * @desc 获取JSON文件数据（暂时使用）
-     * @author zk
-     * @date 2023/8/2
-     **/
-    public String ReadFile(){
-        BufferedReader reader = null;
-        String laststr = "";
-        try{
-            InputStream fileInputStream = getClass().getClassLoader().getResourceAsStream("GPS.json");
-            InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "UTF-8");
-            reader = new BufferedReader(inputStreamReader);
-            String tempString = null;
-            while((tempString = reader.readLine()) != null){
-                laststr += tempString;
-            }
-            reader.close();
-        }catch(IOException e){
-            e.printStackTrace();
-        }finally{
-            if(reader != null){
-                try {
-                    reader.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return laststr;
-    }
-
     /**
      * @param truckNo 车牌号
      * @desc 车牌号查询车辆关联数据

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfDriverCardMapper.java

@@ -12,6 +12,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface KwfDriverCardMapper extends BaseMapper<KwfDriverCard> {
 
+    /**
+     * 新增
+     * @param params 新增参数
+     * @return
+     */
     int insert1(KwfDriverCard params);
 
     /**

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfFleetDriverMapper.java

@@ -19,16 +19,17 @@ public interface KwfFleetDriverMapper extends BaseMapper<KwfFleetDriver> {
     /**
      * 查询
      * @param params 参数
-     * @return
+     * @return 车队关联司机信息
      */
     KwfFleetDriver findByTruckDriver(KwfFleetDriver params);
 
     /**
+     * 查询车队班组
      * @param driverId 司机id
      * @param entId 企业id
-     * @desc 查询车队班组
      * @author zk
      * @date 2023/7/20
+     * @return 车队信息
      **/
     KwfFleet findByFleetDriver(@Param("driverId") Long driverId, @Param("entId") Long entId);
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfFleetTruckMapper.java

@@ -18,16 +18,17 @@ public interface KwfFleetTruckMapper extends BaseMapper<KwfFleetTruck> {
     /**
      * 查询
      * @param params 参数
-     * @return
+     * @return 车队车辆信息
      */
     KwfFleetTruck findByTruckFleet(KwfFleetTruck params);
 
     /**
+     * 查询车队班组
      * @param truckId 车辆id
      * @param entId 企业id
-     * @desc 查询车队班组
      * @author zk
      * @date 2023/7/20
+     * @return 车队信息
      **/
     KwfFleet findByFleetTruck(@Param("truckId") Long truckId, @Param("entId") Long entId);
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfTransportLicenseMapper.java

@@ -12,5 +12,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface KwfTransportLicenseMapper extends BaseMapper<KwfTransportLicense> {
 
+    /**
+     * 查询道路运输许可证
+     * @param truckId 车辆ID
+     * @author zk
+     * @date 2023/7/20
+     **/
     KwfTransportLicense findByTruckId(Long truckId);
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfTruckLicenseMapper.java

@@ -12,5 +12,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface KwfTruckLicenseMapper extends BaseMapper<KwfTruckLicense> {
 
+    /**
+     * 查询车辆行驶证信息
+     * @param truckId 车辆ID
+     * @author zk
+     * @date 2023/7/20
+     * @return 车辆行驶证信息
+     **/
     KwfTruckLicense findByTruckId(Long truckId);
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfTruckMapper.java

@@ -75,14 +75,14 @@ public interface KwfTruckMapper extends BaseMapper<KwfTruck> {
 
     /**
      * 查询企业车辆
-     * @param {entId 企业ID(必填), truckNo 车牌号}
+     * @param params {entId 企业ID(必填), truckNo 车牌号}
      * @return
      */
     List<KwfTruckMonitorVo> findTruckByEnt(Map<String, Object> params);
 
     /**
      * 查询全部车辆
-     * @param {truckNo 车牌号}
+     * @param params {truckNo 车牌号}
      * @return
      */
     List<KwfTruckMonitorVo> findTruckByAll(Map<String, Object> params);

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/dubbo/RemoteManageServiceImpl.java

@@ -9,7 +9,6 @@ import com.sckw.manage.api.model.dto.res.EntAddressResDto;
 import com.sckw.manage.api.model.dto.res.FindEntCooperateResVo;
 import com.sckw.manage.dao.KwmAddressMapper;
 import com.sckw.manage.model.entity.KwmAddress;
-import com.sckw.manage.model.entity.KwmCooperate;
 import com.sckw.manage.model.vo.req.FindCooperateByEntReqVo;
 import com.sckw.manage.model.vo.req.FindEntCooperateReqVo;
 import com.sckw.manage.model.vo.res.FindCooperateByEntResVo;
@@ -18,7 +17,6 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.*;
@@ -125,7 +123,7 @@ public class RemoteManageServiceImpl implements RemoteManageService {
                 }
             }
         }
-
         return findEntCooperateResVoList;
     }
+
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -1,10 +1,6 @@
 package com.sckw.manage.service;
 
-import java.io.IOException;
 import java.util.*;
-import java.util.stream.Collectors;
-
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -21,30 +17,23 @@ import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
-import com.sckw.excel.utils.EasyExcelUtil;
 import com.sckw.excel.utils.ExcelUtil;
-import com.sckw.manage.api.model.dto.res.EntAddressResDto;
 import com.sckw.manage.dao.KwmAddressMapper;
-import com.sckw.manage.dubbo.RemoteManageServiceImpl;
 import com.sckw.manage.model.entity.KwmAddress;
 import com.sckw.manage.model.report.AddressQueryExport;
 import com.sckw.manage.model.vo.req.*;
 import com.sckw.manage.model.vo.res.AddressDetailResVo;
 import com.sckw.manage.model.vo.res.AddressQueryResVo;
-import com.sckw.stream.enums.MessageEnum;
-import com.sckw.stream.model.UserInfo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.RemoteUserService;
 import com.sckw.system.api.model.dto.res.AreaTreeFrontResDto;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -63,17 +52,11 @@ public class KwmAddressService {
     @Autowired
     private CommonBusinessService commonBusinessService;
 
-    @Autowired
-    private RemoteManageServiceImpl remoteManageService;
-
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private RemoteSystemService remoteSystemService;
+    RemoteSystemService remoteSystemService;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private RemoteUserService remoteUserService;
-
-    @Autowired
-    private StreamBridge streamBridge;
+    RemoteUserService remoteUserService;
 
     /**
      * @param reqVo 分页入参

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateApplyService.java

@@ -1,6 +1,5 @@
 package com.sckw.manage.service;
 
-import java.io.IOException;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,7 +14,6 @@ import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
-import com.sckw.excel.utils.EasyExcelUtil;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.manage.dao.KwmCooperateMapper;
 import com.sckw.manage.dao.KwmCooperateTypeMapper;
@@ -24,7 +22,6 @@ import com.sckw.manage.model.dto.res.CooperateManageQueryResDto;
 import com.sckw.manage.model.dto.res.CooperateQueryDto;
 import com.sckw.manage.model.entity.KwmCooperate;
 import com.sckw.manage.model.entity.KwmCooperateType;
-import com.sckw.manage.model.report.AddressQueryExport;
 import com.sckw.manage.model.report.CooperateManageExport;
 import com.sckw.manage.model.vo.req.CooperateApplyQueryReqVo;
 import com.sckw.manage.model.vo.req.CooperateApproveReqVo;

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/MessageService.java

@@ -134,8 +134,8 @@ public class MessageService {
             categoryMap = dictMap.get(DictTypeEnum.MSG_CATEGORY.getType());
             statusMap = dictMap.get(DictTypeEnum.MSG_STATUS.getType());
         } else {
-            categoryMap = new HashMap<>();
-            statusMap = new HashMap<>();
+            categoryMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         String clientType = LoginUserHolder.getClientType();
         List<Long> userIds = list.stream().map(MessageListDTO::getCreateBy).toList();

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/SmsService.java

@@ -60,7 +60,7 @@ public class SmsService {
         if (CollectionUtils.isNotEmpty(dict)) {
             map = dict.get(DictTypeEnum.SEND_SMS_TYPE.getType());
         } else {
-            map = new HashMap<>();
+            map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         String type = param.getType();
         if (Objects.isNull(map.get(type))) {

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

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-message
   profiles:
-    active: @profiles.active@
+    active: lfdc
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/entity/KwoBanner.java

@@ -1,6 +1,5 @@
 package com.sckw.operation.model.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/req/BannerAddReqVo.java

@@ -31,7 +31,7 @@ public class BannerAddReqVo extends PageRequest implements Serializable {
     /**
      * 展示图片
      */
-    @NotBlank(message = "图片地址不能为空")
+    @NotBlank(message = "图片不能为空")
     @Size(max = 200, message = "图片地址超长")
     private String url;
     /**

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/service/BannerService.java

@@ -121,7 +121,7 @@ public class BannerService {
             BannerQueryResVo bannerQueryResVo = new BannerQueryResVo();
             BeanUtils.copyProperties(item, bannerQueryResVo);
             UserCacheResDto userCacheResDto = userCacheResDtoMap.get(item.getCreateBy());
-
+            bannerQueryResVo.setEndTime(item.getEntTime());
             if (Objects.nonNull(userCacheResDto)) {
                 bannerQueryResVo.setCreateByName(userCacheResDto.getName());
             }
@@ -149,6 +149,7 @@ public class BannerService {
         Date date = new Date();
         kwoBanner.setDelFlag(Global.NO);
         kwoBanner.setStatus(reqVo.getStatus());
+        kwoBanner.setEntTime(reqVo.getEndTime());
         kwoBanner.setCreateBy(userId);
         kwoBanner.setUpdateBy(userId);
         kwoBanner.setCreateTime(date);

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

@@ -323,7 +323,7 @@ public class KwoTradeOrderService {
      * @return: void
      */
     private void submitOrderSendMsg(OrderCheckDTO orderCheck, String orderNo) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = CollectionUtils.createHashMap();
         map.put("orderNo", orderNo);
         List<UserInfo> userInfos = new ArrayList<>();
         //提交人信息
@@ -372,7 +372,7 @@ public class KwoTradeOrderService {
      * @return: void
      */
     private void sendMsg(MessageEnum msgEnum, Map<String, Object> params, String pcUrl, String appUrl, List<UserInfo> userInfos) {
-        Map<String, String> urls = new HashMap<>();
+        Map<String, String> urls = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         urls.put(ClientTypeEnum.pc.getValue(), pcUrl);
         urls.put(ClientTypeEnum.app.getValue(), appUrl);
         SckwMessage msg = new SckwMessage(msgEnum);
@@ -629,14 +629,14 @@ public class KwoTradeOrderService {
                         DictTypeEnum.DELIVERY_TYPE.getType(), DictTypeEnum.TORDER_SOURCE.getType(), DictTypeEnum.TORDER_STATUS.getType(),
                         DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.UNIT_TYPE.getType(), DictTypeEnum.TAX_RATE.getType(),
                         DictTypeEnum.TORDER_UNIT_TYPE.getType(), DictTypeEnum.TORDER_ADDRESS_TYPE.getType(), DictTypeEnum.ADDRESS_TYPE.getType()));
-        Map<String, String> tradeMap = new HashMap<>();
-        Map<String, String> pickupMap = new HashMap<>();
-        Map<String, String> deleveryMap = new HashMap<>();
-        Map<String, String> sourceMap = new HashMap<>();
-        Map<String, String> statusMap = new HashMap<>();
-        Map<String, String> prodcutNameMap = new HashMap<>();
-        Map<String, String> unitMap = new HashMap<>();
-        Map<String, String> taxRateMap = new HashMap<>();
+        Map<String, String> tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> pickupMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> deleveryMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> sourceMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> prodcutNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> taxRateMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         Map<String, String> orderUnitMap, orderAddressMap, addressMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             tradeMap = dict.get(DictTypeEnum.TRADE_TYPE.getType());
@@ -651,9 +651,9 @@ public class KwoTradeOrderService {
             orderAddressMap = dict.get(DictTypeEnum.TORDER_ADDRESS_TYPE.getType());
             addressMap = dict.get(DictTypeEnum.ADDRESS_TYPE.getType());
         } else {
-            orderUnitMap = new HashMap<>();
-            orderAddressMap = new HashMap<>();
-            addressMap = new HashMap<>();
+            orderUnitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            orderAddressMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            addressMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         //订单基本信息
         OrderDetailRes detail = BeanUtils.copyProperties(order, OrderDetailRes.class);
@@ -1073,7 +1073,7 @@ public class KwoTradeOrderService {
      * @return: void
      */
     private void rejectOrderSendMsg(List<KwoTradeOrderUnit> units, KwoTradeOrder order) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = CollectionUtils.createHashMap();
         map.put("orderNo", order.getTOrderNo());
         Map<String, KwoTradeOrderUnit> unitMap = units.stream().collect
                 (Collectors.toMap(KwoTradeOrderUnit::getUnitType, Function.identity()));

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

@@ -99,16 +99,16 @@ public class KwoTransportDemandService {
                 DictTypeEnum.TRADE_TYPE.getType(), DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType()));
         Map<String, String> productNameMap, tradeMap, statusMap;
         if (CollectionUtils.isEmpty(dict)) {
-            productNameMap = new HashMap<>();
-            tradeMap = new HashMap<>();
-            statusMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             productNameMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             tradeMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TRADE_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TRADE_TYPE.getType());
             statusMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType());
         }
         TransportDemandDetailRes res = BeanUtils.copyProperties(transportDemand, TransportDemandDetailRes.class);
         List<SysDictResDto> types = remoteSystemService.queryDictFrontAll(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), res.getGoodsType());
@@ -236,15 +236,15 @@ public class KwoTransportDemandService {
         Map<String, String> productNameMap, tradeMap, statusMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             productNameMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             tradeMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             statusMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType())) ?
-                    dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
-            productNameMap = new HashMap<>();
-            tradeMap = new HashMap<>();
-            statusMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         List<TransportDemandListRes> result = Lists.newArrayList();
         list.forEach(e -> {
@@ -376,13 +376,13 @@ public class KwoTransportDemandService {
                 DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType()));
         Map<String, String> productNameMap, statusMap;
         if (CollectionUtils.isEmpty(dict)) {
-            productNameMap = new HashMap<>();
-            statusMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             productNameMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             statusMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType());
         }
         List<TransportDemandExport> result = Lists.newArrayList();
         demands.forEach(e -> {
@@ -529,13 +529,13 @@ public class KwoTransportDemandService {
                 DictTypeEnum.TRADE_TYPE.getType()));
         Map<String, String> productNameMap, tradeMap;
         if (CollectionUtils.isEmpty(dict)) {
-            productNameMap = new HashMap<>();
-            tradeMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             productNameMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             tradeMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TRADE_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TRADE_TYPE.getType());
         }
         List<TransportDemandSquaresListRes> result = Lists.newArrayList();
         list.forEach(e -> {

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

@@ -116,15 +116,15 @@ public class KwpWantBuyService {
         Map<String, String> tradeMap, productNameMap, goodsStatusMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             tradeMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             productNameMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             goodsStatusMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.GOODS_STATUS.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.GOODS_STATUS.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
-            tradeMap = new HashMap<>();
-            productNameMap = new HashMap<>();
-            goodsStatusMap = new HashMap<>();
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            goodsStatusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         // 对求购列表进行数据处理
         res.forEach(e -> {
@@ -175,16 +175,16 @@ public class KwpWantBuyService {
                 DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.WANT_BUY_STATUS.getType()));
         Map<String, String> tradeMap, productNameMap, statusMap;
         if (CollectionUtils.isEmpty(dict)) {
-            tradeMap = new HashMap<>();
-            productNameMap = new HashMap<>();
-            statusMap = new HashMap<>();
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             tradeMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TRADE_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TRADE_TYPE.getType());
             productNameMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             statusMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.WANT_BUY_STATUS.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.WANT_BUY_STATUS.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.WANT_BUY_STATUS.getType());
         }
         //把查询出来的集合wantBuyTradings里面对的tranding 转成字符串放在String里面
         wantBuyDto.forEach(wantBuySelectRes -> {
@@ -362,19 +362,19 @@ public class KwpWantBuyService {
                 DictTypeEnum.WANT_BUY_STATUS.getType(), DictTypeEnum.TORDER_ADDRESS_TYPE.getType(), DictTypeEnum.TRADE_TYPE.getType()));
         Map<String, String> productNameMap, wantBuyStatusMap, orderAddressMap, tradeMap;
         if (CollectionUtils.isEmpty(dict)) {
-            productNameMap = new HashMap<>();
-            wantBuyStatusMap = new HashMap<>();
-            orderAddressMap = new HashMap<>();
-            tradeMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            wantBuyStatusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            orderAddressMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             productNameMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             wantBuyStatusMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.WANT_BUY_STATUS.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.WANT_BUY_STATUS.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.WANT_BUY_STATUS.getType());
             orderAddressMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TORDER_ADDRESS_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TORDER_ADDRESS_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TORDER_ADDRESS_TYPE.getType());
             tradeMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TRADE_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TRADE_TYPE.getType());
         }
         List<SysDictResDto> types = remoteSystemService.queryDictFrontAll(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), responseData.getGoodsType());
         if (CollectionUtils.isNotEmpty(types)) {
@@ -564,16 +564,16 @@ public class KwpWantBuyService {
                 DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.WANT_BUY_STATUS.getType()));
         Map<String, String> tradeMap, productNameMap, statusMap;
         if (CollectionUtils.isEmpty(dict)) {
-            tradeMap = new HashMap<>();
-            productNameMap = new HashMap<>();
-            statusMap = new HashMap<>();
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             tradeMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TRADE_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TRADE_TYPE.getType());
             productNameMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             statusMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.WANT_BUY_STATUS.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.WANT_BUY_STATUS.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.WANT_BUY_STATUS.getType());
         }
         List<WantBuyExport> result = new ArrayList<>();
         wantBuyDto.forEach(e -> {

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/JumpUrlConfig.java

@@ -1,5 +1,6 @@
 package com.sckw.payment.model;
 
+import com.sckw.core.model.constant.Global;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -29,12 +30,12 @@ public class JumpUrlConfig {
     public Map<String, String> getMapUrl(String key) {
         JumpUrl jumpUrl = url.get(key);
         if (Objects.nonNull(jumpUrl)) {
-            return new HashMap<>() {{
+            return new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                 put("pc", jumpUrl.getPc());
                 put("app", jumpUrl.getApp());
             }};
         }
-        return new HashMap<>();
+        return new HashMap<>(Global.NUMERICAL_SIXTEEN);
     }
 
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerLogisticsService.java

@@ -199,13 +199,13 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         //承运方
         KwpLedgerLogisticsUnit logisticsUnit2 = logisticsUnitService.queryCustomerEnt(idNo.id(), LogisticsUnitType.CARRIER);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit.getFirmName());
             put("number", idNo.no());
             put("name", logisticsReq.getName());
         }}, new UserInfo().setUserId(LoginUserHolder.getUserId()).setEntId(LoginUserHolder.getEntId()), MessageEnum.LEDGER_CARRIER);
         //推送系统管理员
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit2.getFirmName());
             put("number", idNo.no());
             put("name", logisticsReq.getName());
@@ -449,13 +449,13 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         //承运方
         KwpLedgerLogisticsUnit logisticsUnit2 = logisticsUnitService.queryCustomerEnt(id, LogisticsUnitType.CARRIER);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
         }}, new UserInfo().setUserId(LoginUserHolder.getUserId()).setEntId(LoginUserHolder.getEntId()), MessageEnum.LEDGER_REVOCATION_CARRIER);
         //推送系统管理员
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit2.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
@@ -501,13 +501,13 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         //承运方
         KwpLedgerLogisticsUnit logisticsUnit2 = logisticsUnitService.queryCustomerEnt(ledgerReq.getIdLong(), LogisticsUnitType.CARRIER);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
         }}, new UserInfo().setUserId(LoginUserHolder.getUserId()).setEntId(LoginUserHolder.getEntId()), MessageEnum.LEDGER_BACK_CARRIER);
         //推送系统管理员和变更人
-        messageSender.sendPurchaseBoth(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendPurchaseBoth(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit2.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
@@ -543,13 +543,13 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         //承运方
         KwpLedgerLogisticsUnit logisticsUnit2 = logisticsUnitService.queryCustomerEnt(confirmReq.getIdLong(), LogisticsUnitType.CARRIER);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
         }}, new UserInfo().setUserId(LoginUserHolder.getUserId()).setEntId(LoginUserHolder.getEntId()), MessageEnum.LEDGER_CONFIRM_SHIPPER);
         //推送系统管理员和变更人
-        messageSender.sendPurchaseBoth(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendPurchaseBoth(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit2.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
@@ -621,13 +621,13 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         //承运方
         KwpLedgerLogisticsUnit logisticsUnit2 = logisticsUnitService.queryCustomerEnt(ledgerReq.getIdLong(), LogisticsUnitType.CARRIER);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
         }}, new UserInfo().setUserId(LoginUserHolder.getUserId()).setEntId(LoginUserHolder.getEntId()), MessageEnum.LEDGER_SUCCESS_CARRIER);
         //推送系统管理员和变更人
-        messageSender.sendPurchaseBoth(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendPurchaseBoth(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit2.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
@@ -635,11 +635,11 @@ public class KwpLedgerLogisticsService extends AbsLedger {
 
 
         //推送双方系统管理员
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit.getFirmName());
             put("number", kwpSettlementLogistics.getSlOrderNo());
         }}, logisticsUnit2.getEntId(), MessageEnum.SETTLEMENT_CARRIER);
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit2.getFirmName());
             put("number", kwpSettlementLogistics.getSlOrderNo());
         }}, logisticsUnit.getEntId(), MessageEnum.SETTLEMENT_SHIPPER);

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerTradeService.java

@@ -252,7 +252,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         //校验当前订单是否已存在绑定的对账单
         tradeOrderService.check(ids);
         List<OrderDetailRes> resList = new ArrayList<>();
-        Map<Long, String> map = new HashMap<>();
+        Map<Long, String> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         String trading = tradeSendReq.getTrading();
         for (Long id : ids) {
             OrderDetailRes orderDetailById = tradeOrderInfoService.getOrderDetailById(id);
@@ -379,7 +379,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         //推送消息
         KwpLedgerTradeUnit kwpLedgerTradeUnit = tradeUnitService.queryCustomerEnt(idNo.id(), TradeUnitType.PURCHASE);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit.getFirmName());
             put("number", idNo.no());
             put("name", tradeSendReq.getName());
@@ -387,7 +387,7 @@ public class KwpLedgerTradeService extends AbsLedger {
 
         //推送系统管理员
         KwpLedgerTradeUnit kwpLedgerTradeUnit2 = tradeUnitService.queryCustomerEnt(idNo.id(), TradeUnitType.SELL);
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit2.getFirmName());
             put("number", idNo.no());
             put("name", tradeSendReq.getName());
@@ -466,7 +466,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         //推送消息
         KwpLedgerTradeUnit kwpLedgerTradeUnit = tradeUnitService.queryCustomerEnt(id, TradeUnitType.PURCHASE);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
@@ -474,7 +474,7 @@ public class KwpLedgerTradeService extends AbsLedger {
 
         //推送系统管理员
         KwpLedgerTradeUnit kwpLedgerTradeUnit2 = tradeUnitService.queryCustomerEnt(id, TradeUnitType.SELL);
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit2.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
@@ -516,7 +516,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         //推送消息
         KwpLedgerTradeUnit kwpLedgerTradeUnit = tradeUnitService.queryCustomerEnt(ledgerReq.getIdLong(), TradeUnitType.PURCHASE);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
@@ -524,7 +524,7 @@ public class KwpLedgerTradeService extends AbsLedger {
 
         //推送系统管理员和变更人
         KwpLedgerTradeUnit kwpLedgerTradeUnit2 = tradeUnitService.queryCustomerEnt(ledgerReq.getIdLong(), TradeUnitType.SELL);
-        messageSender.sendSellBoth(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendSellBoth(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit2.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
@@ -557,7 +557,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         //推送消息
         KwpLedgerTradeUnit kwpLedgerTradeUnit = tradeUnitService.queryCustomerEnt(confirmReq.getIdLong(), TradeUnitType.PURCHASE);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
@@ -565,7 +565,7 @@ public class KwpLedgerTradeService extends AbsLedger {
 
         //推送系统管理员和变更人
         KwpLedgerTradeUnit kwpLedgerTradeUnit2 = tradeUnitService.queryCustomerEnt(confirmReq.getIdLong(), TradeUnitType.SELL);
-        messageSender.sendSellBoth(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendSellBoth(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit2.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
@@ -648,7 +648,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         //推送消息
         KwpLedgerTradeUnit kwpLedgerTradeUnit = tradeUnitService.queryCustomerEnt(ledgerReq.getIdLong(), TradeUnitType.PURCHASE);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
@@ -656,18 +656,18 @@ public class KwpLedgerTradeService extends AbsLedger {
 
         //推送系统管理员和变更人
         KwpLedgerTradeUnit kwpLedgerTradeUnit2 = tradeUnitService.queryCustomerEnt(ledgerReq.getIdLong(), TradeUnitType.SELL);
-        messageSender.sendSellBoth(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendSellBoth(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit2.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
         }}, ledgerReq.getIdLong(), kwpLedgerTradeUnit.getEntId(), MessageEnum.LEDGER_SUCCESS_PURCHASE);
 
         //推送双方系统管理员
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit.getFirmName());
             put("number", kwpSettlementTrade.getStOrderNo());
         }}, kwpLedgerTradeUnit2.getEntId(), MessageEnum.SETTLEMENT_SELL);
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit2.getFirmName());
             put("number", kwpSettlementTrade.getStOrderNo());
         }}, kwpLedgerTradeUnit.getEntId(), MessageEnum.SETTLEMENT_PURCHASE);

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementOfflineService.java

@@ -254,11 +254,11 @@ public class KwpSettlementOfflineService {
         KwpLedgerLogisticsUnit logisticsUnit2 = logisticsUnitService.queryCustomerEnt(settlementLogisticsDto.getLLedgerId(), LogisticsUnitType.CARRIER);
 
         //推送双方系统管理员
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit.getFirmName());
             put("number", settlementLogisticsDto.getSlOrderNo());
         }}, logisticsUnit2.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_CARRIER);
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit2.getFirmName());
             put("number", settlementLogisticsDto.getSlOrderNo());
         }}, logisticsUnit.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_SHIPPER);
@@ -406,11 +406,11 @@ public class KwpSettlementOfflineService {
                 KwpLedgerTradeUnit kwpLedgerTradeUnit = tradeUnitService.queryCustomerEnt(byId.getLedgerId(), TradeUnitType.PURCHASE);
                 KwpLedgerTradeUnit kwpLedgerTradeUnit2 = tradeUnitService.queryCustomerEnt(byId.getLedgerId(), TradeUnitType.SELL);
                 //推送双方系统管理员
-                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("company", kwpLedgerTradeUnit.getFirmName());
                     put("number", byId.getStOrderNo());
                 }}, kwpLedgerTradeUnit2.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_SELL);
-                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("company", kwpLedgerTradeUnit2.getFirmName());
                     put("number", byId.getStOrderNo());
                 }}, kwpLedgerTradeUnit.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_PURCHASE);

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementWalletService.java

@@ -291,11 +291,11 @@ public class KwpSettlementWalletService {
                     // 调用电子钱包进行清分操作
                     walletBusinessService.splitMoney(orderNo, uid, filter, channelEnum, price, "2");
                     //推送双方系统管理员
-                    messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                    messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                         put("company", logisticsUnit.getFirmName());
                         put("number", settlementLogisticsDto.getSlOrderNo());
                     }}, logisticsUnit2.getEntId(), MessageEnum.SETTLEMENT_START_CARRIER);
-                    messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                    messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                         put("company", logisticsUnit2.getFirmName());
                         put("number", settlementLogisticsDto.getSlOrderNo());
                     }}, logisticsUnit.getEntId(), MessageEnum.SETTLEMENT_START_SHIPPER);
@@ -407,11 +407,11 @@ public class KwpSettlementWalletService {
                 walletBusinessService.splitMoney(orderNo, uid, filter, channelEnum, price, "2");
 
                 //推送双方系统管理员
-                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("company", kwpLedgerTradeUnit.getFirmName());
                     put("number", kwpSettlementTrade.getStOrderNo());
                 }}, kwpLedgerTradeUnit2.getEntId(), MessageEnum.SETTLEMENT_START_SELL);
-                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("company", kwpLedgerTradeUnit2.getFirmName());
                     put("number", kwpSettlementTrade.getStOrderNo());
                 }}, kwpLedgerTradeUnit.getEntId(), MessageEnum.SETTLEMENT_START_PURCHASE);
@@ -571,11 +571,11 @@ public class KwpSettlementWalletService {
                 //对结算单中的总计金额进行清分
                 walletBusinessService.splitMoney(orderNo, uid, filter, channelEnum, byId.getTotalPrice(), "1");
                 //推送双方系统管理员
-                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("company", kwpLedgerTradeUnit.getFirmName());
                     put("number", byId.getStOrderNo());
                 }}, kwpLedgerTradeUnit2.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_SELL);
-                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("company", kwpLedgerTradeUnit2.getFirmName());
                     put("number", byId.getStOrderNo());
                 }}, kwpLedgerTradeUnit.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_PURCHASE);

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -207,7 +207,7 @@ public class KwpGoodsService {
         if (CollectionUtils.isNotEmpty(dict)) {
             unitMap = dict.get(DictTypeEnum.UNIT_TYPE.getType());
         } else {
-            unitMap = new HashMap<>();
+            unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         List<Long> goodsIds = list.stream().map(KwpGoods::getId).toList();
         Map<Long, List<KwpGoodsPriceRange>> map = kwpGoodsPriceRangeService.getByGoodsIds(goodsIds).stream()
@@ -254,11 +254,11 @@ public class KwpGoodsService {
         }
         Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.PRODUCT_NAME_TYPE.getType(),
                 DictTypeEnum.UNIT_TYPE.getType(), DictTypeEnum.TAX_RATE.getType(), DictTypeEnum.GOODS_STATUS.getType(), DictTypeEnum.ADDRESS_TYPE.getType()));
-        Map<String, String> productNameMap = new HashMap<>();
-        Map<String, String> unitMap = new HashMap<>();
-        Map<String, String> taxRateMap = new HashMap<>();
-        Map<String, String> goodsStatusMap = new HashMap<>();
-        Map<String, String> addressMap = new HashMap<>();
+        Map<String, String> productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> taxRateMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> goodsStatusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> addressMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(dict)) {
             productNameMap = dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             unitMap = dict.get(DictTypeEnum.UNIT_TYPE.getType());
@@ -695,10 +695,10 @@ public class KwpGoodsService {
             taxRateMap = dict.get(DictTypeEnum.TAX_RATE.getType());
             goodsStatusMap = dict.get(DictTypeEnum.GOODS_STATUS.getType());
         } else {
-            productNameMap = new HashMap<>();
-            unitMap = new HashMap<>();
-            taxRateMap = new HashMap<>();
-            goodsStatusMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            taxRateMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            goodsStatusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         Map<Long, String> entMap = entList.stream().collect(Collectors.toMap(EntCacheResDto::getId, EntCacheResDto::getFirmName, (k1, k2) -> k1));
         list.forEach(e -> {
@@ -773,14 +773,14 @@ public class KwpGoodsService {
      * @return: void
      */
     private void sendMsg(MessageEnum msgEnum, KwpGoods goods) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = CollectionUtils.createHashMap();
         map.put("productName", goods.getName());
         //给创建人发消息
         List<UserInfo> userInfos = new ArrayList<>();
         UserInfo createUser = new UserInfo();
         createUser.setUserId(goods.getCreateBy()).setEntId(goods.getEntId());
         userInfos.add(createUser);
-        HashMap<String, String> urlMap = new HashMap<>();
+        HashMap<String, String> urlMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         urlMap.put(ClientTypeEnum.app.getValue(), appGoodsListUrl);
         urlMap.put(ClientTypeEnum.pc.getValue(), pcGoodsListUrl);
         SckwMessage msg = new SckwMessage(msgEnum);
@@ -910,8 +910,8 @@ public class KwpGoodsService {
             productNameMap = dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             unitMap = dict.get(DictTypeEnum.UNIT_TYPE.getType());
         } else {
-            productNameMap = new HashMap<>();
-            unitMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         list.forEach(e -> {
             BuildingMaterialsMarketList materials = BeanUtils.copyProperties(e, BuildingMaterialsMarketList.class);

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsStatisticsService.java

@@ -1,6 +1,7 @@
 package com.sckw.product.service;
 
 import com.sckw.core.common.enums.enums.DictTypeEnum;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.product.model.KwpGoods;
@@ -57,8 +58,8 @@ public class KwpGoodsStatisticsService {
                 DictTypeEnum.UNIT_TYPE.getType()));
         Map<String, String> productNameMap, unitMap;
         if (CollectionUtils.isEmpty(dict)) {
-            productNameMap = new HashMap<>();
-            unitMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             productNameMap = dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             unitMap = dict.get(DictTypeEnum.UNIT_TYPE.getType());

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

@@ -1,6 +1,7 @@
 package com.sckw.report.service;
 
 import com.sckw.core.common.enums.enums.DictTypeEnum;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.model.vo.TableBottom;
 import com.sckw.core.model.vo.TableStatisticRes;
@@ -105,21 +106,21 @@ public class KwOrderService {
         Map<String, String> statusMap, tradeMap, deliveryMap, pickupMap, sourceMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             statusMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TORDER_STATUS.getType())) ?
-                    dict.get(DictTypeEnum.TORDER_STATUS.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TORDER_STATUS.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             tradeMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             deliveryMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.DELIVERY_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.DELIVERY_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.DELIVERY_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             pickupMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.PICKUP_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.PICKUP_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.PICKUP_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             sourceMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TORDER_SOURCE.getType())) ?
-                    dict.get(DictTypeEnum.TORDER_SOURCE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TORDER_SOURCE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
-            statusMap = new HashMap<>();
-            tradeMap = new HashMap<>();
-            deliveryMap = new HashMap<>();
-            pickupMap = new HashMap<>();
-            sourceMap = new HashMap<>();
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            deliveryMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            pickupMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            sourceMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         List<OrderListRes> result = new ArrayList<>();
         list.forEach(e -> {
@@ -328,7 +329,7 @@ public class KwOrderService {
         AggregationResults<TableTop> aggregate = mongoTemplate
                 .aggregate(aggregation, SckwTradeOrder.class, TableTop.class);
         List<TableTop> tableTops = aggregate.getMappedResults();
-        Map<Integer, Integer> map = new HashMap<>();
+        Map<Integer, Integer> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(tableTops)) {
             map = tableTops.stream().collect(Collectors.toMap
                     (TableTop::getValue, TableTop::getTotal, (k1, k2) -> k2));
@@ -375,7 +376,7 @@ public class KwOrderService {
         AggregationResults<TradeOrderAppStatisticVO> aggregate = mongoTemplate
                 .aggregate(aggregation, SckwTradeOrder.class, TradeOrderAppStatisticVO.class);
         List<TradeOrderAppStatisticVO> tableTops = aggregate.getMappedResults();
-        Map<Integer, Integer> map = new HashMap<>();
+        Map<Integer, Integer> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(tableTops)) {
             map = tableTops.stream().collect(Collectors.toMap
                     (TradeOrderAppStatisticVO::getValue, TradeOrderAppStatisticVO::getTotal, (k1, k2) -> k2));
@@ -431,21 +432,21 @@ public class KwOrderService {
         Map<String, String> statusMap, pickupMap, deliveryMap, sourceMap, tradeMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             statusMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TORDER_STATUS.getType())) ?
-                    dict.get(DictTypeEnum.TORDER_STATUS.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TORDER_STATUS.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             pickupMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.PICKUP_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.PICKUP_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.PICKUP_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             deliveryMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.DELIVERY_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.DELIVERY_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.DELIVERY_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             sourceMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TORDER_SOURCE.getType())) ?
-                    dict.get(DictTypeEnum.TORDER_SOURCE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TORDER_SOURCE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             tradeMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
-            statusMap = new HashMap<>();
-            pickupMap = new HashMap<>();
-            deliveryMap = new HashMap<>();
-            sourceMap = new HashMap<>();
-            tradeMap = new HashMap<>();
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            pickupMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            deliveryMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            sourceMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         List<TradeOrderListExport> list = new ArrayList<>();
         orders.forEach(e -> {

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

@@ -2,6 +2,7 @@ package com.sckw.report.service;
 
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.DateUtils;
@@ -214,12 +215,12 @@ public class KwOrderStatisticsService {
         Map<String, String> unitMap, goodsNameMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             unitMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.UNIT_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.UNIT_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.UNIT_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             goodsNameMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
-            unitMap = new HashMap<>();
-            goodsNameMap = new HashMap<>();
+            unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            goodsNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         List<WorkbenchPurchaseVO> result = new ArrayList<>();
         orders.forEach(e -> {

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteBaseService.java

@@ -3,22 +3,15 @@ package com.sckw.system.dubbo;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
-import com.sckw.system.api.model.dto.res.REnterpriseVo;
 import com.sckw.system.api.model.dto.res.*;
 import com.sckw.system.api.model.pojo.DeptInfoPojo;
-import com.sckw.system.dao.KwsAuthorityDao;
-import com.sckw.system.dao.KwsEntDeptDao;
-import com.sckw.system.dao.KwsEntTypeDao;
-import com.sckw.system.dao.KwsEnterpriseDao;
+import com.sckw.system.dao.*;
 import com.sckw.system.model.*;
 import com.sckw.system.model.pojo.FindManagePojo;
 import com.sckw.system.model.vo.res.CertificateResVo;
 import com.sckw.system.model.vo.res.KwsDeptResVo;
 import com.sckw.system.model.vo.res.KwsUserResVo;
-import com.sckw.system.service.KwsDeptService;
 import com.sckw.system.service.KwsEnterpriseService;
-import com.sckw.system.service.KwsRoleService;
-import com.sckw.system.service.KwsUserService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
@@ -39,13 +32,13 @@ public class RemoteBaseService {
     private KwsAuthorityDao kwsAuthorityDao;
 
     @Resource
-    private KwsDeptService kwsDeptService;
+    private KwsDeptDao kwsDeptDao;
 
     @Resource
-    private KwsUserService kwsUserService;
+    private KwsUserDao kwsUserDao;
 
     @Resource
-    private KwsRoleService kwsRoleService;
+    private KwsRoleDao kwsRoleDao;
 
     @Resource
     private KwsEntDeptDao kwsEntDeptDao;
@@ -56,9 +49,12 @@ public class RemoteBaseService {
     @Resource
     private KwsEnterpriseDao kwsEnterpriseDao;
 
+    @Resource
+    private KwsEntCheckTrackDao kwsEntCheckTrackDao;
+
 
     public KwsEnterpriseResDto queryEnterpriseById(Long id) {
-        KwsEnterprise kwsEnterprise = kwsEnterpriseService.queryKwsEnterpriseById(id);
+        KwsEnterprise kwsEnterprise = kwsEnterpriseDao.selectByKey(id);
         if (Objects.isNull(kwsEnterprise)) {
             return null;
         }
@@ -69,10 +65,9 @@ public class RemoteBaseService {
     }
 
     public KwsUserResDto getUserByAccount(String username) {
-        Map<String, Object> params = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
-            put("account", username);
-        }};
-        List<KwsUserResVo> list = kwsUserService.findList(params);
+        Map<String, Object> params = new HashMap<>(Global.NUMERICAL_TWO);
+        params.put("account", username);
+        List<KwsUserResVo> list = kwsUserDao.findList(params);
         if (CollectionUtils.isEmpty(list)) {
             return null;
         }
@@ -82,7 +77,7 @@ public class RemoteBaseService {
     }
 
     public List<KwsUserDeptResDto> queryUserDeptByUserId(Long userId) {
-        List<KwsUserDept> kwsUserDepts = kwsUserService.queryUserDeptByUserId(userId);
+        List<KwsUserDept> kwsUserDepts = kwsUserDao.queryUserDeptByUserId(userId);
         if (CollectionUtils.isEmpty(kwsUserDepts)) {
             return Collections.emptyList();
         }
@@ -90,7 +85,7 @@ public class RemoteBaseService {
     }
 
     public List<KwsDeptResDto> queryDeptByIds(List<Long> ids) {
-        List<KwsDept> kwsDepts = kwsUserService.queryDeptByIds(ids);
+        List<KwsDept> kwsDepts = kwsUserDao.queryDeptByIds(ids);
         if (CollectionUtils.isEmpty(kwsDepts)) {
             return Collections.emptyList();
         }
@@ -99,7 +94,7 @@ public class RemoteBaseService {
     }
 
     public List<KwsRoleResDto> queryRoleInfoByUserId(Long userId) {
-        List<KwsRole> kwsRoles = kwsRoleService.queryRoleByUserId(userId);
+        List<KwsRole> kwsRoles = kwsRoleDao.queryRoleByUserId(userId);
         if (CollectionUtils.isEmpty(kwsRoles)) {
             return Collections.emptyList();
         }
@@ -115,7 +110,7 @@ public class RemoteBaseService {
     }
 
     public List<EntCheckTrackResDto> checkTrackByEntId(Long entId) {
-        List<KwsEntCheckTrack> kwsEntCheckTracks = kwsEnterpriseService.entCheck(entId);
+        List<KwsEntCheckTrack> kwsEntCheckTracks = kwsEntCheckTrackDao.findList(entId);
         if (CollectionUtils.isEmpty(kwsEntCheckTracks)) {
             return Collections.emptyList();
         }
@@ -126,7 +121,7 @@ public class RemoteBaseService {
         KwsDept kwsDept = new KwsDept();
         kwsDept.setEntId(entId);
         kwsDept.setDelFlag(Global.NO);
-        List<KwsDeptResVo> list = kwsDeptService.findList(kwsDept);
+        List<KwsDeptResVo> list = kwsDeptDao.findList(kwsDept);
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
@@ -134,7 +129,7 @@ public class RemoteBaseService {
     }
 
     public List<KwsEnterprise> findEnts(Map<String, Object> params) {
-        return kwsEnterpriseService.findEnts(params);
+        return kwsEnterpriseDao.findEnts(params);
     }
 
 
@@ -179,7 +174,12 @@ public class RemoteBaseService {
      * @return list
      */
     public List<KwsUserResDto> getUserByName(String name) {
-        return kwsUserService.getUserByName(name);
+        List<KwsUser> userByName = kwsUserDao.getUserByName(name);
+        if (CollectionUtils.isEmpty(userByName)) {
+            return Collections.emptyList();
+        }
+
+        return BeanUtils.copyToList(userByName, KwsUserResDto.class);
     }
 
     /**
@@ -201,7 +201,7 @@ public class RemoteBaseService {
      * @date: 2023/9/1
      */
     public List<KwsEnterprise> queryEntInfoByCityCodeAndEntTypesWithPage(Integer cityCode, List<Integer> entTypeList, List<Long> entIdList, String entName) {
-        return kwsEnterpriseService.queryEntInfoByCityCodeAndEntTypesWithPage(cityCode, entTypeList, entIdList, entName);
+        return kwsEnterpriseDao.queryEntInfoByCityCodeAndEntTypesWithPage(cityCode, entTypeList, entIdList, entName);
     }
 
     /**
@@ -223,7 +223,7 @@ public class RemoteBaseService {
      * @date: 2023/9/4
      */
     public List<KwsUser> queryUserByDeptIds(List<Long> deptIds) {
-        return kwsUserService.queryUserByDeptIds(deptIds);
+        return kwsUserDao.selectByDeptIds(deptIds);
     }
 
     /**
@@ -238,6 +238,6 @@ public class RemoteBaseService {
         if (Objects.isNull(manageInfoByEntId)) {
             return null;
         }
-        return kwsUserService.selectByKey(manageInfoByEntId.getUserId());
+        return kwsUserDao.selectByKey(manageInfoByEntId.getUserId());
     }
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -1,6 +1,5 @@
 package com.sckw.system.dubbo;
 
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -13,12 +12,12 @@ import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.*;
 import com.sckw.system.api.model.pojo.DeptInfoPojo;
+import com.sckw.system.dao.KwsUserDao;
+import com.sckw.system.dao.SysAreaDao;
 import com.sckw.system.dao.SysDictDao;
 import com.sckw.system.model.*;
 import com.sckw.system.model.vo.res.FindAreaTreeResVo;
 import com.sckw.system.model.vo.res.KwsUserResVo;
-import com.sckw.system.service.KwsUserService;
-import com.sckw.system.service.SysAreaService;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,13 +37,13 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
     private SysDictDao sysDictDao;
 
     @Autowired
-    private KwsUserService kwsUserService;
+    private KwsUserDao kwsUserDao;
 
     @Autowired
     private RemoteBaseService remoteBaseService;
 
     @Autowired
-    private SysAreaService sysAreaService;
+    private SysAreaDao sysAreaDao;
 
     /**
      * @param keys type#value,type#value
@@ -128,7 +127,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             return Collections.emptyMap();
         }
 
-        Map<String, Map<String, String>> map = new HashMap<>();
+        Map<String, Map<String, String>> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         for (String type : list) {
             List<SysDictResDto> sysDictResDtos = queryDictByType(type);
             if (CollectionUtils.isEmpty(sysDictResDtos)) {
@@ -518,7 +517,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         String dictCache = RedissonUtils.getString(key);
         //从redis查，查不到从数据库查，并写入redis
         if (StringUtils.isBlank(dictCache)) {
-            KwsUser kwsUser = kwsUserService.selectByKey(userId);
+            KwsUser kwsUser = kwsUserDao.selectByKey(userId);
             if (Objects.isNull(kwsUser)) {
                 return null;
             }
@@ -592,7 +591,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         String areaCache = RedissonUtils.getString(key);
         //从redis查，查不到从数据库查，并写入redis
         if (StringUtils.isBlank(areaCache)) {
-            SysArea sysArea = sysAreaService.selectById(code);
+            SysArea sysArea = sysAreaDao.selectById(code);
             if (Objects.isNull(sysArea)) {
                 return new SysAreaCacheResDto();
             }
@@ -610,7 +609,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
-        List<SysArea> sysAreas = sysAreaService.selectByIds(list);
+        List<SysArea> sysAreas = sysAreaDao.selectByIds(list);
         if (CollectionUtils.isEmpty(sysAreas)) {
             return Collections.emptyList();
         }
@@ -630,7 +629,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             upLevel.removeIf(x -> x.getLevel() > finalI);
             Map<Integer, List<AreaTreeFrontResDto>> collect = upLevel.stream().collect(Collectors.groupingBy(AreaTreeFrontResDto::getPcode));
             for (Integer pcode : collect.keySet()) {
-                SysArea sysArea = sysAreaService.selectById(pcode);
+                SysArea sysArea = sysAreaDao.selectById(pcode);
                 AreaTreeFrontResDto areaTreeFrontResDto = new AreaTreeFrontResDto();
                 areaTreeFrontResDto.setCode(sysArea.getCode());
                 areaTreeFrontResDto.setPcode(sysArea.getPcode());
@@ -722,7 +721,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             return Collections.emptyList();
         }
 
-        List<SysArea> list = sysAreaService.findList(null);
+        List<SysArea> list = sysAreaDao.findList(null);
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
@@ -776,7 +775,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             put("account", account);
             put("systemType", systemType);
         }};
-        List<KwsUserResVo> users = kwsUserService.findList(params);
+        List<KwsUserResVo> users = kwsUserDao.findList(params);
         if (CollectionUtils.isEmpty(users)) {
             return null;
         }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteUserServiceImpl.java

@@ -8,28 +8,19 @@ import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.utils.PasswordUtils;
 import com.sckw.core.web.constant.HttpStatus;
-import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.system.api.RemoteUserService;
 import com.sckw.system.api.model.dto.req.*;
 import com.sckw.system.api.model.dto.res.*;
-import com.sckw.system.dao.KwsEnterpriseDao;
-import com.sckw.system.dao.KwsUserLoginDao;
-import com.sckw.system.dao.SysAreaDao;
-import com.sckw.system.dao.SysDictDao;
+import com.sckw.system.dao.*;
 import com.sckw.system.model.*;
 import com.sckw.system.model.pojo.FindEntUserPojo;
 import com.sckw.system.model.pojo.FindMenuTreePojo;
 import com.sckw.system.model.vo.req.FindListReqVo;
-import com.sckw.system.model.vo.req.ForgetPasswordReqVo;
 import com.sckw.system.model.vo.res.KwsMenuResVo;
 import com.sckw.system.model.vo.res.KwsUserResVo;
-import com.sckw.system.service.*;
 import jakarta.annotation.Resource;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.stereotype.Service;
-
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -46,20 +37,17 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     private RemoteBaseService remoteBaseService;
 
     @Resource
-    private KwsUserService kwsUserService;
+    private KwsUserDao kwsUserDao;
 
     @Resource
-    private KwsRoleService kwsRoleService;
+    private KwsUserRoleDao kwsUserRoleDao;
 
     @Resource
-    private KwsMenuService kwsMenuService;
+    private KwsMenuDao kwsMenuDao;
 
     @Resource
     private KwsUserLoginDao kwsUserLoginDao;
 
-    @Resource
-    private KwsEnterpriseService kwsEnterpriseService;
-
     @Resource
     private KwsEnterpriseDao kwsEnterpriseDao;
 
@@ -69,9 +57,6 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     @Resource
     private SysAreaDao sysAreaDao;
 
-    @Resource
-    private CommonService commonService;
-
 
     @Override
     public KwsEnterpriseResDto queryEnterpriseById(Long id) {
@@ -86,13 +71,13 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     @Override
     public List<UserAccessMenuInfoResDto> queryUserAccessMenu(long id) {
         FindMenuTreePojo findMenuTreePojo = new FindMenuTreePojo();
-        List<KwsUserRole> kwsUserRoles = kwsRoleService.findAllByUserId(id);
+        List<KwsUserRole> kwsUserRoles = kwsUserRoleDao.findAllByUserId(id);
         if (CollectionUtils.isEmpty(kwsUserRoles)) {
             return Collections.emptyList();
         }
         findMenuTreePojo.setRoleIds(kwsUserRoles.stream().map(KwsUserRole::getRoleId).toList());
 
-        List<KwsMenuResVo> kwsMenuResVos = kwsMenuService.findList(findMenuTreePojo);
+        List<KwsMenuResVo> kwsMenuResVos = kwsMenuDao.findList(findMenuTreePojo);
         if (CollectionUtils.isEmpty(kwsMenuResVos)) {
             return Collections.emptyList();
         }
@@ -100,12 +85,6 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         return BeanUtils.copyToList(kwsMenuResVos, UserAccessMenuInfoResDto.class);
     }
 
-    @Override
-    public void forgetPassword(ForgetPasswordReqDto reqDto) throws SystemException {
-        com.sckw.system.model.vo.req.ForgetPasswordReqVo forgetPasswordReqVo = new ForgetPasswordReqVo();
-        BeanUtils.copyProperties(reqDto, forgetPasswordReqVo);
-        kwsUserService.forgetPassword(forgetPasswordReqVo);
-    }
 
     @Override
     public void saveUserLogin(UserLoginReqDto userLoginReqDto) {
@@ -136,19 +115,9 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     }
 
 
-    @Override
-    public void updatePassword(UpdatePasswordReqDto updatePassword) {
-        kwsUserService.updatePassword(updatePassword);
-    }
-
-    @Override
-    public void resetPassword(Long id) {
-        kwsUserService.resetPassword(id);
-    }
-
     @Override
     public void bindManager(Long entId, Long userId) {
-        KwsEnterprise kwsEnterprise = kwsEnterpriseService.queryKwsEnterpriseById(entId);
+        KwsEnterprise kwsEnterprise = kwsEnterpriseDao.selectByKey(entId);
         if (Objects.isNull(kwsEnterprise)) {
             return;
         }
@@ -168,11 +137,6 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         return sysDictResDtos.stream().collect(Collectors.toMap(SysDictResDto::getId, item -> item, (oldValue, newValue) -> newValue));
     }
 
-    @Override
-    public void checkRegisterParam(String entName, String phone, Integer systemType) {
-        commonService.checkEntRepeat(entName, phone);
-        kwsUserService.checkAccountValid(phone, systemType);
-    }
 
     @Override
     public List<EntTypeResDto> queryEntTypeById(Long entId) {
@@ -234,11 +198,12 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     public List<FindEntUserResDto> findEntUser(Long entId) {
         FindListReqVo findListReqVo = new FindListReqVo();
         findListReqVo.setId(entId);
-        List<FindEntUserPojo> entUser = kwsEnterpriseService.findEntUser(findListReqVo);
-        if(CollectionUtils.isEmpty(entUser)) {
+        List<FindEntUserPojo> list = kwsEnterpriseDao.findUserByEntIds(Collections.singletonList(entId));
+        if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
-        return BeanUtils.copyToList(entUser,FindEntUserResDto.class);
+
+        return BeanUtils.copyToList(list, FindEntUserResDto.class);
     }
 
 
@@ -266,10 +231,9 @@ public class RemoteUserServiceImpl implements RemoteUserService {
      **/
     @Override
     public List<Long> findEntIds(List<Integer> entTypes, String firmName) {
-        Map<String, Object> params  = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
-            put("entTypes", entTypes);
-            put("firmName", firmName);
-        }};
+        Map<String, Object> params  = new HashMap<>(Global.NUMERICAL_FOUR);
+        params.put("entTypes", entTypes);
+        params.put("firmName", firmName);
         List<KwsEnterprise> ents = remoteBaseService.findEnts(params);
         List<Long> endIds = new ArrayList<>();
         ents.forEach(ent -> endIds.add(ent.getId()));
@@ -285,11 +249,10 @@ public class RemoteUserServiceImpl implements RemoteUserService {
      **/
     @Override
     public List<Long> findUserIds(List<Long> entIds, String userName) {
-        Map<String, Object> params = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
-            put("entIds", entIds);
-            put("userName", userName);
-        }};
-        List<KwsUserResVo> users = kwsUserService.findList(params);
+        Map<String, Object> params = new HashMap<>(Global.NUMERICAL_FOUR);
+        params.put("entIds", entIds);
+        params.put("userName", userName);
+        List<KwsUserResVo> users = kwsUserDao.findList(params);
         List<Long> userIds = new ArrayList<>();
         users.forEach(user -> userIds.add(user.getId()));
         return userIds;
@@ -299,7 +262,6 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     /**
      * 根据用户名查用户信息
      * @param username 用户账号
-     * @return
      */
     @Override
     public KwsUserResDto getUserByAccount(String username) {
@@ -327,22 +289,5 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         return remoteBaseService.queryDeptByIds(ids);
     }
 
-    @Override
-    public void register(RegisterReqDto reqDto) throws SystemException {
-        kwsUserService.register(reqDto);
-    }
-
-    @Override
-    public void checkPassword(String password, String currentPwd) throws SystemException {
-        kwsUserService.checkPassword(password, currentPwd);
-    }
-
-    @Override
-    public List<KwsUserResDto> checkUserBase(String account, int systemType) throws SystemException {
-        KwsUser kwsUser = kwsUserService.checkUserBase(account, systemType);
-        KwsUserResDto kwsUserService = new KwsUserResDto();
-        BeanUtils.copyProperties(kwsUser, kwsUserService);
-        return Collections.singletonList(kwsUserService);
-    }
 
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -398,7 +398,7 @@ public class KwsEnterpriseService {
 
 
         //子公司不用新建机构、角色等，直接返回
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = CollectionUtils.createHashMap();;
         map.put("entName", kwsEnterprise.getFirmName());
         map.put("createByName", kwsEnterprise.getContacts());
         if (Objects.nonNull(reqVo.getEntPid())) {
@@ -540,7 +540,7 @@ public class KwsEnterpriseService {
         }
         commonService.updateEntCertificate(entId, BeanUtils.copyToList(kwsEntCertificates, EntCertificateInfo.class));
 
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = CollectionUtils.createHashMap();
         map.put("entName", kwsEnterprise.getFirmName());
         map.put("createByName", LoginUserHolder.getUserName());
         MessageEnum messageEnum;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/LogisticsConsignmentController.java

@@ -56,7 +56,7 @@ public class LogisticsConsignmentController {
     public HttpResult purchaseLogisticsConsignment(@Valid @RequestBody LogisticsConsignmentParam logisticsConsignmentParam) {
         log.info("采购订单传递参数信息:{}", JSONObject.toJSONString(logisticsConsignmentParam));
         try {
-            return logisticsConsignmentService.purchaseLogisticsConsignment(logisticsConsignmentParam);
+            return logisticsConsignmentService.purchaseLogisticsConsignment(logisticsConsignmentParam,"1");
         } catch (Exception e) {
             OrderGenerateSeqNoUtils.getSeqNoMinusOne(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER);
             log.error("采购订单-物流托运生成托运订单 error :{}", e.getMessage(), e);
@@ -202,7 +202,7 @@ public class LogisticsConsignmentController {
     public HttpResult sellLogisticsConsignment(@Valid @RequestBody LogisticsConsignmentParam logisticsConsignmentParam) {
         log.info("销售订单-物流托运生成托运订单 传递参数信息:{}", JSONObject.toJSONString(logisticsConsignmentParam));
         try {
-            return logisticsConsignmentService.sellLogisticsConsignment(logisticsConsignmentParam);
+            return logisticsConsignmentService.sellLogisticsConsignment(logisticsConsignmentParam,"2");
         } catch (Exception e) {
             OrderGenerateSeqNoUtils.getSeqNoMinusOne(RedisOrderGenerateEnum.LOGISTICS_ORDER,OrderRuleEnum.LOGISTICS_ORDER);
             log.error("物流托运 error :{}", e.getMessage(), e);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderAddressMapper.java

@@ -6,26 +6,43 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
+/**
+ * @author zk
+ * @desc 车辆运单地址
+ * @date 2023/10/16
+ */
 @Mapper
 public interface KwtWaybillOrderAddressMapper extends BaseMapper<KwtWaybillOrderAddress> {
 
+    /**
+     * 新增
+     * @param params 新增参数
+     * @desc 新增
+     * @author zk
+     * @date 2023/7/20
+     * @return 更新记录数
+     **/
     int insert1(KwtWaybillOrderAddress params);
 
     /**
+     * 查询车辆运单装卸货地址信息
      * @param wOrderId 车辆订单id
      * @param addressType 地址类型（1装货地址、2卸货地址）
      * @desc 查询车辆运单装卸货地址信息
      * @author zk
      * @date 2023/7/20
+     * @return 运单地址信息
      **/
     KwtWaybillOrderAddress findByAddress(@Param("wOrderId") Long wOrderId, @Param("addressType") Integer addressType);
 
     /**
+     * 查询车辆运单装卸货地址CODE
      * @param entId 企业信息
      * @param addressType 地址类型（1装货地址、2卸货地址）
      * @desc 查询车辆运单装卸货地址CODE
      * @author zk
      * @date 2023/7/20
+     * @return 运单地址code
      **/
     List<Integer> findAddressCodeList(@Param("entId") Long entId, @Param("addressType") Integer addressType);
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderMapper.java

@@ -15,21 +15,34 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * @author zk
+ * @desc 车辆运单
+ * @date 2023/10/16
+ */
 @Mapper
 public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
-    int deleteByPrimaryKey(Long id);
-
+    /**
+     * 新增
+     * @param record 新增参数
+     * @desc 新增
+     * @author zk
+     * @date 2023/7/31
+     * @return 新增数量
+     **/
     @Override
     int insert(KwtWaybillOrder record);
 
-    int insertSelective(KwtWaybillOrder record);
-
-    KwtWaybillOrder selectByPrimaryKey(Long id);
-
-    int updateByPrimaryKeySelective(KwtWaybillOrder record);
-
-    int updateByPrimaryKey(KwtWaybillOrder record);
-
+    /**
+     * 查询车辆信息
+     * @param id 运单ID
+     * @param page 分页参数
+     * @param pageSize 分页参数
+     * @desc 查询车辆信息
+     * @author zk
+     * @date 2023/7/31
+     * @return 销售订单-采购订单-车辆信息
+     **/
     List<OrderCarDTO> selectWaybillOrderCarList(@Param("id") String id, @Param("page") int page, @Param("pageSize") int pageSize);
 
     /**
@@ -38,114 +51,131 @@ public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
      * @param statusList
      * @param page
      * @param pageSize
-     * @return
+     * @return 销售订单-采购订单-车辆信息
      */
     List<OrderCarDTO> selectWaybillOrderCarListGroupByTruckNo(@Param("ids") List<String> ids, @Param("statusList") List<Integer> statusList , @Param("page") int page, @Param("pageSize") int pageSize);
 
+    /**
+     * 贸易订单对应车辆运单数
+     * @param id 贸易订单ID
+     * @return 关联数量
+     */
     Long selectWaybillOrderCarCount(@Param("id") String id);
 
     /**
      * 根据司机id+定义状态统计
-     *
      * @param id
      * @param status
-     * @return
+     * @return 统计数
      */
     TableTops statistics(@Param("id") Long id, @Param("status") List<Long> status);
 
     /**
      * 根据司机id+运单状态获取物流订单id
-     *
      * @param id
      * @param status
-     * @return
+     * @return 物流订单id
      */
     List<Long> selectDriverOrder(@Param("id") Long id, @Param("status") List<Long> status);
 
     /**
      * 根基运单ID查询关联数据
-     *
      * @param id
-     * @return
+     * @return 订单详情
      */
     WayBillDetailDTO selectWaybillRelate(@Param("id") Long id);
 
     /**
      * 通过物流订单id+车辆运单状态查询是否存在处理中的数据
-     *
      * @param id
      * @param statusList
-     * @return
+     * @return 处理中的数据
      */
     int selectDataByLorderId(@Param("id") String id, @Param("statusList") List<Integer> statusList);
 
     /**
+     * 统计车辆运单
      * @param params {lOrderId 物流订单id, upperlOrderId 下级分包物流订单,belowlOrderId 所属上级分包, loadCountStatus 有效装货状态, unloadCountStatus 有效卸货状态}
      * @desc 统计车辆运单
      * @author zk
      * @date 2023/7/31
+     * @return 统计数据
      **/
     WaybillCountVo findWaybillOrderCount(Map<String, Object> params);
 
     /**
+     * 统计司机任务数(待接单/出车/执行/完结)
      * @param driverId 司机ID
      * @desc 统计司机任务数(待接单/出车/执行/完结)
      * @author zk
      * @date 2023/8/1
+     * @return 统计数据
      **/
     Map<String, Object> findStatisticsCountByDriver(@Param("driverId") Long driverId);
 
     /**
+     * 统计司机任务数（任务数/委派量/装货量/卸货量/亏吨量/亏吨扣款）
      * @param params {driverId 司机ID, month月份}
      * @desc 统计司机任务数（任务数/委派量/装货量/卸货量/亏吨量/亏吨扣款）
      * @author zk
      * @date 2023/8/1
+     * @return 统计数据
      **/
     Map<String, BigDecimal> findStatisticsSumByDriver(Map<String, Object> params);
 
     /**
+     * 统计司机任务数（任务数/委派量/装货量/卸货量/亏吨量/亏吨扣款）
      * @param params {driverId 司机ID, month月份}
      * @desc 统计司机任务数（任务数/委派量/装货量/卸货量/亏吨量/亏吨扣款）
      * @author zk
      * @date 2023/8/1
+     * @return 口亏量
      **/
     BigDecimal deficitLossAmountByDriver(Map<String, Object> params);
 
     /**
+     * 查询司机任务列表-待接单
      * @param params {driverId 司机ID}
      * @desc 查询司机任务列表-待接单
      * @author zk
      * @date 2023/8/1
+     * @return 待接单运单
      **/
     List<WaybillOrderDriverVo> findWaitWaybillOrderByDriver(Map<String, Object> params);
 
     /**
+     * 查询司机任务列表-出车/执行/完结
      * @param params {driverId 司机ID, busStatus 状态 2出车/3执行/4完结, month月份}
      * @desc 查询司机任务列表-出车/执行/完结
      * @author zk
      * @date 2023/8/1
+     * @return 运单数据
      **/
     List<WaybillOrderDriverVo> findOtherWaybillOrderByDriver(Map<String, Object> params);
 
     /**
-     *易订单id查找相关联车辆信息
+     * 易订单id查找相关联车辆信息
      * @param id
-     * @return
+     * @return 车辆信息
      */
     List<OrderCarDTO> selectWaybillOrderCarListNotPage(@Param("id") String id);
 
     /**
-     *贸易订单ids查找相关联车辆信息
+     * 贸易订单ids查找相关联车辆信息
      * @param ids   贸易订单ids
-     * @return
+     * @return 车辆信息
      */
     List<OrderCarDTO> selectWaybillOrderCarListByTradeOrderId(@Param("ids") List<Long> ids);
 
     /**
      * 按状态统计运单
      * @param entId 企业ID
+     * @param createBys 创建人
      * @param statuses 查询状态
-     * @return
+     * @param keyword 关键字
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @return 统计数据
      */
     Long selectWaybillOrderCountByStatus(
             @Param("entId") Long entId,
@@ -155,13 +185,26 @@ public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
             @Param("startDate") String startDate,
             @Param("endDate") String endDate);
 
-    Map<String,Object> selectOrderByOrderId(@Param("orderId") Long orderId, @Param("type") Integer type, @Param("statusList") List<Long> statusList);
+    /**
+     * 查询订单
+     * @param orderId 订单id
+     * @param type 类型
+     * @param statusList 状态集
+     * @return 订单信息
+     */
+    Map<String,Object> selectOrderByOrderId(@Param("orderId") Long orderId,
+                                            @Param("type") Integer type,
+                                            @Param("statusList") List<Long> statusList);
 
     /**
      * 按装卸量统计运单
      * @param entId 企业ID
+     * @param createBys 创建人
      * @param statuses 查询状态
-     * @return
+     * @param keyword 关键字
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @return 统计数据
      */
     List<WaybillAmountDTO> selectWaybillOrdersByStatus(
             @Param("entId") Long entId,
@@ -172,26 +215,34 @@ public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
             @Param("endDate") String endDate
     );
 
-
+    /**
+     * 查询最大运单编号
+     * @param lOrderNo 运单编号
+     * @return 运单编号
+     */
     String getMaxOrderNo(@Param("lOrderNo") String lOrderNo);
 
     /**
+     * 查询车辆运单
      * @param params {driverId 司机ID, truckNo车牌号, busStatus 状态 2出车/3执行/4完结}
      * @desc 查询车辆运单
      * @author zk
      * @date 2023/9/6
+     * @return 运单信息
      **/
     List<KwtWaybillOrder> findWaybillOrder(Map<String, Object> params);
 
-
     /**
      * 托运订单-承运订单-通过单据号根据车牌号分组获取车辆信息统计信息
      * @param ids
      * @param statusList
      * @param page
      * @param pageSize
-     * @return
+     * @return 运单关联司机信息
      */
-    List<OrderCarDTO> selectInvalidWaybillOrderCarListGroupByTruckNo(@Param("ids") List<String> ids, @Param("statusList") List<Integer> statusList , @Param("page") int page, @Param("pageSize") int pageSize);
+    List<OrderCarDTO> selectInvalidWaybillOrderCarListGroupByTruckNo(@Param("ids") List<String> ids,
+                                                                     @Param("statusList") List<Integer> statusList ,
+                                                                     @Param("page") int page,
+                                                                     @Param("pageSize") int pageSize);
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderTicketMapper.java

@@ -5,15 +5,22 @@ import com.sckw.transport.model.KwtWaybillOrderTicket;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+/**
+ * @author zk
+ * @desc 车辆运单榜单
+ * @date 2023/10/16
+ */
 @Mapper
 public interface KwtWaybillOrderTicketMapper extends BaseMapper<KwtWaybillOrderTicket> {
 
     /**
+     * 查询车辆运单榜单信息
      * @param wOrderId 车辆订单id
      * @param type 磅单类型（1装货单/2卸货单）
      * @desc 查询车辆运单榜单信息
      * @author zk
      * @date 2023/7/27
+     * @return 榜单信息
      **/
     KwtWaybillOrderTicket findWaybillOrderTicket(@Param("wOrderId") Long wOrderId, @Param("type") Integer type);
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderTrackMapper.java

@@ -5,27 +5,30 @@ import com.sckw.transport.model.KwtWaybillOrderTrack;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+/**
+ * @author zk
+ * @desc 车辆运单状态记录
+ * @date 2023/10/16
+ */
 @Mapper
 public interface KwtWaybillOrderTrackMapper extends BaseMapper<KwtWaybillOrderTrack> {
-    int deleteByPrimaryKey(Long id);
 
+    /**
+     * 新增运单状态记录
+     * @param record 新增信息
+     * @return 更新记录数
+     */
     @Override
     int insert(KwtWaybillOrderTrack record);
 
-    int insertSelective(KwtWaybillOrderTrack record);
-
-    KwtWaybillOrderTrack selectByPrimaryKey(Long id);
-
-    int updateByPrimaryKeySelective(KwtWaybillOrderTrack record);
-
-    int updateByPrimaryKey(KwtWaybillOrderTrack record);
-
     /**
+     * 查询车辆运单状态信息
      * @param wOrderId 车辆订单id
      * @param status 状态
      * @desc 查询车辆运单状态信息
      * @author zk
      * @date 2023/7/27
+     * @return 车辆运单状态信息
      **/
     KwtWaybillOrderTrack findWaybillOrderTrack(@Param("wOrderId") Long wOrderId, @Param("status") Integer status);
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtLogisticsOrderUnit.java

@@ -39,7 +39,7 @@ public class KwtLogisticsOrderUnit implements Serializable {
     private Long entId;
 
     /**
-     * 一级企业id
+     * 一级企业id-存放对方数据
      */
     private Long topEntId;
 

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

@@ -134,7 +134,7 @@ public class AddOrderDTO {
      * 总量
      */
     @NotNull(message = "总量不能为空")
-    @Digits(integer = 10, fraction = 2, message = "总量格式错误")
+    @Digits(integer = 8, fraction = 2, message = "总量格式错误")
     @DecimalMin(value = "0.00", message = "总量最小值为{value}")
     private BigDecimal amount;
 

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

@@ -171,8 +171,7 @@ public class AcceptCarriageOrderService {
             httpResult.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
             return httpResult;
         }
-        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                .eq(KwtLogisticsOrder::getId, bo.getLOrderId()));
+        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getId, bo.getLOrderId()));
         if (logisticsOrder == null) {
             log.error("订单id查找失败:{},订单编号:{}", bo.getLOrderId(), bo.getLOrderNo());
             throw new BusinessException("单据错误,数据不存在");
@@ -217,11 +216,9 @@ public class AcceptCarriageOrderService {
         if (waitDistributionAmount.compareTo(new BigDecimal("0.00")) == 0) {
             throw new RuntimeException("剩余可分配量为0，不可进行分包操作！");
         }
-        int level = logisticsLevel(logisticsOrder);
-        long number = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                        .eq(KwtLogisticsOrder::getDelFlag, NumberConstant.ZERO)
-                        .apply(logisticsOrder.getId() != null, "FIND_IN_SET ('" + bo.getLOrderId() + "', pids)").ne(KwtLogisticsOrder::getId, bo.getLOrderId()))
-                .stream().count();
+//        int level = logisticsLevel(logisticsOrder);
+        int level = newLogisticsLevel(logisticsOrder);
+        long number = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getDelFlag, NumberConstant.ZERO).apply(logisticsOrder.getId() != null, "FIND_IN_SET ('" + bo.getLOrderId() + "', pids)").ne(KwtLogisticsOrder::getId, bo.getLOrderId())).stream().count();
         String pidOrderNo = logisticsOrder.getLOrderNo();
         String substring = pidOrderNo.substring(0, 11);
         String lOrderNo = substring + logisticsOrder.getType() + String.valueOf(level) + String.valueOf(number + 1);
@@ -230,10 +227,8 @@ public class AcceptCarriageOrderService {
          * 需要记录当前分包数据-分包上游数据
          * */
         /**
-         * 判断是否已存在分包【当前分包只允许加上主单一共三级】*/
-        Long count = logisticsOrderMapper.selectCount(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                .in(KwtLogisticsOrder::getPids, bo.getLOrderId()));
-        if (count > NumberConstant.TWO) {
+         * 判断是否已存在分包【当前分包只允许加上主单一共四级】*/
+        if (level >= 4) {
             throw new RuntimeException("分包次数已达上限!");
         }
         String pids = logisticsOrder.getPids();
@@ -264,10 +259,7 @@ public class AcceptCarriageOrderService {
         } else if (NumberConstant.ZERO == status) {
             orderStatus = LogisticsOrderEnum.PENDING_ORDER.getCode();
         } else {
-            log.info("承运订单-分包托运物流托运 承运订单id:{}," +
-                            "承运订单编号:{},合同id:{},合同信息:{}",
-                    bo.getLOrderId(), bo.getLOrderNo(),
-                    bo.getContractId(), JSONObject.toJSONString(infoResDto));
+            log.info("承运订单-分包托运物流托运 承运订单id:{}," + "承运订单编号:{},合同id:{},合同信息:{}", bo.getLOrderId(), bo.getLOrderNo(), bo.getContractId(), JSONObject.toJSONString(infoResDto));
             throw new RuntimeException("生成物流托运合同异常");
         }
         //主体信息保存
@@ -305,11 +297,7 @@ public class AcceptCarriageOrderService {
         carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
 
 //        commonService.initIatingLogisticsConsignment(checkUnit, carriageUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId());
-        commonService.newSendLogisticsOrderToMessage(carriageUnit,checkUnit,  logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
-                messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
-                messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT,MessageEnum.NEW_CARRIAGE_ORDER,
-                "1");
+        commonService.newSendLogisticsOrderToMessage(carriageUnit, checkUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(), messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(), MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT, MessageEnum.NEW_CARRIAGE_ORDER, "1");
 
         //修改父级mongodb数据
         //更新mongodb
@@ -353,8 +341,7 @@ public class AcceptCarriageOrderService {
         logisticsOrder.setLOrderPid(Long.parseLong(bo.getLOrderId()));
         logisticsOrder.setSettlementCycle(bo.getSettlementCycle());
         logisticsOrder.setPrice(bo.getPrice());
-        logisticsOrder.setPriceType(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()) == null ?
-                null : Long.parseLong(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()).getValue()));
+        logisticsOrder.setPriceType(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()) == null ? null : Long.parseLong(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()).getValue()));
         if (!bo.getIsFullDose()) {
             if (ArrayUtil.isEmpty(bo.getCarryingCapacity())) {
                 throw new RuntimeException("不是全量分配时,分配量不能为空!");
@@ -400,12 +387,8 @@ public class AcceptCarriageOrderService {
         logisticsOrder.setCarrierEntId(Long.parseLong(bo.getConsignCompanyId()));
         logisticsOrder.setCarrierFirmName(bo.getConsignCompany());
         logisticsOrder.setCarrierContacts(bo.getConsignContacts());
-        KwtLogisticsOrderAddress orderLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                .eq(KwtLogisticsOrderAddress::getLOrderId, kwtLogisticsOrder.getId())
-                .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
-        KwtLogisticsOrderAddress orderUnLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                .eq(KwtLogisticsOrderAddress::getLOrderId, kwtLogisticsOrder.getId())
-                .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
+        KwtLogisticsOrderAddress orderLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>().eq(KwtLogisticsOrderAddress::getLOrderId, kwtLogisticsOrder.getId()).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
+        KwtLogisticsOrderAddress orderUnLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>().eq(KwtLogisticsOrderAddress::getLOrderId, kwtLogisticsOrder.getId()).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
         if (!ObjectUtils.isEmpty(orderLoadAddress)) {
             logisticsOrder.setLoadType(orderLoadAddress.getType());
             logisticsOrder.setLoadCityCode(orderLoadAddress.getCityCode());
@@ -478,12 +461,8 @@ public class AcceptCarriageOrderService {
     private void insertSubcontractLogisticsOrderAddress(SubcontractConsignmentDTO bo, Long orderId, KwtLogisticsOrder logisticsOrder) {
         KwtLogisticsOrderAddress loadOrderAddress = new KwtLogisticsOrderAddress();
         KwtLogisticsOrderAddress unloadOrderAddress = new KwtLogisticsOrderAddress();
-        KwtLogisticsOrderAddress orderLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                .eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrder.getId())
-                .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
-        KwtLogisticsOrderAddress orderUnLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                .eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrder.getId())
-                .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
+        KwtLogisticsOrderAddress orderLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>().eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrder.getId()).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
+        KwtLogisticsOrderAddress orderUnLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>().eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrder.getId()).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
         if (!ObjectUtils.isEmpty(orderLoadAddress)) {
             loadOrderAddress.setId(new IdWorker(NumberConstant.ONE).nextId());
             loadOrderAddress.setAddressType(NumberConstant.ONE);
@@ -544,38 +523,10 @@ public class AcceptCarriageOrderService {
 //        .setContactsId(consignentMap.get(Long.parseLong(bo.getConsignCompanyId())).getContactsId())
         EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getCheckCompanyId()));
 ////.setContactsId(checkentMap.get(Long.parseLong(bo.getCheckCompanyId())).getContactsId())
-        KwtLogisticsOrderUnit checkUnit = new KwtLogisticsOrderUnit()
-                .setLOrderId(orderId)
-                .setId(new IdWorker(NumberConstant.ONE).nextId())
-                .setUnitType(NumberConstant.ONE)
-                .setFirmName(bo.getCheckCompany())
-                .setRemark(bo.getRemark())
-                .setTopEntId(checkentMap == null ? null : checkentMap.getId())
-                .setEntId(Long.parseLong(bo.getCheckCompanyId()))
-                .setContacts(bo.getCheckContacts())
-                .setPhone(bo.getCheckContactPhone())
-                .setCreateBy(LoginUserHolder.getUserId())
-                .setCreateTime(new Date())
-                .setUpdateBy(LoginUserHolder.getUserId())
-                .setUpdateTime(new Date())
-                .setContactsId(Long.parseLong(bo.getCheckContactsId()));
+        KwtLogisticsOrderUnit checkUnit = new KwtLogisticsOrderUnit().setLOrderId(orderId).setId(new IdWorker(NumberConstant.ONE).nextId()).setUnitType(NumberConstant.ONE).setFirmName(bo.getCheckCompany()).setRemark(bo.getRemark()).setTopEntId(checkentMap == null ? null : checkentMap.getId()).setEntId(Long.parseLong(bo.getCheckCompanyId())).setContacts(bo.getCheckContacts()).setPhone(bo.getCheckContactPhone()).setCreateBy(LoginUserHolder.getUserId()).setCreateTime(new Date()).setUpdateBy(LoginUserHolder.getUserId()).setUpdateTime(new Date()).setContactsId(Long.parseLong(bo.getCheckContactsId()));
         logisticsOrderUnitMapper.insert(checkUnit);
 
-        KwtLogisticsOrderUnit consignUnit = new KwtLogisticsOrderUnit()
-                .setLOrderId(orderId)
-                .setId(new IdWorker(NumberConstant.ONE).nextId())
-                .setUnitType(NumberConstant.TWO)
-                .setFirmName(bo.getConsignCompany())
-                .setRemark(bo.getRemark())
-                .setTopEntId(consignentMap == null ? null : consignentMap.getId())
-                .setEntId(Long.parseLong(bo.getConsignCompanyId()))
-                .setContacts(bo.getConsignContacts())
-                .setPhone(bo.getConsignContactPhone())
-                .setCreateBy(LoginUserHolder.getUserId())
-                .setCreateTime(new Date())
-                .setUpdateBy(LoginUserHolder.getUserId())
-                .setUpdateTime(new Date())
-                .setContactsId(Long.parseLong(bo.getConsignContactsId()));
+        KwtLogisticsOrderUnit consignUnit = new KwtLogisticsOrderUnit().setLOrderId(orderId).setId(new IdWorker(NumberConstant.ONE).nextId()).setUnitType(NumberConstant.TWO).setFirmName(bo.getConsignCompany()).setRemark(bo.getRemark()).setTopEntId(consignentMap == null ? null : consignentMap.getId()).setEntId(Long.parseLong(bo.getConsignCompanyId())).setContacts(bo.getConsignContacts()).setPhone(bo.getConsignContactPhone()).setCreateBy(LoginUserHolder.getUserId()).setCreateTime(new Date()).setUpdateBy(LoginUserHolder.getUserId()).setUpdateTime(new Date()).setContactsId(Long.parseLong(bo.getConsignContactsId()));
         logisticsOrderUnitMapper.insert(consignUnit);
     }
 
@@ -612,9 +563,7 @@ public class AcceptCarriageOrderService {
      * @param orderStatus    当前单据状态
      * @param logisticsOrder 父级物流订单
      */
-    private void insertSubcontractLogisticsOrder(SubcontractConsignmentDTO bo, String lOrderNo,
-                                                 KwtLogisticsOrder order,
-                                                 Long orderId, String pids, Integer orderStatus, KwtLogisticsOrder logisticsOrder) {
+    private void insertSubcontractLogisticsOrder(SubcontractConsignmentDTO bo, String lOrderNo, KwtLogisticsOrder order, Long orderId, String pids, Integer orderStatus, KwtLogisticsOrder logisticsOrder) {
         order.setId(orderId);
         order.setEntId(LoginUserHolder.getEntId());
         order.setType(logisticsOrder.getType());
@@ -627,17 +576,14 @@ public class AcceptCarriageOrderService {
         order.setPids(pids);
         order.setSettlementCycle(bo.getSettlementCycle());
         order.setPrice(bo.getPrice());
-        order.setPriceType(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()) == null ?
-                null : Long.parseLong(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()).getValue()));
+        order.setPriceType(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()) == null ? null : Long.parseLong(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()).getValue()));
         order.setAmount(bo.getCarryingCapacity());
         order.setBillingMode(bo.getBillingMode());
         order.setLoss(bo.getLoss());
 //        order.setLossUnit(bo.getLossUnit());
-        order.setLossUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()) == null ?
-                null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()).getValue());
+        order.setLossUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()) == null ? null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()).getValue());
         order.setGoodsPrice(bo.getGoodsPrice() == null ? null : bo.getGoodsPrice());
-        order.setGoodsPriceUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()) == null ?
-                null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()).getValue());
+        order.setGoodsPriceUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()) == null ? null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()).getValue());
 //        order.setGoodsPriceUnit(bo.getGoodsPriceUnit());
         order.setStartTime(bo.getShipmentsDateTime() == null ? null : DateUtil.localDateToLocalDateTimeStart(bo.getShipmentsDateTime()));
         order.setEndTime(bo.getReceiveGoodsDateTime() == null ? null : DateUtil.localDateToLocalDateTimeEnd(bo.getReceiveGoodsDateTime()));
@@ -704,11 +650,8 @@ public class AcceptCarriageOrderService {
             result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
             return result;
         }
-        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                        .eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId())
-                        .eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo())
-                /*.eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId())*/
-        );
+        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId()).eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo())
+                /*.eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId())*/);
         if (logisticsOrder == null) {
             result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
             result.setMsg("单据不存在!");
@@ -719,8 +662,7 @@ public class AcceptCarriageOrderService {
             result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
             return result;
         }
-        KwtLogisticsOrderContract contract = kwtLogisticsOrderContractMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderContract>()
-                .eq(KwtLogisticsOrderContract::getLOrderId, orderDTO.getLOrderId()));
+        KwtLogisticsOrderContract contract = kwtLogisticsOrderContractMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderContract>().eq(KwtLogisticsOrderContract::getLOrderId, orderDTO.getLOrderId()));
         if (contract == null) {
             result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
             result.setMsg("该订单并未存在合同信息!");
@@ -757,51 +699,28 @@ public class AcceptCarriageOrderService {
         } else if (NumberConstant.ZERO == status) {
             orderStatus = LogisticsOrderEnum.WAIT_DELIVERY.getCode();
         } else {
-            log.info("接单 物流订单id:{}," +
-                            "物流订单编号:{},合同id:{},合同信息:{}",
-                    orderDTO.getLOrderId(), orderDTO.getLOrderNo(),
-                    contract.getContractId(), JSONObject.toJSONString(infoResDto));
+            log.info("接单 物流订单id:{}," + "物流订单编号:{},合同id:{},合同信息:{}", orderDTO.getLOrderId(), orderDTO.getLOrderNo(), contract.getContractId(), JSONObject.toJSONString(infoResDto));
             throw new RuntimeException("物流订单-接单异常");
         }
         if (orderDTO.getType()) {
             //修改单据状态
-            logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
-                    .eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId())
-                    .eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo())
-                    .set(KwtLogisticsOrder::getStatus, orderStatus)
-                    .set(KwtLogisticsOrder::getUpdateTime, new Date())
-                    .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId()));
+            logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>().eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId()).eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo()).set(KwtLogisticsOrder::getStatus, orderStatus).set(KwtLogisticsOrder::getUpdateTime, new Date()).set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId()));
             /**消息列表推送*/
             Long id = logisticsOrder.getId();
-            KwtLogisticsOrderUnit consignOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                    .eq(KwtLogisticsOrderUnit::getLOrderId, id)
-                    .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
-            KwtLogisticsOrderUnit carriageOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                    .eq(KwtLogisticsOrderUnit::getLOrderId, id)
-                    .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
+            KwtLogisticsOrderUnit consignOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(KwtLogisticsOrderUnit::getLOrderId, id).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
+            KwtLogisticsOrderUnit carriageOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(KwtLogisticsOrderUnit::getLOrderId, id).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
 //            commonService.publicLogisticsConsignmentPushMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(),
 //                    logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
 //                    MessageEnum.CONSIGN_ACCEPT_LOGISTICS, MessageEnum.CARRIAGE_ACCEPT_LOGISTICS);
-            commonService.newSendLogisticsOrderToMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(),
-                    logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
-                    messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
-                    messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                    MessageEnum.CONSIGN_ACCEPT_LOGISTICS, MessageEnum.CARRIAGE_ACCEPT_LOGISTICS, "1");
+            commonService.newSendLogisticsOrderToMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(), messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(), MessageEnum.CONSIGN_ACCEPT_LOGISTICS, MessageEnum.CARRIAGE_ACCEPT_LOGISTICS, "1");
         } else {
             orderStatus = LogisticsOrderEnum.REJECT_ORDER.getCode();
             //todo 改为拒绝接单  数据统计在页面已退回状态中
-            logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
-                    .eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId())
-                    .eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo())
-                    .set(KwtLogisticsOrder::getStatus, orderStatus)
-                    .set(KwtLogisticsOrder::getUpdateTime, new Date())
-                    .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId()));
+            logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>().eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId()).eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo()).set(KwtLogisticsOrder::getStatus, orderStatus).set(KwtLogisticsOrder::getUpdateTime, new Date()).set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId()));
 
             /**数据回退至贸易订单/上级物流订单*/
             if (logisticsOrder.getPid() != null) {
-                KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                        .eq(KwtLogisticsOrder::getId, logisticsOrder.getPid())
-                );
+                KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getId, logisticsOrder.getPid()));
                 if (kwtLogisticsOrder != null) {
                     kwtLogisticsOrder.setEntrustAmount(kwtLogisticsOrder.getEntrustAmount().subtract(logisticsOrder.getAmount()));
                     kwtLogisticsOrder.setSubcontractAmount(kwtLogisticsOrder.getSubcontractAmount().subtract(logisticsOrder.getAmount()));
@@ -841,24 +760,15 @@ public class AcceptCarriageOrderService {
 
             /**消息列表推送*/
             Long id = logisticsOrder.getId();
-            KwtLogisticsOrderUnit consignOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                    .eq(KwtLogisticsOrderUnit::getLOrderId, id)
-                    .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
-            KwtLogisticsOrderUnit carriageOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                    .eq(KwtLogisticsOrderUnit::getLOrderId, id)
-                    .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
+            KwtLogisticsOrderUnit consignOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(KwtLogisticsOrderUnit::getLOrderId, id).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
+            KwtLogisticsOrderUnit carriageOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(KwtLogisticsOrderUnit::getLOrderId, id).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
 //            commonService.publicLogisticsConsignmentPushMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(),
 //                    logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
 //                    MessageEnum.REJECT_ORDER, MessageEnum.CARRIAGE_DISALLOTMENT);
-            commonService.newSendLogisticsOrderToMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(),
-                    logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
-                    messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
-                    messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                    MessageEnum.REJECT_ORDER, MessageEnum.CARRIAGE_DISALLOTMENT, "1");
+            commonService.newSendLogisticsOrderToMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(), messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(), MessageEnum.REJECT_ORDER, MessageEnum.CARRIAGE_DISALLOTMENT, "1");
         }
         //状态表新增状态数据
-        KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
-                .eq(KwtLogisticsOrderTrack::getLOrderId, orderDTO.getLOrderId()).eq(KwtLogisticsOrderTrack::getStatus, orderStatus));
+        KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>().eq(KwtLogisticsOrderTrack::getLOrderId, orderDTO.getLOrderId()).eq(KwtLogisticsOrderTrack::getStatus, orderStatus));
         if (track == null) {
             KwtLogisticsOrderTrack orderTrack = new KwtLogisticsOrderTrack();
             orderTrack.setId(new IdWorker(NumberConstant.ONE).nextId());
@@ -900,14 +810,10 @@ public class AcceptCarriageOrderService {
      */
     public HttpResult getWaybillData(String wOrderId) {
         SckwWaybillOrder sckwWaybillOrder = mongoTemplate.findById(Long.parseLong(wOrderId), SckwWaybillOrder.class);
-        KwtWaybillOrder waybillOrder = waybillOrderMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrder>()
-                .eq(KwtWaybillOrder::getId, wOrderId));
-        KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                .eq(KwtLogisticsOrder::getId, waybillOrder.getLOrderId()));
+        KwtWaybillOrder waybillOrder = waybillOrderMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrder>().eq(KwtWaybillOrder::getId, wOrderId));
+        KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getId, waybillOrder.getLOrderId()));
         SysDictResDto sysDictResDto = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.TAX_RATE_TYPE.getType(), kwtLogisticsOrder.getLossUnit());
-        List<KwtWaybillOrderTicket> kwtWaybillOrderTickets = waybillOrderTicketMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrderTicket>()
-                .eq(KwtWaybillOrderTicket::getWOrderId, Long.parseLong(wOrderId))
-        );
+        List<KwtWaybillOrderTicket> kwtWaybillOrderTickets = waybillOrderTicketMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrderTicket>().eq(KwtWaybillOrderTicket::getWOrderId, Long.parseLong(wOrderId)));
         WaybillDetailVO vo = new WaybillDetailVO();
         vo.setSendCarWeigh(waybillOrder.getEntrustAmount());
         vo.setLoadAmount(waybillOrder.getLoadAmount());
@@ -1284,12 +1190,7 @@ public class AcceptCarriageOrderService {
                     jsonObject.put("status", HttpStatus.GLOBAL_EXCEPTION_CODE);
                     jsonObject.put("message", "单据不存在或者单据异常");
                 } else {
-                    logisticsOrderCirculateMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>()
-                            .set(KwtLogisticsOrderCirculate::getStatus, NumberConstant.ONE)
-                            .set(KwtLogisticsOrderCirculate::getUpdateBy, LoginUserHolder.getUserId())
-                            .set(KwtLogisticsOrderCirculate::getUpdateTime, new Date())
-                            .eq(KwtLogisticsOrderCirculate::getWOrderId, wOrderId)
-                    );
+                    logisticsOrderCirculateMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>().set(KwtLogisticsOrderCirculate::getStatus, NumberConstant.ONE).set(KwtLogisticsOrderCirculate::getUpdateBy, LoginUserHolder.getUserId()).set(KwtLogisticsOrderCirculate::getUpdateTime, new Date()).eq(KwtLogisticsOrderCirculate::getWOrderId, wOrderId));
                     /**更新MongoDB*/
                     SckwWaybillOrder order = new SckwWaybillOrder();
                     order.setStatus(NumberConstant.ONE);
@@ -1320,12 +1221,7 @@ public class AcceptCarriageOrderService {
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("circulateId", circulateId);
 
-                logisticsOrderCirculateMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>()
-                        .set(KwtLogisticsOrderCirculate::getStatus, NumberConstant.ONE)
-                        .set(KwtLogisticsOrderCirculate::getUpdateBy, LoginUserHolder.getUserId())
-                        .set(KwtLogisticsOrderCirculate::getUpdateTime, new Date())
-                        .eq(KwtLogisticsOrderCirculate::getId, circulateId)
-                );
+                logisticsOrderCirculateMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>().set(KwtLogisticsOrderCirculate::getStatus, NumberConstant.ONE).set(KwtLogisticsOrderCirculate::getUpdateBy, LoginUserHolder.getUserId()).set(KwtLogisticsOrderCirculate::getUpdateTime, new Date()).eq(KwtLogisticsOrderCirculate::getId, circulateId));
                 /**更新MongoDB*/
                 SckwWaybillOrder order = new SckwWaybillOrder();
                 order.set_id(circulateId);
@@ -1467,8 +1363,7 @@ public class AcceptCarriageOrderService {
         /**完结订单 不做页面填写数量与数据库数量进行计算验证-直接获取页面填写数据进行保存处理*/
         //物流订单id
         String id = orderFinishDTO.getId();
-        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                .eq(KwtLogisticsOrder::getId, id));
+        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getId, id));
         if (logisticsOrder == null) {
             throw new RuntimeException("承运订单-完结订单-物流单据不存在!");
         }
@@ -1486,8 +1381,7 @@ public class AcceptCarriageOrderService {
 //            throw new BusinessException("完结订单,填写卸货量不能大于装货量");
 //        }
         /**订单状态验证*/
-        if (!LogisticsOrderEnum.WAIT_DELIVERY.getStatus().equals(String.valueOf(logisticsOrder.getStatus()))
-                && !LogisticsOrderEnum.IN_TRANSIT.getStatus().equals(String.valueOf(logisticsOrder.getStatus()))) {
+        if (!LogisticsOrderEnum.WAIT_DELIVERY.getStatus().equals(String.valueOf(logisticsOrder.getStatus())) && !LogisticsOrderEnum.IN_TRANSIT.getStatus().equals(String.valueOf(logisticsOrder.getStatus()))) {
             throw new RuntimeException("当前订单并不属于【待派车】,【运输中】状态");
         }
         /**完结拦截*/
@@ -1510,9 +1404,7 @@ public class AcceptCarriageOrderService {
         updateDataByItself(logisticsOrder, orderFinishDTO, ignoreAmount);
         //获取物流订单下的子单
         /**完结订单-对应物流订单下子订单都要进行完结*/
-        List<KwtLogisticsOrder> kwtLogisticsOrders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                .eq(KwtLogisticsOrder::getDelFlag, NumberConstant.ZERO)
-                .apply(id != null, "FIND_IN_SET ('" + id + "', pids)").ne(KwtLogisticsOrder::getId, id));
+        List<KwtLogisticsOrder> kwtLogisticsOrders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getDelFlag, NumberConstant.ZERO).apply(id != null, "FIND_IN_SET ('" + id + "', pids)").ne(KwtLogisticsOrder::getId, id));
         /**找到该订单下所有的物流订单**/
         //需要修改的mongodb数据
         List<Map<String, Object>> list = new ArrayList<>();
@@ -1532,7 +1424,7 @@ public class AcceptCarriageOrderService {
             });
         }
         /**是否是一级订单,是->推送至贸易,否,数据推送至物流订单上级*/
-        if (logisticsOrder.getPid() == null && logisticsOrder.getType().equals("1")) {
+        if (logisticsOrder.getPid() == null && ("1".equals(logisticsOrder.getType()))) {
             //数据推送至贸易订单
             CompleteLogisticsOrderParam tradeOrder = new CompleteLogisticsOrderParam();
             //todo 2023-09-07 修改为传递页面传输值  不传递总量
@@ -1544,9 +1436,7 @@ public class AcceptCarriageOrderService {
             orderStatusList.add(LogisticsOrderEnum.PENDING_ORDER.getCode());
             orderStatusList.add(LogisticsOrderEnum.WAIT_DELIVERY.getCode());
             orderStatusList.add(LogisticsOrderEnum.IN_TRANSIT.getCode());
-            List<KwtLogisticsOrder> logisticsOrders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                    .eq(KwtLogisticsOrder::getTOrderId, logisticsOrder.getTOrderId())
-                    .in(KwtLogisticsOrder::getStatus, orderStatusList));
+            List<KwtLogisticsOrder> logisticsOrders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getTOrderId, logisticsOrder.getTOrderId()).in(KwtLogisticsOrder::getStatus, orderStatusList));
             if (org.springframework.util.CollectionUtils.isEmpty(logisticsOrders)) {
                 tradeOrder.setIsAllComplete(true);
             } else {
@@ -1621,23 +1511,10 @@ public class AcceptCarriageOrderService {
 
     private void updateLogisticOrderAndTrack(Long lOrderId, OrderFinishDTO orderFinishDTO, BigDecimal ignoreAmount) {
         Integer code = LogisticsOrderEnum.HAVE_FINISHED.getCode();
-        logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
-                .set(KwtLogisticsOrder::getStatus, code)
-                .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId())
-                .set(KwtLogisticsOrder::getIgnoreAmount, ignoreAmount)
-                .set(KwtLogisticsOrder::getUpdateTime, new Date())
-                .eq(KwtLogisticsOrder::getId, lOrderId)
-        );
-        KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
-                .eq(KwtLogisticsOrderTrack::getLOrderId, lOrderId).eq(KwtLogisticsOrderTrack::getStatus, code)
-        );
+        logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>().set(KwtLogisticsOrder::getStatus, code).set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId()).set(KwtLogisticsOrder::getIgnoreAmount, ignoreAmount).set(KwtLogisticsOrder::getUpdateTime, new Date()).eq(KwtLogisticsOrder::getId, lOrderId));
+        KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>().eq(KwtLogisticsOrderTrack::getLOrderId, lOrderId).eq(KwtLogisticsOrderTrack::getStatus, code));
         if (track != null) {
-            logisticsOrderTrackMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderTrack>()
-                    .set(KwtLogisticsOrderTrack::getUpdateBy, LoginUserHolder.getUserId())
-                    .set(KwtLogisticsOrderTrack::getUpdateTime, new Date())
-                    .set(KwtLogisticsOrderTrack::getRemark, orderFinishDTO.getRemark())
-                    .eq(KwtLogisticsOrderTrack::getId, track.getId())
-            );
+            logisticsOrderTrackMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderTrack>().set(KwtLogisticsOrderTrack::getUpdateBy, LoginUserHolder.getUserId()).set(KwtLogisticsOrderTrack::getUpdateTime, new Date()).set(KwtLogisticsOrderTrack::getRemark, orderFinishDTO.getRemark()).eq(KwtLogisticsOrderTrack::getId, track.getId()));
         } else {
             KwtLogisticsOrderTrack orderTrack = new KwtLogisticsOrderTrack();
             orderTrack.setId(new IdWorker(NumberConstant.ONE).nextId());
@@ -1702,16 +1579,9 @@ public class AcceptCarriageOrderService {
         logisticsOrder.setTotalUnloadAmount(orderFinishDTO.getUnloadAmount());
         logisticsOrder.setIgnoreAmount(ignoreAmount);
         logisticsOrderMapper.updateById(logisticsOrder);
-        KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
-                .eq(KwtLogisticsOrderTrack::getLOrderId, logisticsOrder.getId()).eq(KwtLogisticsOrderTrack::getStatus, LogisticsOrderEnum.HAVE_FINISHED.getCode())
-        );
+        KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>().eq(KwtLogisticsOrderTrack::getLOrderId, logisticsOrder.getId()).eq(KwtLogisticsOrderTrack::getStatus, LogisticsOrderEnum.HAVE_FINISHED.getCode()));
         if (track != null) {
-            logisticsOrderTrackMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderTrack>()
-                    .set(KwtLogisticsOrderTrack::getUpdateBy, LoginUserHolder.getUserId())
-                    .set(KwtLogisticsOrderTrack::getUpdateTime, new Date())
-                    .set(KwtLogisticsOrderTrack::getRemark, orderFinishDTO.getRemark())
-                    .eq(KwtLogisticsOrderTrack::getId, track.getId())
-            );
+            logisticsOrderTrackMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderTrack>().set(KwtLogisticsOrderTrack::getUpdateBy, LoginUserHolder.getUserId()).set(KwtLogisticsOrderTrack::getUpdateTime, new Date()).set(KwtLogisticsOrderTrack::getRemark, orderFinishDTO.getRemark()).eq(KwtLogisticsOrderTrack::getId, track.getId()));
         } else {
             KwtLogisticsOrderTrack orderTrack = new KwtLogisticsOrderTrack();
             orderTrack.setId(new IdWorker(NumberConstant.ONE).nextId());
@@ -1749,8 +1619,7 @@ public class AcceptCarriageOrderService {
      * @param orderId        分包物流订单id
      */
     private void updateDataBySubset(OrderFinishDTO orderFinishDTO, String orderId) {
-        KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                .eq(KwtLogisticsOrder::getId, Long.parseLong(orderId)));
+        KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getId, Long.parseLong(orderId)));
         if (kwtLogisticsOrder != null) {
             kwtLogisticsOrder.setStatus(LogisticsOrderEnum.HAVE_FINISHED.getCode());
             kwtLogisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
@@ -1769,12 +1638,7 @@ public class AcceptCarriageOrderService {
             logisticsOrderTrackMapper.insert(track);
             /**单据完结修改Mongodb*/
             SckwLogisticsOrder updateParam = new SckwLogisticsOrder();
-            updateParam.setLOrderId(kwtLogisticsOrder.getId())
-                    .setStatus(LogisticsOrderEnum.HAVE_FINISHED.getStatus())
-                    .setUpdateBy(LoginUserHolder.getUserId())
-                    .setUpdateByName(LoginUserHolder.getUserName())
-                    .setUpdateTime(new Date())
-            ;
+            updateParam.setLOrderId(kwtLogisticsOrder.getId()).setStatus(LogisticsOrderEnum.HAVE_FINISHED.getStatus()).setUpdateBy(LoginUserHolder.getUserId()).setUpdateByName(LoginUserHolder.getUserName()).setUpdateTime(new Date());
             SckwBusSum busSum = new SckwBusSum();
             busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
             busSum.setMethod(2);
@@ -1808,29 +1672,18 @@ public class AcceptCarriageOrderService {
      * @return
      */
     public HttpResult subcontractConsignmentOrderDetail(String id) {
-        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                        .eq(KwtLogisticsOrder::getId, Long.parseLong(id))
+        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getId, Long.parseLong(id))
                 /**.eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId())*/);
         if (logisticsOrder == null) {
             log.info("查无单据 物流订单id:{}", id);
             throw new RuntimeException("查无单据");
         }
-        KwtLogisticsOrderContract contract = kwtLogisticsOrderContractMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderContract>()
-                .eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderContract::getLOrderId, Long.parseLong(id)));
-        KwtLogisticsOrderUnit unitOne = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                .eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderUnit::getLOrderId, Long.parseLong(id))
-                .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
-        KwtLogisticsOrderUnit unitTwo = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                .eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderUnit::getLOrderId, Long.parseLong(id))
-                .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
-        KwtLogisticsOrderAddress loadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                .eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderAddress::getLOrderId, Long.parseLong(id))
-                .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
-        KwtLogisticsOrderAddress unloadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                .eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderAddress::getLOrderId, Long.parseLong(id))
-                .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
-        KwtLogisticsOrderGoods orderGoods = kwtLogisticsOrderGoodsMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderGoods>()
-                .eq(StringUtils.isNotBlank(logisticsOrder.getId()), KwtLogisticsOrderGoods::getLOrderId, logisticsOrder.getId()));
+        KwtLogisticsOrderContract contract = kwtLogisticsOrderContractMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderContract>().eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderContract::getLOrderId, Long.parseLong(id)));
+        KwtLogisticsOrderUnit unitOne = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderUnit::getLOrderId, Long.parseLong(id)).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
+        KwtLogisticsOrderUnit unitTwo = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderUnit::getLOrderId, Long.parseLong(id)).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
+        KwtLogisticsOrderAddress loadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>().eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderAddress::getLOrderId, Long.parseLong(id)).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
+        KwtLogisticsOrderAddress unloadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>().eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderAddress::getLOrderId, Long.parseLong(id)).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
+        KwtLogisticsOrderGoods orderGoods = kwtLogisticsOrderGoodsMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderGoods>().eq(StringUtils.isNotBlank(logisticsOrder.getId()), KwtLogisticsOrderGoods::getLOrderId, logisticsOrder.getId()));
         OrderDetailVO orderDetailVO = new OrderDetailVO();
         orderDetailVO.setRemark(logisticsOrder.getRemark());
         orderDetailVO.setTaxRate(logisticsOrder.getTaxRate());
@@ -1887,14 +1740,12 @@ public class AcceptCarriageOrderService {
 //        orderDetailVO.setPerformanceAmount(logisticsOrder.getLoadAmount() == null ? null : logisticsOrder.getLoadAmount());
         if (logisticsOrder.getSettlementCycle() != null) {
             Map<String, SysDictResDto> dtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.SETTLEMENT_CYCLE.getType());
-            orderDetailVO.setSettlementCycleLabel(dtoMap.isEmpty() ? null :
-                    (dtoMap.get(String.valueOf(logisticsOrder.getSettlementCycle())) == null ? null : dtoMap.get(String.valueOf(logisticsOrder.getSettlementCycle())).getLabel()));
+            orderDetailVO.setSettlementCycleLabel(dtoMap.isEmpty() ? null : (dtoMap.get(String.valueOf(logisticsOrder.getSettlementCycle())) == null ? null : dtoMap.get(String.valueOf(logisticsOrder.getSettlementCycle())).getLabel()));
         }
         orderDetailVO.setBillingMode(logisticsOrder.getBillingMode());
         if (logisticsOrder.getBillingMode() != null) {
             Map<String, SysDictResDto> dictResDtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.CHARGING_TYPE.getType());
-            orderDetailVO.setBillingModeLabel(dictResDtoMap.isEmpty() ? null :
-                    (dictResDtoMap.get(logisticsOrder.getBillingMode()) == null ? null : dictResDtoMap.get(logisticsOrder.getBillingMode()).getLabel()));
+            orderDetailVO.setBillingModeLabel(dictResDtoMap.isEmpty() ? null : (dictResDtoMap.get(logisticsOrder.getBillingMode()) == null ? null : dictResDtoMap.get(logisticsOrder.getBillingMode()).getLabel()));
         }
         if (logisticsOrder.getPayment() != null) {
             Map<String, SysDictResDto> dictResDtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.TRADE_TYPE.getType());
@@ -2023,31 +1874,27 @@ public class AcceptCarriageOrderService {
         /**发送信息至消息列表*/
         //托运单位
         EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(Long.parseLong(orderDTO.getConsignCompanyId()));
+        //承运单位
+        EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(Long.parseLong(orderDTO.getAcceptCompanyId()));
         KwtLogisticsOrderUnit consignUnit = new KwtLogisticsOrderUnit();
+        //接收方
         consignUnit.setUnitType(NumberConstant.ONE);
         consignUnit.setEntId(Long.parseLong(orderDTO.getConsignCompanyId()));
-        consignUnit.setTopEntId(entCacheResDto == null ? null : entCacheResDto.getId());
+        consignUnit.setTopEntId(entCacheResDto1 == null ? null : entCacheResDto1.getId());
         consignUnit.setFirmName(orderDTO.getConsignCompany());
-        consignUnit.setContactsId(Long.parseLong(orderDTO.getConsignContactsId()));
-
-        //承运单位
-        EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(Long.parseLong(orderDTO.getAcceptCompanyId()));
+        consignUnit.setContactsId(Long.parseLong(orderDTO.getAcceptContactsId()));
+        //发起方
         KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
         carriageUnit.setUnitType(NumberConstant.TWO);
         carriageUnit.setEntId(Long.parseLong(orderDTO.getAcceptCompanyId()));
-        carriageUnit.setTopEntId(entCacheResDto1 == null ? null : entCacheResDto1.getId());
+        carriageUnit.setTopEntId(entCacheResDto == null ? null : entCacheResDto.getId());
         carriageUnit.setFirmName(orderDTO.getAcceptCompany());
-        carriageUnit.setContactsId(Long.parseLong(orderDTO.getAcceptContactsId()));
+        carriageUnit.setContactsId(Long.parseLong(orderDTO.getConsignContactsId()));
 //        System.out.println("承运订单新建订单-消息列表推送 start");
 //        commonService.publicLogisticsConsignmentPushMessage(consignUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId()
 //                , MessageEnum.CARRIAGE_NEW_LOGISTICS, MessageEnum.CARRIAGE_NEW_LOGISTICS_ORDER);
 
-        commonService.newSendLogisticsOrderToMessage(consignUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId()
-                , messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl()
-                , messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl()
-                , MessageEnum.NEW_LOGISTICS_ORDER, MessageEnum.NEW_CARRIAGE_ORDER
-                , "1"
-        );
+        commonService.newSendLogisticsOrderToMessage(consignUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId(), messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(), MessageEnum.NEW_LOGISTICS_ORDER, MessageEnum.NEW_CARRIAGE_ORDER, "1");
 
 //        System.out.println("承运订单新建订单-消息列表推送 end ");
         return HttpResult.ok();
@@ -2380,10 +2227,8 @@ public class AcceptCarriageOrderService {
         order.setLossUnit(orderDTO.getLossUnit());
         order.setGoodsPrice(orderDTO.getGoodsPrice() == null ? null : orderDTO.getGoodsPrice());
         order.setGoodsPriceUnit(orderDTO.getGoodsPriceUnit());
-        order.setStartTime(org.apache.commons.lang3.ObjectUtils.isEmpty(orderDTO.getStartTime()) ?
-                null : DateUtil.localDateToLocalDateTimeStart(orderDTO.getStartTime()));
-        order.setEndTime(org.apache.commons.lang3.ObjectUtils.isEmpty(orderDTO.getEndTime()) ?
-                null : DateUtil.localDateToLocalDateTimeEnd(orderDTO.getEndTime()));
+        order.setStartTime(org.apache.commons.lang3.ObjectUtils.isEmpty(orderDTO.getStartTime()) ? null : DateUtil.localDateToLocalDateTimeStart(orderDTO.getStartTime()));
+        order.setEndTime(org.apache.commons.lang3.ObjectUtils.isEmpty(orderDTO.getEndTime()) ? null : DateUtil.localDateToLocalDateTimeEnd(orderDTO.getEndTime()));
         BigDecimal decimal = new BigDecimal(NumberConstant.ZERO);
         order.setSubcontractAmount(decimal);
         order.setEntrustAmount(decimal);
@@ -2428,20 +2273,16 @@ public class AcceptCarriageOrderService {
         String loadCode = query.getLoadAddressCode();
         if (StringUtils.isNotBlank(loadCode)) {
             switch (query.getLoadAddressLevel()) {
-                case 1 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 4).trim());
+                case 1 -> query.setLoadAddressCode(loadCode.substring(0, 2).trim());
+                case 2 -> query.setLoadAddressCode(loadCode.substring(0, 4).trim());
                 case 3 -> query.setLoadAddressCode(loadCode);
             }
         }
         String unloadCode = query.getUnloadAddressCode();
         if (StringUtils.isNotBlank(unloadCode)) {
             switch (query.getUnloadAddressLevel()) {
-                case 1 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 4).trim());
+                case 1 -> query.setUnloadAddressCode(loadCode.substring(0, 2).trim());
+                case 2 -> query.setUnloadAddressCode(loadCode.substring(0, 4).trim());
                 case 3 -> query.setUnloadAddressCode(loadCode);
             }
         }
@@ -2556,20 +2397,16 @@ public class AcceptCarriageOrderService {
         String loadCode = query.getLoadAddressCode();
         if (StringUtils.isNotBlank(loadCode)) {
             switch (query.getLoadAddressLevel()) {
-                case 1 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 4).trim());
+                case 1 -> query.setLoadAddressCode(loadCode.substring(0, 2).trim());
+                case 2 -> query.setLoadAddressCode(loadCode.substring(0, 4).trim());
                 case 3 -> query.setLoadAddressCode(loadCode);
             }
         }
         String unloadCode = query.getUnloadAddressCode();
         if (StringUtils.isNotBlank(unloadCode)) {
             switch (query.getUnloadAddressLevel()) {
-                case 1 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 4).trim());
+                case 1 -> query.setUnloadAddressCode(loadCode.substring(0, 2).trim());
+                case 2 -> query.setUnloadAddressCode(loadCode.substring(0, 4).trim());
                 case 3 -> query.setUnloadAddressCode(loadCode);
             }
         }
@@ -2620,11 +2457,14 @@ public class AcceptCarriageOrderService {
         return idArrays.length <= 1 ? Global.NUMERICAL_ONE : (idArrays.length - Global.NUMERICAL_ONE);
     }
 
+    public int newLogisticsLevel(KwtLogisticsOrder logisticsOrder) {
+        String pids = logisticsOrder.getPids();
+        String[] idArrays = StringUtils.isBlank(pids) ? new String[0] : pids.split(Global.COMMA);
+        return idArrays.length <= 1 ? Global.NUMERICAL_ONE : idArrays.length;
+    }
+
     public HttpResult getOrderTrackByOrderId(String orderId, String number) {
-        List<KwtLogisticsOrderTrack> list = logisticsOrderTrackMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
-                .eq(KwtLogisticsOrderTrack::getLOrderId, orderId)
-                .eq(KwtLogisticsOrderTrack::getDelFlag, NumberConstant.ZERO).orderByDesc(KwtLogisticsOrderTrack::getCreateTime)
-        );
+        List<KwtLogisticsOrderTrack> list = logisticsOrderTrackMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderTrack>().eq(KwtLogisticsOrderTrack::getLOrderId, orderId).eq(KwtLogisticsOrderTrack::getDelFlag, NumberConstant.ZERO).orderByDesc(KwtLogisticsOrderTrack::getCreateTime));
         List<LogisticsOrderTrackVO> vos = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list)) {
             List<Long> collect = list.stream().map(KwtLogisticsOrderTrack::getCreateBy).collect(Collectors.toList());
@@ -2681,20 +2521,16 @@ public class AcceptCarriageOrderService {
         String loadCode = query.getLoadAddressCode();
         if (StringUtils.isNotBlank(loadCode)) {
             switch (query.getLoadAddressLevel()) {
-                case 1 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 4).trim());
+                case 1 -> query.setLoadAddressCode(loadCode.substring(0, 2).trim());
+                case 2 -> query.setLoadAddressCode(loadCode.substring(0, 4).trim());
                 case 3 -> query.setLoadAddressCode(loadCode);
             }
         }
         String unloadCode = query.getUnloadAddressCode();
         if (StringUtils.isNotBlank(unloadCode)) {
             switch (query.getUnloadAddressLevel()) {
-                case 1 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 4).trim());
+                case 1 -> query.setUnloadAddressCode(loadCode.substring(0, 2).trim());
+                case 2 -> query.setUnloadAddressCode(loadCode.substring(0, 4).trim());
                 case 3 -> query.setUnloadAddressCode(loadCode);
             }
         }
@@ -2909,8 +2745,7 @@ public class AcceptCarriageOrderService {
     private void computeCompareTotalPrice(StatisticsResultVO resultVO, StatisticsByOrderVO currentWeek, StatisticsByOrderVO lastWeek) {
         Integer flag = 1;
         BigDecimal chainRatio = new BigDecimal("0.00");
-        if (currentWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0
-                && lastWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0) {
+        if (currentWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0 && lastWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = new BigDecimal("0.00");
         } else if (currentWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = chainRatio.subtract(new BigDecimal("100.00"));
@@ -2918,8 +2753,7 @@ public class AcceptCarriageOrderService {
         } else if (lastWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = new BigDecimal("100.00").subtract(chainRatio);
         } else {
-            chainRatio = (currentWeek.getTotalPrice().subtract(lastWeek.getTotalPrice())).divide(lastWeek.getTotalPrice(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP)
-                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
+            chainRatio = (currentWeek.getTotalPrice().subtract(lastWeek.getTotalPrice())).divide(lastWeek.getTotalPrice(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
         }
         if (chainRatio.compareTo(new BigDecimal("0.00")) == -1) {
             flag = 2;
@@ -2936,8 +2770,7 @@ public class AcceptCarriageOrderService {
     private void computeCompareAmount(StatisticsResultVO resultVO, StatisticsByOrderVO currentWeek, StatisticsByOrderVO lastWeek) {
         Integer amountFlag = 1;
         BigDecimal amountChainRatio = new BigDecimal("0.00");
-        if (currentWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0
-                && lastWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
+        if (currentWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0 && lastWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
             amountChainRatio = new BigDecimal("0.00");
         } else if (currentWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
             amountChainRatio = amountChainRatio.subtract(new BigDecimal("100.00"));
@@ -2945,8 +2778,7 @@ public class AcceptCarriageOrderService {
         } else if (lastWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
             amountChainRatio = new BigDecimal("100.00").subtract(amountChainRatio);
         } else {
-            amountChainRatio = (currentWeek.getAmount().subtract(lastWeek.getAmount())).divide(lastWeek.getAmount(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP)
-                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
+            amountChainRatio = (currentWeek.getAmount().subtract(lastWeek.getAmount())).divide(lastWeek.getAmount(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
         }
         if (amountChainRatio.compareTo(new BigDecimal("0.00")) == -1) {
             amountFlag = 2;
@@ -2965,8 +2797,7 @@ public class AcceptCarriageOrderService {
     private void computeCompareWaitingAmount(StatisticsResultVO resultVO, StatisticsByOrderVO currentWeek, StatisticsByOrderVO lastWeek) {
         Integer flag = 1;
         BigDecimal chainRatio = new BigDecimal("0.00");
-        if (currentWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0
-                && lastWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0) {
+        if (currentWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0 && lastWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = new BigDecimal("0.00");
         } else if (currentWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = chainRatio.subtract(new BigDecimal("100.00"));
@@ -2974,8 +2805,7 @@ public class AcceptCarriageOrderService {
         } else if (lastWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = new BigDecimal("100.00").subtract(chainRatio);
         } else {
-            chainRatio = (currentWeek.getWaitingAmount().subtract(lastWeek.getWaitingAmount())).divide(lastWeek.getWaitingAmount(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP)
-                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
+            chainRatio = (currentWeek.getWaitingAmount().subtract(lastWeek.getWaitingAmount())).divide(lastWeek.getWaitingAmount(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
         }
         if (chainRatio.compareTo(new BigDecimal("0.00")) == -1) {
             flag = 2;
@@ -3024,15 +2854,14 @@ public class AcceptCarriageOrderService {
             //结束时间
             String dateEnd = cn.hutool.core.date.DateUtil.format(dateTime, DEF_DATE_FORMAT);
 
-            List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList,
-                    OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
-            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
+            List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList, OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
+            if ("2".equals(logisticsOrderStatistics.getTypeOne())) {
                 list.forEach(vo -> {
                     vo.setTypeTwo(vo.getTypeTwo().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeOne(vo.getTypeOne().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
                 });
             }
-            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
                 list.forEach(vo -> {
                     vo.setTypeOne(vo.getTypeOne().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeTwo(vo.getTypeTwo().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
@@ -3050,15 +2879,14 @@ public class AcceptCarriageOrderService {
             }
             //结束时间
             String dateEnd = DateUtil.getLastWeekDateEndToString(0);
-            List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList,
-                    OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
-            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
+            List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList, OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
+            if ("2".equals(logisticsOrderStatistics.getTypeOne())) {
                 list.forEach(vo -> {
                     vo.setTypeTwo(vo.getTypeTwo().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeOne(vo.getTypeOne().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
                 });
             }
-            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
                 list.forEach(vo -> {
                     vo.setTypeOne(vo.getTypeOne().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeTwo(vo.getTypeTwo().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));

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

@@ -278,7 +278,7 @@ public class CommonService {
         } else {
             sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
             sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-            if (type.equals("1")) {
+            if ("1".equals(type)) {
                 map.put("companyName", consignUnit.getFirmName());
                 sendLogisticsCreateByMessage(createBy, entId, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
             } else {
@@ -312,12 +312,13 @@ public class CommonService {
                 .setUserInfos(userInfos)
                 .setCreateBy(LoginUserHolder.getUserId());
         log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-创建人：{}", JSON.toJSONString(msg));
-        log.info("发起物流托运-企业:{},消息内容:{},-创建人：{},所有消息:{}", userCacheResDto.getEntInfo().getFirmName(),messageEnum.getContent(),name,JSON.toJSONString(msg));
+        log.info("发起物流托运-企业:{},消息内容:{},-创建人：{},所有消息:{}", userCacheResDto.getEntInfo().getFirmName(), messageEnum.getContent(), name, JSON.toJSONString(msg));
         streamBridge.send("sckw-message", JSON.toJSONString(msg));
     }
 
     /**
      * 给业务联系人发消息[承运方]
+     *
      * @param carriageUnit
      * @param map
      * @param pcUrl
@@ -336,19 +337,20 @@ public class CommonService {
         sckwMessage.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(messageEnum)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("pc", pcUrl);
                     put("app", appUrl);
                 }})
                 .setUserInfos(userInfoList)
                 .setCreateBy(LoginUserHolder.getUserId());
         log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-[承运方]-业务联系人：{}", JSON.toJSONString(sckwMessage));
-        log.info("[承运方]-companyName：{}-消息：{}", carriageUnit.getFirmName(),messageEnum.getContent());
+        log.info("[承运方]-companyName：{}-消息：{}", carriageUnit.getFirmName(), messageEnum.getContent());
         streamBridge.send("sckw-message", JSON.toJSONString(sckwMessage));
     }
 
     /**
      * 给业务联系人发消息[托运方]
+     *
      * @param consignUnit
      * @param map
      * @param pcUrl
@@ -367,14 +369,14 @@ public class CommonService {
         message.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(messageEnum)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("pc", pcUrl);
                     put("app", appUrl);
                 }})
                 .setUserInfos(list)
                 .setCreateBy(LoginUserHolder.getUserId());
         log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-[托运方]-业务联系人：{}", JSON.toJSONString(message));
-        log.info("[托运方]-companyName：{}-消息：{}", consignUnit.getFirmName(),messageEnum.getContent());
+        log.info("[托运方]-companyName：{}-消息：{}", consignUnit.getFirmName(), messageEnum.getContent());
         streamBridge.send("sckw-message", JSON.toJSONString(message));
     }
 
@@ -444,7 +446,7 @@ public class CommonService {
         sckwMessage.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("app", consignLogisticsOrderUrl);
                     put("pc", carriageLogisticsOrderUrl);
                 }})
@@ -463,7 +465,7 @@ public class CommonService {
         message.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(MessageEnum.NEW_CARRIAGE_ORDER)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("app", consignLogisticsOrderUrl);
                     put("pc", carriageLogisticsOrderUrl);
                 }})
@@ -522,7 +524,7 @@ public class CommonService {
         sckwMessage.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(messageEnum)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("app", consignLogisticsOrderUrl);
                     put("pc", carriageLogisticsOrderUrl);
                 }})
@@ -568,7 +570,7 @@ public class CommonService {
             msg.setRequestId(UUIDUtils.get32UUID())
                     .setMessageEnum(consignMessageEnum)
                     .setParams(map)
-                    .setMsgUrls(new HashMap<>() {{
+                    .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                         put("pc", consignLogisticsOrderUrl);
                         put("app", carriageLogisticsOrderUrl);
                     }})
@@ -616,7 +618,7 @@ public class CommonService {
             msg.setRequestId(UUIDUtils.get32UUID())
                     .setMessageEnum(consignMessageEnum)
                     .setParams(map)
-                    .setMsgUrls(new HashMap<>() {{
+                    .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                         put("pc", consignLogisticsOrderUrl);
                         put("app", carriageLogisticsOrderUrl);
                     }})
@@ -640,7 +642,7 @@ public class CommonService {
         sckwMessage.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(consignMessageEnum)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("pc", consignLogisticsOrderUrl);
                     put("app", carriageLogisticsOrderUrl);
                 }})
@@ -660,7 +662,7 @@ public class CommonService {
         message.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(MessageEnum.NEW_CARRIAGE_ORDER)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("pc", consignLogisticsOrderUrl);
                     put("app", carriageLogisticsOrderUrl);
                 }})
@@ -744,7 +746,7 @@ public class CommonService {
         sckwMessage.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(carriageMessageEnum)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("pc", messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl());
                     put("app", messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl());
                 }})
@@ -764,7 +766,7 @@ public class CommonService {
         message.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(consignMessageEnum)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("pc", messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl());
                     put("app", messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl());
                 }})

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

@@ -916,7 +916,7 @@ public class ConsignOrderService {
             });
         }
         /**是否是一级订单,是->推送至贸易,否,数据推送至物流订单上级*/
-        if (logisticsOrder.getPid() == null && logisticsOrder.getType().equals("1")) {
+        if (logisticsOrder.getPid() == null && ("1".equals(logisticsOrder.getType()))) {
             //数据推送至贸易订单
             CompleteLogisticsOrderParam tradeOrder = new CompleteLogisticsOrderParam();
             //todo 2023-09-07 修改为不传递总量，只传递当前单据页面传递值
@@ -2322,13 +2322,13 @@ public class ConsignOrderService {
 
             List<LogisticsOrderStatisticsVO> list = kwtLogisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList,
                     OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
-            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeOne())) {
                 list.forEach(vo -> {
                     vo.setTypeTwo(vo.getTypeTwo().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeOne(vo.getTypeOne().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
                 });
             }
-            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
                 list.forEach(vo -> {
                     vo.setTypeOne(vo.getTypeOne().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeTwo(vo.getTypeTwo().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
@@ -2348,13 +2348,13 @@ public class ConsignOrderService {
             String dateEnd = DateUtil.getLastWeekDateEndToString(0);
             List<LogisticsOrderStatisticsVO> list = kwtLogisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList,
                     OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
-            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeOne())) {
                 list.forEach(vo -> {
                     vo.setTypeTwo(vo.getTypeTwo().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeOne(vo.getTypeOne().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
                 });
             }
-            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
                 list.forEach(vo -> {
                     vo.setTypeOne(vo.getTypeOne().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeTwo(vo.getTypeTwo().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));

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

@@ -131,7 +131,7 @@ public class LogisticsConsignmentService {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public HttpResult purchaseLogisticsConsignment(LogisticsConsignmentParam bo) {
+    public HttpResult purchaseLogisticsConsignment(LogisticsConsignmentParam bo, String orderType) {
         HttpResult httpResult = ValidUtil.serviceValid(bo);
         if (HttpStatus.SUCCESS_CODE != httpResult.getCode()) {
             return HttpResult.error(httpResult.getMsg());
@@ -140,7 +140,7 @@ public class LogisticsConsignmentService {
         if (checked.getCode() != HttpStatus.SUCCESS_CODE) {
             return HttpResult.error(checked.getMsg());
         }
-        logisticsConsignmentInsert(bo);
+        logisticsConsignmentInsert(bo, orderType);
         return HttpResult.ok();
     }
 
@@ -165,7 +165,7 @@ public class LogisticsConsignmentService {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public HttpResult sellLogisticsConsignment(LogisticsConsignmentParam bo) {
+    public HttpResult sellLogisticsConsignment(LogisticsConsignmentParam bo, String orderType) {
         HttpResult httpResult = ValidUtil.serviceValid(bo);
         if (HttpStatus.SUCCESS_CODE != httpResult.getCode()) {
             return HttpResult.error(httpResult.getMsg());
@@ -174,11 +174,11 @@ public class LogisticsConsignmentService {
         if (checked.getCode() != HttpStatus.SUCCESS_CODE) {
             return HttpResult.error(checked.getMsg());
         }
-        logisticsConsignmentInsert(bo);
+        logisticsConsignmentInsert(bo, orderType);
         return HttpResult.ok();
     }
 
-    void logisticsConsignmentInsert(LogisticsConsignmentParam bo) {
+    void logisticsConsignmentInsert(LogisticsConsignmentParam bo, String orderType) {
         commonService.getRedisGenerateOrderNo();
         Long count = kwtLogisticsOrderMapper.selectCount(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getTOrderId, bo.getTOrderId()));
         String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "1", "0", String.valueOf(count + 1));
@@ -228,31 +228,72 @@ public class LogisticsConsignmentService {
             log.info("{}生成物流托运失败!,返回信息:{}", tradeOrder.getTOrderNo(), JSONObject.toJSONString(httpResult));
             throw new BusinessException("{" + tradeOrder.getTOrderNo() + "}生成物流托运失败!" + httpResult.getMsg());
         }
-        /**消息列表*/
-        EntCacheResDto consignentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getConsignCompanyId()));
-        EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getCheckCompanyId()));
+        /**消息列表
+         * 1 采购 2 销售
+         * */
+        String pcConsignUrl = "";
+        String appConsignUrl = "";
+        String pcCarriageUrl = "";
+        String appCarriageUrl = "";
+        String type = "";
+        MessageEnum consignMessageEnum = null;
+        MessageEnum carriageMessageEnum = null;
         //托运单位
         KwtLogisticsOrderUnit checkUnit = new KwtLogisticsOrderUnit();
-
-        checkUnit.setUnitType(1);
-        checkUnit.setFirmName(bo.getCheckCompany());
-        checkUnit.setEntId(Long.parseLong(bo.getConsignCompanyId()));
-        checkUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
-        checkUnit.setContactsId(Long.parseLong(bo.getConsignContactsId()));
-
         //承运单位
         KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
-        carriageUnit.setUnitType(2);
-        carriageUnit.setFirmName(bo.getConsignCompany());
-        carriageUnit.setEntId(Long.parseLong(bo.getCheckCompanyId()));
-        carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
-        carriageUnit.setContactsId(Long.parseLong(bo.getCheckContactsId()));
-
+        if ("1".equals(orderType)) {
+            EntCacheResDto consignentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getConsignCompanyId()));
+            EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getCheckCompanyId()));
+            checkUnit.setUnitType(1);
+            checkUnit.setFirmName(bo.getCheckCompany());
+            checkUnit.setEntId(Long.parseLong(bo.getConsignCompanyId()));
+            checkUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
+            checkUnit.setContactsId(Long.parseLong(bo.getCheckContactsId()));
+
+            carriageUnit.setUnitType(2);
+            carriageUnit.setFirmName(bo.getConsignCompany());
+            carriageUnit.setEntId(Long.parseLong(bo.getCheckCompanyId()));
+            carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
+            carriageUnit.setContactsId(Long.parseLong(bo.getConsignContactsId()));
+            pcConsignUrl = messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl();
+            appConsignUrl = messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl();
+            pcCarriageUrl = messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl();
+            appCarriageUrl = messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl();
+            consignMessageEnum = MessageEnum.NEW_CARRIAGE_ORDER;
+            carriageMessageEnum = MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT;
+            type = "2";
+        } else if ("2".equals(orderType)) {
+            EntCacheResDto consignentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getConsignCompanyId()));
+            EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getCheckCompanyId()));
+
+            //发起方
+            checkUnit.setUnitType(1);
+            checkUnit.setFirmName(bo.getCheckCompany());
+            checkUnit.setEntId(Long.parseLong(bo.getCheckCompanyId()));
+            checkUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
+            checkUnit.setContactsId(Long.parseLong(bo.getConsignContactsId()));
+
+            //接收方
+            carriageUnit.setUnitType(2);
+            carriageUnit.setFirmName(bo.getConsignCompany());
+            carriageUnit.setEntId(Long.parseLong(bo.getConsignCompanyId()));
+            carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
+            carriageUnit.setContactsId(Long.parseLong(bo.getCheckContactsId()));
+
+            pcConsignUrl = messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl();
+            appConsignUrl = messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl();
+            pcCarriageUrl = messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl();
+            appCarriageUrl = messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl();
+            consignMessageEnum = MessageEnum.NEW_CARRIAGE_ORDER;
+            carriageMessageEnum = MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT;
+            type = "1";
+        }
 //        commonService.initIatingLogisticsConsignment(checkUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId());
         commonService.newSendLogisticsOrderToMessage(checkUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId(),
-                messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
-                messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT, MessageEnum.NEW_CARRIAGE_ORDER, "1");
+                pcConsignUrl, appConsignUrl,
+                pcCarriageUrl, appCarriageUrl,
+                consignMessageEnum, carriageMessageEnum, type);
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.sckw.transport.service;
 
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.BeanUtils;
@@ -254,7 +255,7 @@ public class ManagementWaybillOrderService {
         AggregationResults<TableTops> outputTypeCount = mongoTemplate.aggregate(aggregation, SckwWaybillOrder.class, TableTops.class);
         List<TableTops> results = outputTypeCount.getMappedResults();
         // 填充默认值
-        Map<String,TableTops> listMap = new HashMap<>();
+        Map<String,TableTops> listMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         TableTops topTotal = new TableTops();
         topTotal.setName("全部");
         topTotal.setValue("all");

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

@@ -844,7 +844,7 @@ public class TransportCommonService {
             //一级物流订单向贸易订单推送数据
             if (order.getPid() == null && Integer.parseInt(order.getType()) == Global.NUMERICAL_ONE) {
                 //物流订单统计(运输完成后的物流订单)
-                LogisticsCountVo tradeCount = logisticsOrderMapper.findLogisticsOrderCount(new HashMap<>() {{
+                LogisticsCountVo tradeCount = logisticsOrderMapper.findLogisticsOrderCount(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("tOrderId", order.getTOrderId());
                     put("level", Global.NUMERICAL_ONE);
                 }});

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

@@ -264,6 +264,7 @@ public class WaybillManagementService {
         waybillDataVO.setCar(waybillCarVO);
         waybillDataVO.setTransport(wayBillDetailDTO);
         waybillDataVO.setProcess(statusVOS);
+        waybillTrackVOS = waybillTrackVOS.stream().sorted(Comparator.comparing(WaybillTrackVO::getCreateTime).reversed()).collect(Collectors.toList());
         waybillDataVO.setLogs(waybillTrackVOS);
         return HttpResult.ok(waybillDataVO);
     }
@@ -733,7 +734,7 @@ public class WaybillManagementService {
             endDate = StringTimeUtil.fillEnd(endDate);
         }
         // 运输途中
-        Map<String, String> _onway = new HashMap<>();
+        Map<String, String> _onway = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         _onway.put("name", "运输中");
         _onway.put("value", "onway");
         _onway.put("total", "0");
@@ -748,7 +749,7 @@ public class WaybillManagementService {
         );
         _onway.put("total", onWayCount.toString());
         // 已完成
-        Map<String, String> _finish = new HashMap<>();
+        Map<String, String> _finish = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         _finish.put("name", "已完成");
         _finish.put("value", "finish");
         _finish.put("total", "0");
@@ -891,7 +892,7 @@ public class WaybillManagementService {
                 StringUtils.isBlank(query.getStartDate()) ? null : StringTimeUtil.fillStart(query.getStartDate()),
                 StringUtils.isBlank(query.getEndDate()) ? null : StringTimeUtil.fillEnd(query.getEndDate())
         );
-        Map<String, String> amount = new HashMap<>();
+        Map<String, String> amount = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         // 总计条数
         amount.put("total", String.valueOf(wOrders.size()));
         BigDecimal loadAmount = new BigDecimal(Global.AMOUNT);