下单流程

ship-module-otc/ship-module-otc-api/src/main/java/com/yc/ship/module/otc/api/store/dto/StoreInfoRespDTO.java

@@ -8,7 +8,7 @@ import lombok.Data;
 public class StoreInfoRespDTO {
 
     @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9072")
-    private Long Id;
+    private Long id;
 
     @Schema(description = "门店名称", example = "9072")
     private String name;

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/api/store/StoreApiImpl.java

@@ -317,6 +317,9 @@ public class StoreApiImpl implements StoreApi {
     @Override
     public StoreInfoRespDTO getStoreInfo(Long id) {
         StoreDO store = storeService.getStore(id);
-        return BeanUtils.toBean(store, StoreInfoRespDTO.class);
+        StoreInfoRespDTO storeInfoRespDTO = new StoreInfoRespDTO();
+        storeInfoRespDTO.setId(store.getId());
+        storeInfoRespDTO.setName(store.getStoreName());
+        return storeInfoRespDTO;
     }
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyage/vo/VoyagePageReqVO.java

@@ -29,6 +29,9 @@ public class VoyagePageReqVO extends PageParam {
     @Schema(description = "航线", example = "4445")
     private Long routeId;
 
+    @Schema(description = "航线/游轮名称", example = "4445")
+    private String searchKey;
+
     @Schema(description = "登船时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] boardingTime;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/productBase/ProductBaseServiceImpl.java

@@ -219,6 +219,11 @@ public class ProductBaseServiceImpl implements ProductBaseService {
         iPage.getRecords().forEach(vo -> {
             List<ResourceDO> resourceList = resourceMapper.getListWithoutExcludeId(vo.getId(), null);
             vo.setResourceList(BeanUtils.toBean(resourceList, ResourceSimpleRespVO.class));
+
+            // 查询 最低成本价 与 最低销售价
+            List<ProductBasePriceRespVO> basePriceList = basePriceService.queryPriceByBase(vo.getId());
+            vo.setBasePriceList(basePriceList);
+
         });
         return iPage.getRecords();
     }

ship-module-resource/ship-module-resource-biz/src/main/resources/mapper/baseprice/ProductBasePriceMapper.xml

@@ -10,7 +10,7 @@
      -->
     <select id="selectByBaseId" resultType="com.yc.ship.module.resource.controller.admin.baseprice.vo.ProductBasePriceRespVO">
         SELECT pb.id, pb.product_base_id productBaseId, pb.project_id projectId, pb.sale_price salePrice, pb.spec_type specType,
-        pb.specification_id specificationId, pb.cost_price costPrice, pb.sale_price salePrice
+        pb.specification_id specificationId, pb.cost_price costPrice
         FROM product_base_price pb where pb.deleted = 0
         AND pb.product_base_id = #{baseId} ORDER BY pb.id
     </select>