Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server into main

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyagestock/vo/VoyageStockBaseVO.java

@@ -70,4 +70,8 @@ public class VoyageStockBaseVO {
     @Schema(description = "分享房间数")
     @ExcelProperty("分享房间数")
     private BigDecimal shareNum;
+
+    private Long routeId;
+
+    private Integer direction;
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/dataobject/voyagestock/VoyageStockDO.java

@@ -93,4 +93,9 @@ public class VoyageStockDO extends TenantBaseDO {
      */
     private BigDecimal shareNum;
 
+    @TableField(exist = false)
+    private Long routeId;
+    @TableField(exist = false)
+    private Integer direction;
+
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/voyagestock/VoyageStockMapper.java

@@ -33,7 +33,8 @@ public interface VoyageStockMapper extends BaseMapperX<VoyageStockDO> {
                 .orderByAsc(VoyageStockDO::getVoyageId));*/
         MPJLambdaWrapperX<VoyageStockDO> wrapperX = new MPJLambdaWrapperX<>();
         wrapperX.selectAll(VoyageStockDO.class);
-        wrapperX.leftJoin(VoyageDO.class, VoyageDO::getId, VoyageStockDO::getVoyageId);
+        wrapperX.leftJoin(VoyageDO.class,"pv", VoyageDO::getId, VoyageStockDO::getVoyageId)
+                .selectAs("pv.route_id", VoyageStockDO::getRouteId);
         wrapperX.likeIfPresent(VoyageStockDO::getVoyageName, reqVO.getVoyageName())
                 .eqIfPresent(VoyageStockDO::getShipId, reqVO.getShipId())
                 .inIfPresent(VoyageStockDO::getVoyageId, reqVO.getVoyageIds())

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestockdistribute/VoyageStockDistributeNewServiceImpl.java

@@ -2,7 +2,9 @@ package com.yc.ship.module.product.service.voyagestockdistribute;
 
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.collection.MapUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.module.product.controller.admin.voyage.vo.VoyageRespVO;
 import com.yc.ship.module.product.controller.admin.voyagestock.vo.VoyageStockPageReqVO;
 import com.yc.ship.module.product.controller.admin.voyagestock.vo.VoyageStockRespVO;
 import com.yc.ship.module.product.controller.admin.voyagestockdistributeNew.vo.*;
@@ -21,7 +23,9 @@ import com.yc.ship.module.product.service.voyagestockdetail.VoyageStockDetailSer
 import com.yc.ship.module.resource.api.room.RoomApi;
 import com.yc.ship.module.resource.api.room.dto.RoomRespDTO;
 import com.yc.ship.module.resource.dal.dataobject.roommodel.ResourceRoomModelDO;
+import com.yc.ship.module.resource.dal.dataobject.route.ResourceRouteDO;
 import com.yc.ship.module.resource.service.roommodel.ResourceRoomModelService;
+import com.yc.ship.module.resource.service.route.ResourceRouteService;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -75,6 +79,9 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
     @Resource
     private VoyageStockRoomUsedMapper voyageStockRoomUsedMapper;
 
+    @Resource
+    private ResourceRouteService routeService;
+
 
 
     @Override
@@ -218,6 +225,9 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
         VoyageStockPageReqVO pageParams = BeanUtils.toBean(reqVO, VoyageStockPageReqVO.class);
         PageResult<VoyageStockRespVO> voyageStockPage = voyageStockService.getVoyageStockPage(pageParams);
         List<VoyageStockRespVO> list = voyageStockPage.getList();
+        List<Long> routeIds = CollectionUtils.convertList(list, VoyageStockRespVO::getRouteId);
+        List<ResourceRouteDO> routeList = routeService.getList(routeIds);
+        Map<Long, Integer> routeDoMap = CollectionUtils.convertMap(routeList, ResourceRouteDO::getId, ResourceRouteDO::getDirection);
         List<Long> voyageIds = CollectionUtils.convertList(list, VoyageStockRespVO::getVoyageId);
         List<VoyageStockDistributeNewPageRespVO> distributeNewList = voyageStockDistributeNewMapper.selectGroupList(voyageIds, reqVO);
         Map<Long, BigDecimal> idNumMap = CollectionUtils.convertMap(distributeNewList, VoyageStockDistributeNewPageRespVO::getVoyageId, VoyageStockDistributeNewPageRespVO::getNum);
@@ -225,6 +235,13 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
         List<VoyageStockDistributeNewPageRespVO> resultList = new ArrayList<>();
 
         list.forEach(item -> {
+
+            MapUtils.findAndThen(routeDoMap, item.getRouteId(), direction -> item.setDirection(direction));
+            if(routeDoMap.get(item.getRouteId()) == 2) {
+                item.setVoyageName(item.getVoyageName()+"-下水");
+            }else {
+                item.setVoyageName(item.getVoyageName()+"-上水");
+            }
             BigDecimal num = idNumMap.get(item.getVoyageId());
             BigDecimal roomModelNum = idRoomModelNumMap.get(item.getVoyageId());
             // 根据航次查询是否有营销政策（暂时包含当天）