1.修改物流托运多线程下loginUserHolder获取userid取值问题

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

@@ -3,7 +3,6 @@ package com.sckw.order.api.dubbo;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.order.api.model.*;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -50,7 +49,7 @@ public interface TradeOrderInfoService {
      * @Param loading: 辅助单位信息
      * @return: com.sckw.core.web.response.HttpResult
      */
-    HttpResult createOrCancelLogisticsOrderV1(Long tOrderId, List<GoodsLoadingParam> loading);
+    HttpResult createOrCancelLogisticsOrderV1(Long updateBy,String updateByName ,Long tOrderId, List<GoodsLoadingParam> loading);
 
     /**
      * @desc: 完结物流订单

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

@@ -30,10 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @desc: 订单dubbo实现
@@ -147,10 +144,10 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
     }
 
     @Override
-    public HttpResult createOrCancelLogisticsOrderV1(Long tOrderId, List<GoodsLoadingParam> loading) {
+    public HttpResult createOrCancelLogisticsOrderV1(Long updateBy,String updateByName,Long tOrderId, List<GoodsLoadingParam> loading) {
         /*1、数据校验*/
-        Long updateBy = LoginUserHolder.getUserId();
-        String updateByName = LoginUserHolder.getUserName();
+//        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/service/KwtAcceptCarriageOrderService.java

@@ -826,7 +826,7 @@ public class KwtAcceptCarriageOrderService {
                             param.setUpdateByName(LoginUserHolder.getUserName());
                             HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrder(param);*/
                             List<GoodsLoadingParam> goodsLoading = logisticsOrderGoodsService.goodsLoadingParams(logisticsOrder, false);
-                            HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(logisticsOrder.getTOrderId(), goodsLoading);
+                            HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(),LoginUserHolder.getUserName(),logisticsOrder.getTOrderId(), goodsLoading);
                             if (result1.getCode() != HttpStatus.SUCCESS_CODE) {
                                 log.info("{}拒绝接单->贸易订单失败!,返回信息:{}", "id:" + logisticsOrder.getTOrderId() + "orderNo" + logisticsOrder.getTOrderNo(), JSONObject.toJSONString(result1));
                                 throw new BusinessException("{" + logisticsOrder.getTOrderNo() + "} 拒绝接单->贸易订单失败!");
@@ -1555,7 +1555,8 @@ public class KwtAcceptCarriageOrderService {
                     param.setUpdateByName(LoginUserHolder.getUserName());
                     HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrder(param);*/
                     List<GoodsLoadingParam> goodsLoading = logisticsOrderGoodsService.goodsLoadingParams(logisticsOrder, true);
-                    HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(logisticsOrder.getTOrderId(), goodsLoading);
+//                    HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(logisticsOrder.getTOrderId(), goodsLoading);
+                    HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(),LoginUserHolder.getUserName(),logisticsOrder.getTOrderId(), goodsLoading);
                     if (result1.getCode() != HttpStatus.SUCCESS_CODE) {
                         log.info("{}拒绝接单->贸易订单失败!,返回信息:{}", "id:" + logisticsOrder.getTOrderId() + "orderNo" + logisticsOrder.getTOrderNo(), JSONObject.toJSONString(result1));
                         throw new BusinessException("{" + logisticsOrder.getTOrderNo() + "} 拒绝接单->贸易订单失败!" + result1.getMsg());
@@ -2984,6 +2985,7 @@ public class KwtAcceptCarriageOrderService {
 
     /**
      * 工作台-物流运输数据统计
+     *
      * @param logisticsOrderStatistics 统计参数
      * @return 数据
      */

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

@@ -945,7 +945,8 @@ public class KwtConsignOrderService {
                     param.setUpdateByName(LoginUserHolder.getUserName());
                     HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrder(param);*/
                     List<GoodsLoadingParam> goodsLoading = logisticsOrderGoodsService.goodsLoadingParams(logisticsOrder, true);
-                    HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(logisticsOrder.getTOrderId(), goodsLoading);
+//                    HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(logisticsOrder.getTOrderId(), goodsLoading);
+                    HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(),LoginUserHolder.getUserName(),logisticsOrder.getTOrderId(), goodsLoading);
                     if (result1.getCode() != HttpStatus.SUCCESS_CODE) {
                         log.info("托运订单手动完结订单-完结订单,返回信息:{}", "id:" + logisticsOrder.getTOrderId() + "orderNo" + logisticsOrder.getTOrderNo(), JSONObject.toJSONString(result1));
                         throw new BusinessException("{" + logisticsOrder.getTOrderNo() + "} 托运订单手动完结订单-完结订单!" + result1.getMsg());

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

@@ -261,7 +261,8 @@ public class KwtLogisticsConsignmentService {
         param.setUpdateByName(LoginUserHolder.getUserName());
         //HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrder(param);*/
         List<GoodsLoadingParam> goodsLoading = logisticsOrderGoodsService.goodsLoadingParams(order, true);
-        HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(order.getTOrderId(), goodsLoading);
+//        HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(order.getTOrderId(), goodsLoading);
+        HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(),LoginUserHolder.getUserName(),order.getTOrderId(), goodsLoading);
         if (httpResult.getCode() != HttpStatus.SUCCESS_CODE) {
             log.info("{}生成物流托运失败!,返回信息:{}", tradeOrder.getTOrderNo(), JSONObject.toJSONString(httpResult));
             throw new BusinessException("{" + tradeOrder.getTOrderNo() + "}生成物流托运失败!" + httpResult.getMsg());
@@ -1186,7 +1187,8 @@ public class KwtLogisticsConsignmentService {
             param.setUpdateByName(LoginUserHolder.getUserName());
             HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrder(param);*/
             List<GoodsLoadingParam> goodsLoading = logisticsOrderGoodsService.goodsLoadingParams(kwtLogisticsOrder, false);
-            HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(kwtLogisticsOrder.getTOrderId(), goodsLoading);
+//            HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(kwtLogisticsOrder.getTOrderId(), goodsLoading);
+            HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(),LoginUserHolder.getUserName(),kwtLogisticsOrder.getTOrderId(), goodsLoading);
             log.info("销售订单撤销托运-溯源贸易订单请求数据:{}[],返回数据:{}", kwtLogisticsOrder.getTOrderId(), JSONObject.toJSONString(goodsLoading), JSONObject.toJSONString(httpResult));
             if (HttpStatus.SUCCESS_CODE == httpResult.getCode()) {
 //                    kwtLogisticsOrder.setDelFlag(NumberConstant.ONE);
@@ -1289,7 +1291,8 @@ public class KwtLogisticsConsignmentService {
             param.setUpdateByName(LoginUserHolder.getUserName());
             HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrder(param);*/
             List<GoodsLoadingParam> goodsLoading = logisticsOrderGoodsService.goodsLoadingParams(kwtLogisticsOrder, false);
-            HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(kwtLogisticsOrder.getTOrderId(), goodsLoading);
+//            HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(kwtLogisticsOrder.getTOrderId(), goodsLoading);
+            HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(),LoginUserHolder.getUserName(),kwtLogisticsOrder.getTOrderId(), goodsLoading);
 
             log.info("采购订单撤销托运-溯源贸易订单请求数据:{}[],返回数据:{}", kwtLogisticsOrder.getTOrderId(), JSONObject.toJSONString(goodsLoading), JSONObject.toJSONString(httpResult));
             if (HttpStatus.SUCCESS_CODE == httpResult.getCode()) {

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

@@ -372,7 +372,8 @@ public class KwtTransportCommonService {
                     /**并不存在分包，撤销数据回归到贸易订单，[待接单状态]下才能撤销托运*/
                     /**调用dubbo 修改数值*/
                     List<GoodsLoadingParam> goodsLoading = logisticsOrderGoodsService.goodsLoadingParams(logisticsOrder, false);
-                    HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(logisticsOrder.getTOrderId(), goodsLoading);
+//                    HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(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));
                     }
@@ -906,7 +907,8 @@ public class KwtTransportCommonService {
 
                     //数据推送至贸易订单-更新时间装货量
                     List<GoodsLoadingParam> goodsLoading = logisticsOrderGoodsService.goodsLoadingParams(logisticsOrder, loading);
-                    httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(logisticsOrder.getTOrderId(), goodsLoading);
+//                    httpResult = tradeOrderInfoService.createOrCancelLogisticsOrderV1(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));
                         throw new BusinessException("{" + logisticsOrder.getTOrderNo() + "} 托运订单手动完结订单-完结订单!" + httpResult.getMsg());