fix

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/TradeOrderPara.java

@@ -24,4 +24,8 @@ public class TradeOrderPara implements Serializable {
 
     private List<Long> entId;
     private Long userId;
+    /**
+     * 类型（1供应商，2采购商，3物流属性）
+     */
+    private Integer type;
 }

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/res/UserResDto.java

@@ -22,4 +22,9 @@ public class UserResDto implements Serializable {
     private Integer systemType;
     private Long entId;
 
+    /**
+     * 类型（1供应商，2采购商，3物流属性）
+     */
+    private Integer type;
+
 }

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

@@ -2523,13 +2523,14 @@ public class KwoTradeOrderService {
         UserResDto userResDto = remoteSystemService.queryUserById(tradeOrderPara.getUserId());
         if (Objects.nonNull(userResDto)) {
             Integer systemType = userResDto.getSystemType();
+            tradeOrderPara.setType(userResDto.getType());
             if (!Objects.equals(systemType, SystemTypeEnum.MANAGE.getCode())) {
                 tradeOrderPara.setEntId(remoteUserService.findChildEntList(userResDto.getEntId()));
             }
         }
         List<TradeOrderVo> tradeOrderVos = kwoTradeOrderMapper.selectData(tradeOrderPara);
         if (CollUtil.isNotEmpty(tradeOrderVos)) {
-            Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.UNIT_TYPE.getType(), DictTypeEnum.CHARGING_TYPE.getType(),DictTypeEnum.TORDER_STATUS.getType()));
+            Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.UNIT_TYPE.getType(), DictTypeEnum.CHARGING_TYPE.getType(), DictTypeEnum.TORDER_STATUS.getType()));
             Map<String, String> statusMap, productNameMap, unitMap, chargeTypeMap;
             if (CollUtil.isNotEmpty(dict)) {
                 statusMap = CollUtil.isNotEmpty(dict.get(DictTypeEnum.TORDER_STATUS.getType())) ? dict.get(DictTypeEnum.TORDER_STATUS.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);

sckw-modules/sckw-order/src/main/resources/mapper/KwoTradeOrderMapper.xml

@@ -763,16 +763,19 @@
                 and a.create_time between #{para.startTime,jdbcType=TIMESTAMP} and #{para.endTime,jdbcType=TIMESTAMP}
             </if>
             <if test="para.entId != null and para.entId.size() > 0">
-                and (
-                    d.ent_id in
-                <foreach collection="para.entId" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-                or e.ent_id in
-                <foreach collection="para.entId" item="item" open="(" close=")" separator=",">
+                <if test="para.type != null and para.type == 1">
+                    and
+                    e.ent_id in
+                    <foreach collection="para.entId" item="item" open="(" close=")" separator=",">
                     #{item}
-                </foreach>
-                )
+                    </foreach>
+                </if>
+                <if test="para.type != null and para.type ==2">
+                    and d.ent_id in
+                    <foreach collection="para.entId" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
             </if>
             limit 10
         </where>

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

@@ -617,7 +617,12 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
     public UserResDto queryUserById(Long userId) {
         KwsUser kwsUser = kwsUserService.selectByKey(userId);
         if (Objects.nonNull(kwsUser)) {
-            return BeanUtil.toBean(kwsUser, UserResDto.class);
+            UserResDto bean = BeanUtil.toBean(kwsUser, UserResDto.class);
+            KwsEntType one = kwsEntTypeRepository.lambdaQuery().eq(KwsEntType::getEntId, kwsUser.getEntId()).last("limit 1").one();
+            if (Objects.nonNull(one)) {
+                bean.setType(one.getType());
+            }
+            return bean;
         }
         return null;
     }
@@ -986,6 +991,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
     /**
      * 计算平台配置的运单单趟总耗时
      * 获取自动派单系数配置（单趟耗时 = 装货时间 + 卸货时间 + 运输时间 + 返回时间）
+     *
      * @param dto
      * @return
      */
@@ -1023,6 +1029,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
 
     /**
      * 计算平台配置贸易订单实际派车数
+     *
      * @param dto
      * @return
      */
@@ -1059,10 +1066,10 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         Integer maxRoundTripTimes = roundTripBig.setScale(0, RoundingMode.FLOOR).intValue();
 
         //单车总运量 = 车辆平均载重 X 单车最大往返次数
-        int totalVehicle  = vehicleAvgLoad * maxRoundTripTimes;
+        int totalVehicle = vehicleAvgLoad * maxRoundTripTimes;
         BigDecimal totalVehicleBig = new BigDecimal(totalVehicle);
         //所需车辆数 = 订单总量/单车总运量
-        BigDecimal vehiclesNum  = dto.getAmount().multiply(totalVehicleBig);
+        BigDecimal vehiclesNum = dto.getAmount().multiply(totalVehicleBig);
 
         //实际派车 = 所需车辆数 X 缓冲系数（向上取整）
         BigDecimal actualVehicleBig = vehiclesNum.multiply(bufferCoefficient);
@@ -1071,7 +1078,8 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
     }
 
     /**
-     *  平台单趟耗时
+     * 平台单趟耗时
+     *
      * @param dto
      * @return
      */

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

@@ -24,4 +24,8 @@ public class LogisticsOrderPara implements Serializable {
 
     private List<Long> entId;
     private Long userId;
+    /**
+     * 类型（1供应商，2采购商，3物流属性）
+     */
+    private Integer type;
 }

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

@@ -3283,6 +3283,7 @@ public class KwtLogisticsConsignmentService {
     public List<LogisticsOrderVo> queryList(LogisticsOrderPara orderPara) {
         UserResDto userResDto = remoteSystemService.queryUserById(orderPara.getUserId());
         if (Objects.nonNull(userResDto)) {
+            orderPara.setType(userResDto.getType());
             Integer systemType = userResDto.getSystemType();
             if (!Objects.equals(systemType, SystemTypeEnum.MANAGE.getCode())) {
                 orderPara.setEntId(remoteUserService.findChildEntList(userResDto.getEntId()));