1.轴数改为多选

sckw-modules-api/sckw-fleet-api/src/main/java/com/sckw/fleet/api/RemoteFleetService.java

@@ -102,7 +102,7 @@ public interface RemoteFleetService {
      */
     RFleetVo findFleetById(Long fleetId);
 
-    String getCarAxisInfo(int axleNumId);
+    List<TmsTruckAxleNumVO> getCarAxisInfo(List<Integer> axleNumIds);
 
 
 }

sckw-modules-api/sckw-fleet-api/src/main/java/com/sckw/fleet/api/model/vo/TmsTruckAxleNumVO.java

@@ -0,0 +1,31 @@
+package com.sckw.fleet.api.model.vo;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Author: donglang
+ * Time: 2025-10-23
+ * Des: 车辆轴数
+ * Version: 1.0
+ */
+
+@Data
+@TableName("tms_truck_axle_num")
+public class TmsTruckAxleNumVO implements Serializable {
+
+    /**
+     * 主键ID
+     */
+    private Integer id;
+
+    /**
+     * 车辆轴数名称
+     */
+    private String name;
+
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dubbo/RemoteFleetServiceImpl.java

@@ -17,10 +17,7 @@ import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -366,19 +363,27 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
 
     /**
      * 查询轴数
-     * @param axleNumId
+     * @param axleNumIds
      * @return
      */
     @Override
-    public String getCarAxisInfo(int axleNumId) {
+    public List<TmsTruckAxleNumVO> getCarAxisInfo(List<Integer> axleNumIds) {
         //查询车辆关联司机信息
-        TmsTruckAxleNum axleNum = kwfTruckAxleNumRepository.getOne(Wrappers.<TmsTruckAxleNum>lambdaQuery()
+        List<TmsTruckAxleNum> axleNumList = kwfTruckAxleNumRepository.list(Wrappers.<TmsTruckAxleNum>lambdaQuery()
                 .eq(TmsTruckAxleNum::getStatus, 1)
-                .eq(TmsTruckAxleNum::getId,axleNumId));
-        if (axleNum == null) {
-            return null;
+                .in(TmsTruckAxleNum::getId, axleNumIds));
+        if (CollectionUtils.isEmpty(axleNumList)) {
+            return new ArrayList<>();
         }
-        return axleNum.getName();
+        List<TmsTruckAxleNumVO> voList = new ArrayList<>();
+        axleNumList.forEach(axleNum -> {
+            TmsTruckAxleNumVO vo = new TmsTruckAxleNumVO();
+            vo.setId(axleNum.getId());
+            vo.setName(axleNum.getName());
+            voList.add(vo);
+        });
+
+        return voList;
     }
 
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoods.java

@@ -136,7 +136,7 @@ public class KwpGoods extends BaseModel implements Serializable {
      * 轴数
      */
     @TableField("car_axis")
-    private int carAxis;
+    private String carAxis;
 
     /**
      * 富文本内容

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddGoodsParam.java

@@ -77,7 +77,7 @@ public class AddGoodsParam {
      * 轴数
      */
     @Schema(description = "轴数")
-    private Integer carAxis;
+    private String carAxis;
 
     /**
      * 富文本内容

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/UpdateGoodsParam.java

@@ -71,7 +71,7 @@ public class UpdateGoodsParam {
      * 轴数
      */
     @Schema(description = "轴数")
-    private int carAxis;
+    private String carAxis;
 
     /**
      * 富文本内容

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/res/GoodsDetail.java

@@ -102,10 +102,15 @@ public class GoodsDetail {
     private String priceUnit;
 
     /**
-     * 轴数
+     * 轴数id(逗号隔开)
      */
     private String carAxis;
 
+    /**
+     * 轴数(逗号隔开)
+     */
+    private String carAxisName;
+
     /**
      * 富文本内容
      */

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

@@ -25,6 +25,7 @@ import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.excel.utils.DateUtil;
 import com.sckw.fleet.api.RemoteFleetService;
+import com.sckw.fleet.api.model.vo.TmsTruckAxleNumVO;
 import com.sckw.payment.api.dubbo.PayCenterDubboService;
 import com.sckw.payment.api.model.constant.ChannelEnum;
 import com.sckw.payment.api.model.dto.WalletDto;
@@ -302,12 +303,9 @@ public class KwpGoodsService {
                 .setStatusLabel(CollectionUtils.isNotEmpty(goodsStatusMap) ? goodsStatusMap.get(String.valueOf(detail.getStatus())) : null);
         //商品图片信息
         if (Objects.nonNull(goods.getThumb())) {
-            detail.setThumb(FileUtils.splice(goods.getThumb()));
+            detail.setThumb(goods.getThumb());
         }
         List<KwpGoodsImage> goodsImages = kwpGoodsImageService.getByGoodsId(id);
-        goodsImages.forEach(e -> {
-            e.setImage(FileUtils.splice(e.getImage()));
-        });
         List<GoodsImagesDetail> images = BeanUtils.copyToList(goodsImages, GoodsImagesDetail.class);
         //商品价格
         List<KwpGoodsPriceRange> priceRanges = kwpGoodsPriceRangeService.getByGoodsId(id);
@@ -337,9 +335,16 @@ public class KwpGoodsService {
             });
         }
         detail.setImages(images).setPrice(price).setAttributes(attributes).setAddressInfo(addressInfo).setAssistUnit(assistUnit);
+
         //轴数
-        String carAxisName = remoteFleetService.getCarAxisInfo(goods.getCarAxis());
-        detail.setCarAxis(carAxisName);
+        if (StringUtils.isNotBlank(goods.getCarAxis())) {
+            detail.setCarAxis(goods.getCarAxis());
+            List<String> axleNumStrId = Arrays.asList(goods.getCarAxis().split(","));
+            List<Integer> axleNumIds = axleNumStrId.stream().map(str -> Integer.parseInt(str.trim())).collect(Collectors.toList());
+            List<TmsTruckAxleNumVO> carAxisInfo = remoteFleetService.getCarAxisInfo(axleNumIds);
+            String carAxisName = carAxisInfo.stream().map(TmsTruckAxleNumVO::getName).collect(Collectors.joining(","));
+            detail.setCarAxisName(carAxisName);
+        }
 
         return detail;
     }