1.商品查询 list->one

2.司机app数据隔离

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/dubbo/TradeOrderInfoService.java

@@ -67,7 +67,7 @@ public interface TradeOrderInfoService {
      * @Param param:
      * @return: com.sckw.core.web.response.HttpResult
      */
-    HttpResult completeLogisticsOrderV1(Long tOrderId, List<GoodsLoadingV1Param> loading);
+    HttpResult completeLogisticsOrderV1(Long updateBy,String updateByName ,Long tOrderId, List<GoodsLoadingV1Param> loading);
 
     /**
      * @desc: 更新订单实际交付量

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

@@ -8,7 +8,6 @@ import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.StringUtils;
-import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.mongo.model.SckwTradeOrder;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
@@ -152,7 +151,10 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
         /*1、数据校验*/
 //        Long updateBy = LoginUserHolder.getUserId();
 //        String updateByName = LoginUserHolder.getUserName();
-        if (Objects.isNull(updateBy) || StringUtils.isBlank(updateByName)) {
+        if (updateBy == null) {
+            return HttpResult.error("操作人信息不能为空!");
+        }
+        if (org.apache.commons.lang3.StringUtils.isBlank(updateByName)) {
             return HttpResult.error("操作人信息不能为空!");
         }
         if (CollectionUtils.isEmpty(loading)) {
@@ -246,10 +248,8 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HttpResult completeLogisticsOrderV1(Long tOrderId, List<GoodsLoadingV1Param> loading) {
+    public HttpResult completeLogisticsOrderV1(Long updateBy, String updateByName,Long tOrderId,List<GoodsLoadingV1Param> loading) {
         /*1、数据校验*/
-        Long updateBy = LoginUserHolder.getUserId();
-        String updateByName = LoginUserHolder.getUserName();
         if (Objects.isNull(updateBy) || StringUtils.isBlank(updateByName)) {
             return HttpResult.error("操作人信息不能为空!");
         }

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

@@ -13,8 +13,10 @@ import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.config.easyexcel.RequestHolder;
 import com.sckw.excel.utils.ExcelUtil;
-import com.sckw.transport.api.dubbo.TransportService;
-import com.sckw.transport.model.dto.*;
+import com.sckw.transport.model.dto.AddOrderDTO;
+import com.sckw.transport.model.dto.OrderDTO;
+import com.sckw.transport.model.dto.OrderManualCompletionDto;
+import com.sckw.transport.model.dto.StopOrderTakingDTO;
 import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
 import com.sckw.transport.model.param.ConsignOrderQuery;
 import com.sckw.transport.model.param.DriverParam;
@@ -31,6 +33,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 /**
@@ -234,7 +237,7 @@ public class KwtConsignOrderController {
      */
     @RequestMapping(value = "/commitConsignOrderFinish", method = RequestMethod.POST)
     public HttpResult commitConsignOrderFinish(@Validated @RequestBody OrderManualCompletionDto orderFinishDTO) {
-        log.error("托运订单-完结订单:订单 {}", JSONObject.toJSONString(orderFinishDTO));
+        log.info("托运订单-完结订单:订单 {}", JSONObject.toJSONString(orderFinishDTO));
         try {
             //return consignOrderService.commitConsignOrderFinish(orderFinishDTO);
             return transportCommonService.orderFinish(orderFinishDTO);

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

@@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.contract.api.model.dto.res.ContractCommonInfoResDto;
-import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.*;
@@ -34,7 +34,10 @@ import com.sckw.transport.api.model.vo.LogisticsOrderVO;
 import com.sckw.transport.common.config.MessageUrlConfig;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
-import com.sckw.transport.model.dto.*;
+import com.sckw.transport.model.dto.CancelOrderDTO;
+import com.sckw.transport.model.dto.DocumentParamDTO;
+import com.sckw.transport.model.dto.OrderGoodsLoadingDto;
+import com.sckw.transport.model.dto.OrderManualCompletionDto;
 import com.sckw.transport.model.param.ContractParam;
 import com.sckw.transport.model.param.LogisticsOrderParam;
 import com.sckw.transport.model.vo.*;
@@ -238,7 +241,7 @@ public class KwtTransportCommonService {
             orderDetailVO.setPerformanceAmount(logisticsOrder.getTotalLoadAmount() == null ? null : logisticsOrder.getTotalLoadAmount());
         } else if (logisticsOrder.getBillingMode().equals(String.valueOf(NumberConstant.TWO))) {
             orderDetailVO.setPerformanceAmount(logisticsOrder.getUnloadAmount() == null ? null : logisticsOrder.getUnloadAmount());
-        }else {
+        } else {
             orderDetailVO.setPerformanceAmount(logisticsOrder.getUnloadAmount() == null ? null : logisticsOrder.getUnloadAmount());
         }
 //        orderDetailVO.setPerformanceAmount(logisticsOrder.getLoadAmount() == null ? null : logisticsOrder.getLoadAmount());
@@ -329,7 +332,7 @@ public class KwtTransportCommonService {
                 orderDetailVO.setOrderAmount(unloadAmount.multiply(price).subtract(fineValue));
             } else if (DictEnum.CHARGING_TYPE_3.getValue().equals(logisticsOrder.getBillingMode())) {
                 // 物流订单运单趟次数量
-                Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN){{
+                Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN) {{
                     put("upperlOrderId", logisticsOrder.getId());
                     put("passStatus", Global.NUMERICAL_ONE);
                 }};
@@ -376,7 +379,7 @@ public class KwtTransportCommonService {
                     /**调用dubbo 修改数值*/
                     List<GoodsLoadingParam> goodsLoading = logisticsOrderGoodsService.goodsLoadingParams(logisticsOrder, false);
 //                    HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(logisticsOrder.getTOrderId(), goodsLoading);
-                    HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(),LoginUserHolder.getUserName(),logisticsOrder.getTOrderId(), goodsLoading);
+                    HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(), LoginUserHolder.getUserName(), logisticsOrder.getTOrderId(), goodsLoading);
                     if (HttpStatus.SUCCESS_CODE != httpResult.getCode()) {
                         log.info("撤销托运错误:,请求参数:{}{},响应信息:{}", logisticsOrder.getTOrderId(), JSONObject.toJSONString(goodsLoading), JSONObject.toJSONString(httpResult));
                     }
@@ -502,8 +505,8 @@ public class KwtTransportCommonService {
     /**
      * 根据物流订单修改物流状态表
      *
-     * @param id 物流订单ID
-     * @param remark 备注
+     * @param id                 物流订单ID
+     * @param remark             备注
      * @param logisticsOrderEnum 物流订单昨天枚举
      */
     private void updateOrderTrack(Long id, String remark, LogisticsOrderEnum logisticsOrderEnum) {
@@ -673,7 +676,7 @@ public class KwtTransportCommonService {
                     actualAmount = (logisticsOrderDTO.getTotalUnloadAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrderDTO.getTotalUnloadAmount()).multiply(price);
                 } else if (DictEnum.CHARGING_TYPE_3.getValue().equals(billingMode)) {
                     // 物流订单运单趟次数量
-                    Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN){{
+                    Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN) {{
                         put("upperlOrderId", logisticsOrderDTO.getLOrderId());
                         put("passStatus", Global.NUMERICAL_ONE);
                     }};
@@ -740,6 +743,7 @@ public class KwtTransportCommonService {
 
     /**
      * 获取数据字典
+     *
      * @param type 字典类型
      * @return 数据
      */
@@ -754,6 +758,7 @@ public class KwtTransportCommonService {
 
     /**
      * 承运合同/托运合同-根据合同id获取托运订单列表
+     *
      * @param contractParam 参数
      * @return 合同信息
      */
@@ -796,11 +801,12 @@ public class KwtTransportCommonService {
 
     /**
      * 托运订单（自建、采购、贸易）/承运订单（自建、托运）-完结订单-数据查询展示
+     *
      * @param orderId 物流订单id
      * @return 数据
      */
     public HttpResult orderFinishDetail(String orderId) {
-        Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN){{
+        Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN) {{
             put("upperlOrderId", orderId);
             put("passStatus", Global.NUMERICAL_ONE);
         }};
@@ -815,7 +821,7 @@ public class KwtTransportCommonService {
         //物流订单辅助单位信息
         List<KwtLogisticsOrderGoodsUnit> goodsUnits = logisticsOrderGoodsService.findGoodsUnit(logisticsOrder.getId());
         if (CollectionUtils.isNotEmpty(goodsUnits)) {
-            goodsUnits.forEach(e ->{
+            goodsUnits.forEach(e -> {
                 assistUnit.add(new OrderGoodsLoadingVo(e.getUnit(), unitMap != null ? unitMap.get(e.getUnit()) : null, e.getTotalLoadAmount(), e.getTotalUnloadAmount()));
             });
         }
@@ -836,6 +842,8 @@ public class KwtTransportCommonService {
      * @author zk
      * @date 2023/12/8
      **/
+//    @GlobalTransactional(/*name = "default_tx_group"*/)
+    @Transactional
     public HttpResult orderFinish(OrderManualCompletionDto params) {
         /** 订单完结 物流运单状态为【待派车】、【运输中】可操作*/
         /**完结拦截 必须车辆运单无正在运输中的单据才能完结 状态有 待接单之后已核弹之前的状态 都不能完结*/
@@ -898,11 +906,11 @@ public class KwtTransportCommonService {
                 if (logisticsOrder.getPid() == null && "1".equals(logisticsOrder.getType())) {
                     List<GoodsLoadingV1Param> loadings = new ArrayList<>();
                     List<OrderGoodsLoadingDto> loading = params.getLoading();
-                    loading.forEach(e ->{
+                    loading.forEach(e -> {
                         loadings.add(new GoodsLoadingV1Param(e.getUnit(), e.getLoadAmount(), e.getUnloadAmount()));
                     });
                     //数据推送至贸易订单-更新总装卸货量
-                    HttpResult httpResult = tradeOrderInfoService.completeLogisticsOrderV1(logisticsOrder.getTOrderId(), loadings);
+                    HttpResult httpResult = tradeOrderInfoService.completeLogisticsOrderV1(LoginUserHolder.getUserId(), LoginUserHolder.getUserName(),logisticsOrder.getTOrderId(), loadings);
                     if (httpResult.getCode() != HttpStatus.SUCCESS_CODE) {
                         log.info("贸易订单手动完结订单异常,传递信息:{}{},返回信息:{}", logisticsOrder.getTOrderId(), loadings, JSONObject.toJSONString(httpResult));
                         throw new BusinessException("单据完结出现错误！" + httpResult.getMsg());
@@ -911,9 +919,15 @@ public class KwtTransportCommonService {
                     //数据推送至贸易订单-更新时间装货量
                     List<GoodsLoadingParam> goodsLoading = logisticsOrderGoodsService.goodsLoadingParams(logisticsOrder, loading);
 //                    httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(logisticsOrder.getTOrderId(), goodsLoading);
-                    httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(),LoginUserHolder.getUserName(),logisticsOrder.getTOrderId(), goodsLoading);
+                    httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(), LoginUserHolder.getUserName(), logisticsOrder.getTOrderId(), goodsLoading);
                     if (httpResult.getCode() != HttpStatus.SUCCESS_CODE) {
-                        log.info("托运订单手动完结订单-完结订单,传递信息:{},返回信息:{}", "id:" + logisticsOrder.getTOrderId() + "orderNo" + logisticsOrder.getTOrderNo(), JSONObject.toJSONString(httpResult));
+                        log.info("托运订单手动完结订单-完结订单,传递信息:{},返回信息:{}",
+                                "userId:" + LoginUserHolder.getUserId() +
+                                        "userName:" +LoginUserHolder.getUserName() +
+                                        "id:" + logisticsOrder.getTOrderId() +
+                                        "orderNo" + logisticsOrder.getTOrderNo(),
+                                JSONObject.toJSONString(httpResult))
+                        ;
                         throw new BusinessException("{" + logisticsOrder.getTOrderNo() + "} 托运订单手动完结订单-完结订单!" + httpResult.getMsg());
                     }
                 }
@@ -937,8 +951,8 @@ public class KwtTransportCommonService {
 
     /**
      * @param params 完结参数
-     * @param unit 单位
-     * @param type 装卸货类型
+     * @param unit   单位
+     * @param type   装卸货类型
      * @desc 获取装卸货量
      * @author zk
      * @date 2023/9/18
@@ -946,7 +960,7 @@ public class KwtTransportCommonService {
     public BigDecimal getLoading(OrderManualCompletionDto params, String unit, int type) {
         List<OrderGoodsLoadingDto> loadings = params.getLoading();
         if (CollectionUtils.isNotEmpty(loadings)) {
-            for (OrderGoodsLoadingDto loading:loadings) {
+            for (OrderGoodsLoadingDto loading : loadings) {
                 if (loading.getUnit().equals(unit)) {
                     return type == NumberConstant.ONE ? loading.getLoadAmount() : loading.getUnloadAmount();
                 }
@@ -957,6 +971,7 @@ public class KwtTransportCommonService {
 
     /**
      * 物流订单完结订单-修改物流表+新增物流状态记录
+     *
      * @param params 物流订单
      */
     public void updateLogisticOrderAndTrack(KwtLogisticsOrder params) {
@@ -996,9 +1011,10 @@ public class KwtTransportCommonService {
 
     /**
      * 修改物流表+新增物流状态记录
+     *
      * @param lOrderId 物流订单
-     * @param code 状态码
-     * @param remark 备注
+     * @param code     状态码
+     * @param remark   备注
      */
     private void updateLogisticOrderTrack(Long lOrderId, int code, String remark) {
         KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
@@ -1028,6 +1044,7 @@ public class KwtTransportCommonService {
 
     /**
      * 根据物流订单修改mongodb数据
+     *
      * @param logisticsOrder 物流订单
      */
     private void updateMongoDbByLogisticsOrder(KwtLogisticsOrder logisticsOrder) {

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

@@ -556,6 +556,12 @@
         LEFT JOIN kwt_waybill_order_address woa2 on woa2.w_order_id = wo.id and woa2.address_type = 2
         LEFT JOIN kwt_logistics_order_goods log on log.l_order_id = wo.l_order_id
         where wo.del_flag = 0 and lo.del_flag = 0
+        <if test="specialEntIds != null and specialEntIds.size() > 0">
+            and wo.ent_id in
+            <foreach collection="specialEntIds" item="item" open="(" close=")" separator=",">
+                #{item,jdbcType=BIGINT}
+            </foreach>
+        </if>
         <if test="driverId != null and driverId != ''">
             and wo.driver_id = #{driverId, jdbcType=BIGINT}
         </if>