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

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

@@ -130,4 +130,17 @@ 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,6 +11,37 @@ 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,5 +1,6 @@
 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;
@@ -22,6 +23,7 @@ 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;
@@ -32,6 +34,7 @@ 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.*;
 
@@ -53,6 +56,149 @@ 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 {
 

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

@@ -43,6 +43,27 @@ 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查企业
@@ -78,6 +99,15 @@ public interface RemoteUserService {
      */
     void saveUserLogin(UserLoginReqDto userLoginReqDto);
 
+
+    /**
+     * @param reqDto 忘记密码入参
+     * @desc: 忘记密码
+     * @author: czh
+     * @date: 2023/6/19
+     */
+    void forgetPassword(ForgetPasswordReqDto reqDto);
+
     /**
      * @param userId 用户id
      * @return 登录
@@ -105,6 +135,21 @@ 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
@@ -123,6 +168,14 @@ 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-manage/src/main/java/com/sckw/manage/dubbo/RemoteManageServiceImpl.java

@@ -9,6 +9,7 @@ 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;
@@ -17,6 +18,7 @@ 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.*;
@@ -123,7 +125,7 @@ public class RemoteManageServiceImpl implements RemoteManageService {
                 }
             }
         }
+
         return findEntCooperateResVoList;
     }
-
 }

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

@@ -1,6 +1,10 @@
 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;
@@ -17,23 +21,30 @@ 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;
 
@@ -52,11 +63,17 @@ public class KwmAddressService {
     @Autowired
     private CommonBusinessService commonBusinessService;
 
+    @Autowired
+    private RemoteManageServiceImpl remoteManageService;
+
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    RemoteSystemService remoteSystemService;
+    private RemoteSystemService remoteSystemService;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    RemoteUserService remoteUserService;
+    private RemoteUserService remoteUserService;
+
+    @Autowired
+    private StreamBridge streamBridge;
 
     /**
      * @param reqVo 分页入参

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

@@ -1,5 +1,6 @@
 package com.sckw.manage.service;
 
+import java.io.IOException;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -14,6 +15,7 @@ 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;
@@ -22,6 +24,7 @@ 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-operation/src/main/java/com/sckw/operation/controller/KwoBannerController.java

@@ -1,5 +1,6 @@
 package com.sckw.operation.controller;
 
+import com.sckw.core.exception.SystemException;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.operation.model.vo.req.*;

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

@@ -1,5 +1,6 @@
 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/model/vo/req/BannerQueryReqVo.java

@@ -2,12 +2,14 @@ package com.sckw.operation.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.core.model.page.PageRequest;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author czh
@@ -55,9 +57,4 @@ public class BannerQueryReqVo extends PageRequest implements Serializable {
      */
     private Integer district;
 
-    /**
-     * 是否是门户端展示的
-     */
-    private Boolean isShow;
-
 }

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

@@ -78,7 +78,7 @@ public class BannerService {
         LambdaQueryWrapper<KwoBanner> wrapper = new LambdaQueryWrapper<>();
         if(Objects.nonNull(reqVo.getDistrict()))
         {
-            reqVo.setStatus(Global.YES);
+            reqVo.setStatus(1);
         }
         wrapper.eq(Objects.nonNull(reqVo.getStatus()), KwoBanner::getStatus, reqVo.getStatus()).
                 eq(KwoBanner::getDelFlag, Global.NO).
@@ -89,7 +89,6 @@ public class BannerService {
         if (Objects.nonNull(reqVo.getStartTime())) {
             wrapper.ge(KwoBanner::getStartTime, reqVo.getStartTime());
         }
-
         if(Objects.nonNull(reqVo.getDistrict())) {
             wrapper.eq(KwoBanner::getDistrict, reqVo.getDistrict());
         }
@@ -101,12 +100,6 @@ public class BannerService {
         if (StringUtils.isNotBlank(reqVo.getIds())) {
             wrapper.in(KwoBanner::getId, Arrays.stream(reqVo.getIds().split(Global.COMMA)).map(Long::parseLong).toList());
         }
-
-        if(Objects.nonNull(reqVo.getIsShow()) && reqVo.getIsShow()) {
-            Date date = new Date();
-            wrapper.le(KwoBanner::getStartTime, date).and(wp -> wp.isNull(KwoBanner::getEntTime).or().ge(KwoBanner::getEntTime, date));
-            wrapper.eq(KwoBanner::getStatus, Global.YES);
-        }
         return kwoBannerMapper.selectList(wrapper);
     }
 
@@ -128,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());
             }
@@ -156,7 +149,6 @@ 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);
@@ -184,7 +176,6 @@ public class BannerService {
         Long userId = LoginUserHolder.getUserId();
         kwobanner.setUpdateTime(date);
         kwobanner.setUpdateBy(userId);
-        kwobanner.setEntTime(reqVo.getEndTime());
         if (kwoBannerMapper.updateById(kwobanner) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dubbo/PaymentDubboServiceImpl.java

@@ -54,7 +54,7 @@ public class PaymentDubboServiceImpl implements PaymentDubboService {
                 preMoney = type.money();
             }
         }
-        int flag = curMoney.compareTo(preMoney) >= 0 ? 1 : 2;
+        int flag = curMoney.compareTo(preMoney) > 0 ? 1 : 2;
 
         String percent = DecimalUtils.percent(curMoney.subtract(preMoney), preMoney);
         return new SettlementMoney(df.format(curMoney), df.format(preMoney), percent, flag);

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

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

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

@@ -1,5 +1,6 @@
 package com.sckw.system.dubbo;
 
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -12,12 +13,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;
@@ -37,13 +38,13 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
     private SysDictDao sysDictDao;
 
     @Autowired
-    private KwsUserDao kwsUserDao;
+    private KwsUserService kwsUserService;
 
     @Autowired
     private RemoteBaseService remoteBaseService;
 
     @Autowired
-    private SysAreaDao sysAreaDao;
+    private SysAreaService sysAreaService;
 
     /**
      * @param keys type#value,type#value
@@ -517,7 +518,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         String dictCache = RedissonUtils.getString(key);
         //从redis查，查不到从数据库查，并写入redis
         if (StringUtils.isBlank(dictCache)) {
-            KwsUser kwsUser = kwsUserDao.selectByKey(userId);
+            KwsUser kwsUser = kwsUserService.selectByKey(userId);
             if (Objects.isNull(kwsUser)) {
                 return null;
             }
@@ -591,7 +592,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         String areaCache = RedissonUtils.getString(key);
         //从redis查，查不到从数据库查，并写入redis
         if (StringUtils.isBlank(areaCache)) {
-            SysArea sysArea = sysAreaDao.selectById(code);
+            SysArea sysArea = sysAreaService.selectById(code);
             if (Objects.isNull(sysArea)) {
                 return new SysAreaCacheResDto();
             }
@@ -609,7 +610,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
-        List<SysArea> sysAreas = sysAreaDao.selectByIds(list);
+        List<SysArea> sysAreas = sysAreaService.selectByIds(list);
         if (CollectionUtils.isEmpty(sysAreas)) {
             return Collections.emptyList();
         }
@@ -629,7 +630,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 = sysAreaDao.selectById(pcode);
+                SysArea sysArea = sysAreaService.selectById(pcode);
                 AreaTreeFrontResDto areaTreeFrontResDto = new AreaTreeFrontResDto();
                 areaTreeFrontResDto.setCode(sysArea.getCode());
                 areaTreeFrontResDto.setPcode(sysArea.getPcode());
@@ -721,7 +722,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             return Collections.emptyList();
         }
 
-        List<SysArea> list = sysAreaDao.findList(null);
+        List<SysArea> list = sysAreaService.findList(null);
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
@@ -775,7 +776,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             put("account", account);
             put("systemType", systemType);
         }};
-        List<KwsUserResVo> users = kwsUserDao.findList(params);
+        List<KwsUserResVo> users = kwsUserService.findList(params);
         if (CollectionUtils.isEmpty(users)) {
             return null;
         }

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

@@ -8,19 +8,28 @@ 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.*;
+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.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;
 
@@ -37,17 +46,20 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     private RemoteBaseService remoteBaseService;
 
     @Resource
-    private KwsUserDao kwsUserDao;
+    private KwsUserService kwsUserService;
 
     @Resource
-    private KwsUserRoleDao kwsUserRoleDao;
+    private KwsRoleService kwsRoleService;
 
     @Resource
-    private KwsMenuDao kwsMenuDao;
+    private KwsMenuService kwsMenuService;
 
     @Resource
     private KwsUserLoginDao kwsUserLoginDao;
 
+    @Resource
+    private KwsEnterpriseService kwsEnterpriseService;
+
     @Resource
     private KwsEnterpriseDao kwsEnterpriseDao;
 
@@ -57,6 +69,9 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     @Resource
     private SysAreaDao sysAreaDao;
 
+    @Resource
+    private CommonService commonService;
+
 
     @Override
     public KwsEnterpriseResDto queryEnterpriseById(Long id) {
@@ -71,13 +86,13 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     @Override
     public List<UserAccessMenuInfoResDto> queryUserAccessMenu(long id) {
         FindMenuTreePojo findMenuTreePojo = new FindMenuTreePojo();
-        List<KwsUserRole> kwsUserRoles = kwsUserRoleDao.findAllByUserId(id);
+        List<KwsUserRole> kwsUserRoles = kwsRoleService.findAllByUserId(id);
         if (CollectionUtils.isEmpty(kwsUserRoles)) {
             return Collections.emptyList();
         }
         findMenuTreePojo.setRoleIds(kwsUserRoles.stream().map(KwsUserRole::getRoleId).toList());
 
-        List<KwsMenuResVo> kwsMenuResVos = kwsMenuDao.findList(findMenuTreePojo);
+        List<KwsMenuResVo> kwsMenuResVos = kwsMenuService.findList(findMenuTreePojo);
         if (CollectionUtils.isEmpty(kwsMenuResVos)) {
             return Collections.emptyList();
         }
@@ -85,6 +100,12 @@ 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) {
@@ -115,9 +136,19 @@ 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 = kwsEnterpriseDao.selectByKey(entId);
+        KwsEnterprise kwsEnterprise = kwsEnterpriseService.queryKwsEnterpriseById(entId);
         if (Objects.isNull(kwsEnterprise)) {
             return;
         }
@@ -137,6 +168,11 @@ 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) {
@@ -198,12 +234,11 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     public List<FindEntUserResDto> findEntUser(Long entId) {
         FindListReqVo findListReqVo = new FindListReqVo();
         findListReqVo.setId(entId);
-        List<FindEntUserPojo> list = kwsEnterpriseDao.findUserByEntIds(Collections.singletonList(entId));
-        if (CollectionUtils.isEmpty(list)) {
+        List<FindEntUserPojo> entUser = kwsEnterpriseService.findEntUser(findListReqVo);
+        if(CollectionUtils.isEmpty(entUser)) {
             return Collections.emptyList();
         }
-
-        return BeanUtils.copyToList(list, FindEntUserResDto.class);
+        return BeanUtils.copyToList(entUser,FindEntUserResDto.class);
     }
 
 
@@ -231,9 +266,10 @@ public class RemoteUserServiceImpl implements RemoteUserService {
      **/
     @Override
     public List<Long> findEntIds(List<Integer> entTypes, String firmName) {
-        Map<String, Object> params  = new HashMap<>(Global.NUMERICAL_FOUR);
-        params.put("entTypes", entTypes);
-        params.put("firmName", firmName);
+        Map<String, Object> params  = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
+            put("entTypes", entTypes);
+            put("firmName", firmName);
+        }};
         List<KwsEnterprise> ents = remoteBaseService.findEnts(params);
         List<Long> endIds = new ArrayList<>();
         ents.forEach(ent -> endIds.add(ent.getId()));
@@ -249,10 +285,11 @@ public class RemoteUserServiceImpl implements RemoteUserService {
      **/
     @Override
     public List<Long> findUserIds(List<Long> entIds, String userName) {
-        Map<String, Object> params = new HashMap<>(Global.NUMERICAL_FOUR);
-        params.put("entIds", entIds);
-        params.put("userName", userName);
-        List<KwsUserResVo> users = kwsUserDao.findList(params);
+        Map<String, Object> params = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
+            put("entIds", entIds);
+            put("userName", userName);
+        }};
+        List<KwsUserResVo> users = kwsUserService.findList(params);
         List<Long> userIds = new ArrayList<>();
         users.forEach(user -> userIds.add(user.getId()));
         return userIds;
@@ -262,6 +299,7 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     /**
      * 根据用户名查用户信息
      * @param username 用户账号
+     * @return
      */
     @Override
     public KwsUserResDto getUserByAccount(String username) {
@@ -289,5 +327,22 @@ 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-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 = 8, fraction = 2, message = "总量格式错误")
+    @Digits(integer = 10, 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,7 +171,8 @@ 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("单据错误,数据不存在");
@@ -218,7 +219,10 @@ public class AcceptCarriageOrderService {
         }
 //        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();
+        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);
@@ -259,7 +263,10 @@ 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("生成物流托运合同异常");
         }
         //主体信息保存
@@ -297,7 +304,11 @@ 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
@@ -341,7 +352,8 @@ 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("不是全量分配时,分配量不能为空!");
@@ -387,8 +399,12 @@ 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());
@@ -461,8 +477,12 @@ 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);
@@ -523,10 +543,38 @@ 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);
     }
 
@@ -563,7 +611,9 @@ 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());
@@ -576,14 +626,17 @@ 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()));
@@ -650,8 +703,11 @@ 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("单据不存在!");
@@ -662,7 +718,8 @@ 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("该订单并未存在合同信息!");
@@ -699,28 +756,51 @@ 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()));
@@ -760,15 +840,24 @@ 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());
@@ -810,10 +899,14 @@ 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());
@@ -1190,7 +1283,12 @@ 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);
@@ -1221,7 +1319,12 @@ 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);
@@ -1363,7 +1466,8 @@ 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("承运订单-完结订单-物流单据不存在!");
         }
@@ -1381,7 +1485,8 @@ 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("当前订单并不属于【待派车】,【运输中】状态");
         }
         /**完结拦截*/
@@ -1404,7 +1509,9 @@ 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<>();
@@ -1424,7 +1531,7 @@ public class AcceptCarriageOrderService {
             });
         }
         /**是否是一级订单,是->推送至贸易,否,数据推送至物流订单上级*/
-        if (logisticsOrder.getPid() == null && ("1".equals(logisticsOrder.getType()))) {
+        if (logisticsOrder.getPid() == null && logisticsOrder.getType().equals("1")) {
             //数据推送至贸易订单
             CompleteLogisticsOrderParam tradeOrder = new CompleteLogisticsOrderParam();
             //todo 2023-09-07 修改为传递页面传输值  不传递总量
@@ -1436,7 +1543,9 @@ 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 {
@@ -1511,10 +1620,23 @@ 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());
@@ -1579,9 +1701,16 @@ 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());
@@ -1619,7 +1748,8 @@ 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());
@@ -1638,7 +1768,12 @@ 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);
@@ -1672,18 +1807,29 @@ 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());
@@ -1740,12 +1886,14 @@ 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());
@@ -1874,27 +2022,31 @@ 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(entCacheResDto1 == null ? null : entCacheResDto1.getId());
+        consignUnit.setTopEntId(entCacheResDto == null ? null : entCacheResDto.getId());
         consignUnit.setFirmName(orderDTO.getConsignCompany());
-        consignUnit.setContactsId(Long.parseLong(orderDTO.getAcceptContactsId()));
-        //发起方
+        consignUnit.setContactsId(Long.parseLong(orderDTO.getConsignContactsId()));
+
+        //承运单位
+        EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(Long.parseLong(orderDTO.getAcceptCompanyId()));
         KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
         carriageUnit.setUnitType(NumberConstant.TWO);
         carriageUnit.setEntId(Long.parseLong(orderDTO.getAcceptCompanyId()));
-        carriageUnit.setTopEntId(entCacheResDto == null ? null : entCacheResDto.getId());
+        carriageUnit.setTopEntId(entCacheResDto1 == null ? null : entCacheResDto1.getId());
         carriageUnit.setFirmName(orderDTO.getAcceptCompany());
-        carriageUnit.setContactsId(Long.parseLong(orderDTO.getConsignContactsId()));
+        carriageUnit.setContactsId(Long.parseLong(orderDTO.getAcceptContactsId()));
 //        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();
@@ -2227,8 +2379,10 @@ 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);
@@ -2273,16 +2427,20 @@ 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);
             }
         }
@@ -2397,16 +2555,20 @@ 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);
             }
         }
@@ -2464,7 +2626,10 @@ public class AcceptCarriageOrderService {
     }
 
     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());
@@ -2521,16 +2686,20 @@ 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);
             }
         }
@@ -2745,7 +2914,8 @@ 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"));
@@ -2753,7 +2923,8 @@ 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;
@@ -2770,7 +2941,8 @@ 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"));
@@ -2778,7 +2950,8 @@ 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;
@@ -2797,7 +2970,8 @@ 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"));
@@ -2805,7 +2979,8 @@ 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;
@@ -2854,14 +3029,15 @@ 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 ("2".equals(logisticsOrderStatistics.getTypeOne())) {
+            List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList,
+                    OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
+            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
                 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 ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
+            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
                 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));
@@ -2879,14 +3055,15 @@ 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 ("2".equals(logisticsOrderStatistics.getTypeOne())) {
+            List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList,
+                    OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
+            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
                 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 ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
+            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
                 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 ("1".equals(type)) {
+            if (type.equals("1")) {
                 map.put("companyName", consignUnit.getFirmName());
                 sendLogisticsCreateByMessage(createBy, entId, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
             } else {
@@ -312,13 +312,12 @@ 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
@@ -344,13 +343,12 @@ public class CommonService {
                 .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
@@ -376,7 +374,7 @@ public class CommonService {
                 .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));
     }
 

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

@@ -916,7 +916,7 @@ public class ConsignOrderService {
             });
         }
         /**是否是一级订单,是->推送至贸易,否,数据推送至物流订单上级*/
-        if (logisticsOrder.getPid() == null && ("1".equals(logisticsOrder.getType()))) {
+        if (logisticsOrder.getPid() == null && logisticsOrder.getType().equals("1")) {
             //数据推送至贸易订单
             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 ("2".equals(logisticsOrderStatistics.getTypeOne())) {
+            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
                 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 ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
+            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
                 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 ("2".equals(logisticsOrderStatistics.getTypeOne())) {
+            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
                 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 ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
+            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
                 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/KwtWaybillOrderService.java

@@ -1853,7 +1853,7 @@ public class KwtWaybillOrderService {
         logisticsOrder.setTotalUnloadAmount(waybillCount.getUnloadAmount().add(LogisticsCount.getUnloadAmount()));
         logisticsOrderDao.updateById(logisticsOrder);
 
-        /**1-3更新贸易订单总量**/
+        /**1-3更新贸易订单总量
         if (logisticsLevel(logisticsOrder) == Global.NUMERICAL_ONE) {
             //物流订单统计(运输完成后的物流订单)
             LogisticsCountVo tradeCount = logisticsOrderDao.findLogisticsOrderCount(new HashMap<>() {{
@@ -1871,7 +1871,7 @@ public class KwtWaybillOrderService {
             tradeOrder.setUpdateBy(LoginUserHolder.getUserId());
             tradeOrder.setUpdateByName(LoginUserHolder.getUserName());
             tradeOrderInfoService.updateActualAmount(tradeOrder);
-        }
+        }**/ //与物流订单完结订单统计履约量统计重复，该处适用于物流订单自动完结
 
         /**1-4Mongodb数据更新**/
         //承运订单

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

@@ -281,10 +281,10 @@ public class LogisticsConsignmentService {
             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();
+            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 = "1";