fix: 价格模板添加附加产品接口

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricetemplate/PriceTemplateController.java

@@ -7,7 +7,7 @@ import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
-import com.yc.ship.module.product.controller.admin.pricearea.vo.PriceAreaRespVO;
+import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceAreaRespVO;
 import com.yc.ship.module.product.controller.admin.pricetemplate.vo.*;
 import com.yc.ship.module.product.dal.dataobject.pricearea.PriceAreaDO;
 import com.yc.ship.module.product.dal.dataobject.pricefloor.PriceFloorDO;
@@ -18,6 +18,7 @@ import com.yc.ship.module.product.service.pricearea.PriceAreaService;
 import com.yc.ship.module.product.service.pricefloor.PriceFloorService;
 import com.yc.ship.module.product.service.priceroommodel.PriceRoomModelService;
 import com.yc.ship.module.product.service.pricesinglesetting.PriceSingleSettingService;
+import com.yc.ship.module.product.service.pricespu.PriceSpuService;
 import com.yc.ship.module.product.service.pricetemplate.PriceTemplateService;
 import com.yc.ship.module.resource.api.ship.ShipApi;
 import com.yc.ship.module.resource.api.ship.dto.ShipRespDTO;
@@ -59,6 +60,9 @@ public class PriceTemplateController {
     @Resource
     private PriceAreaService priceAreaService;
 
+    @Resource
+    private PriceSpuService priceSpuService;
+
     @Resource
     private ShipApi shipApi;
 
@@ -101,6 +105,9 @@ public class PriceTemplateController {
         respVO.setFloorList(BeanUtils.toBean(floorDOList, PriceFloorRespVO.class));
         List<PriceAreaDO> areaList = priceAreaService.getListByObjectId(id);
         respVO.setAreaList(BeanUtils.toBean(areaList, PriceAreaRespVO.class));
+        //附加产品
+        List<PriceSpuRespVO> spuList = priceSpuService.getListByObjectId(id);
+        respVO.setSpuList(spuList);
         return success(respVO);
     }
 

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricearea/vo/PriceAreaRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.pricearea.vo;
+package com.yc.ship.module.product.controller.admin.pricetemplate.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricetemplate/vo/PriceSpuRespVO.java

@@ -0,0 +1,49 @@
+package com.yc.ship.module.product.controller.admin.pricetemplate.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 附加产品设置 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class PriceSpuRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2725")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "价格模板ID或者船票价格ID", example = "7825")
+    @ExcelProperty("价格模板ID或者船票价格ID")
+    private Long objectId;
+
+    @Schema(description = "附加产品ID", example = "1881")
+    @ExcelProperty("附加产品ID")
+    private Long spuId;
+
+    @Schema(description = "附加产品名称", example = "")
+    @ExcelProperty("附加产品名称")
+    private String spuName;
+
+    @Schema(description = "附加产品价格")
+    @ExcelProperty("附加产品价格")
+    private BigDecimal price;
+
+    @Schema(description = "附加产品分组")
+    @ExcelProperty("附加产品分组")
+    private String spuCategoryName;
+
+    @Schema(description = "是否必选")
+    @ExcelProperty("是否必选")
+    private Integer required;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricetemplate/vo/PriceTemplateRespVO.java

@@ -4,10 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yc.ship.framework.excel.core.annotations.DictFormat;
 import com.yc.ship.framework.excel.core.convert.DictConvert;
-import com.yc.ship.module.product.controller.admin.pricearea.vo.PriceAreaRespVO;
-import com.yc.ship.module.product.dal.dataobject.pricefloor.PriceFloorDO;
-import com.yc.ship.module.product.dal.dataobject.priceroommodel.PriceRoomModelDO;
-import com.yc.ship.module.product.dal.dataobject.pricesinglesetting.PriceSingleSettingDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -68,4 +64,6 @@ public class PriceTemplateRespVO {
     @Schema(description = "区域加价设置")
     private List<PriceAreaRespVO> areaList;
 
+    private List<PriceSpuRespVO> spuList;
+
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricetemplate/vo/PriceTemplateSaveReqVO.java

@@ -1,10 +1,10 @@
 package com.yc.ship.module.product.controller.admin.pricetemplate.vo;
 
-import com.yc.ship.module.product.controller.admin.pricearea.vo.PriceAreaRespVO;
 import com.yc.ship.module.product.dal.dataobject.pricearea.PriceAreaDO;
 import com.yc.ship.module.product.dal.dataobject.pricefloor.PriceFloorDO;
 import com.yc.ship.module.product.dal.dataobject.priceroommodel.PriceRoomModelDO;
 import com.yc.ship.module.product.dal.dataobject.pricesinglesetting.PriceSingleSettingDO;
+import com.yc.ship.module.product.dal.dataobject.pricespu.PriceSpuDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -50,4 +50,7 @@ public class PriceTemplateSaveReqVO {
     @Schema(description = "区域加价设置")
     private List<PriceAreaDO> areaList;
 
+    @Schema(description = "附加产品设置")
+    private List<PriceSpuDO> spuList;
+
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricevoyage/PriceVoyageController.java

@@ -1,14 +1,13 @@
 package com.yc.ship.module.product.controller.admin.pricevoyage;
 
 import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
-import com.yc.ship.framework.common.exception.ServiceException;
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageParam;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
-import com.yc.ship.module.product.controller.admin.pricearea.vo.PriceAreaRespVO;
+import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceAreaRespVO;
 import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceCountryRespVO;
 import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceFloorRespVO;
 import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceRoomModelRespVO;
@@ -33,7 +32,6 @@ import com.yc.ship.module.resource.api.route.RouteApi;
 import com.yc.ship.module.resource.api.route.dto.RouteRespDTO;
 import com.yc.ship.module.resource.api.ship.ShipApi;
 import com.yc.ship.module.resource.api.ship.dto.ShipRespDTO;
-import com.yc.ship.module.resource.dal.dataobject.ship.ResourceShipDO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricevoyage/vo/PriceVoyageRespVO.java

@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yc.ship.framework.excel.core.annotations.DictFormat;
 import com.yc.ship.framework.excel.core.convert.DictConvert;
-import com.yc.ship.module.product.controller.admin.pricearea.vo.PriceAreaRespVO;
+import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceAreaRespVO;
 import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceCountryRespVO;
 import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceFloorRespVO;
 import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceRoomModelRespVO;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricevoyage/vo/PriceVoyageSaveReqVO.java

@@ -1,6 +1,5 @@
 package com.yc.ship.module.product.controller.admin.pricevoyage.vo;
 
-import com.yc.ship.module.product.controller.admin.pricearea.vo.PriceAreaRespVO;
 import com.yc.ship.module.product.dal.dataobject.pricearea.PriceAreaDO;
 import com.yc.ship.module.product.dal.dataobject.pricefloor.PriceFloorDO;
 import com.yc.ship.module.product.dal.dataobject.priceroommodel.PriceRoomModelDO;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/dataobject/pricespu/PriceSpuDO.java

@@ -0,0 +1,44 @@
+package com.yc.ship.module.product.dal.dataobject.pricespu;
+
+import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 附加产品设置 DO
+ *
+ * @author 管理员
+ */
+@TableName("product_price_spu")
+@KeySequence("product_price_spu_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PriceSpuDO extends TenantBaseDO {
+
+    /**
+     * ID
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+     * 价格模板ID或者船票价格ID
+     */
+    private Long objectId;
+    /**
+     * 附加产品ID
+     */
+    private Long spuId;
+    /**
+     * 是否必选
+     */
+    private Integer required;
+
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/pricespu/PriceSpuMapper.java

@@ -0,0 +1,26 @@
+package com.yc.ship.module.product.dal.mysql.pricespu;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
+import com.yc.ship.module.product.dal.dataobject.pricespu.PriceSpuDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 附加产品设置 Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface PriceSpuMapper extends BaseMapperX<PriceSpuDO> {
+
+    default void deleteByObjectId(Long objectId) {
+        delete(new LambdaQueryWrapper<PriceSpuDO>().eq(PriceSpuDO::getObjectId, objectId));
+    }
+
+    default List<PriceSpuDO> selectListByObjectId(Long id) {
+        return selectList(new LambdaQueryWrapper<PriceSpuDO>().eq(PriceSpuDO::getObjectId, id));
+    }
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/pricearea/PriceAreaService.java

@@ -1,6 +1,5 @@
 package com.yc.ship.module.product.service.pricearea;
 
-import com.yc.ship.module.product.controller.admin.pricearea.vo.PriceAreaRespVO;
 import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceCountryRespVO;
 import com.yc.ship.module.product.dal.dataobject.pricearea.PriceAreaDO;
 

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/pricearea/PriceAreaServiceImpl.java

@@ -1,6 +1,5 @@
 package com.yc.ship.module.product.service.pricearea;
 
-import com.yc.ship.module.product.controller.admin.pricearea.vo.PriceAreaRespVO;
 import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceCountryRespVO;
 import com.yc.ship.module.product.dal.dataobject.pricearea.PriceAreaDO;
 import org.springframework.stereotype.Service;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/pricespu/PriceSpuService.java

@@ -0,0 +1,16 @@
+package com.yc.ship.module.product.service.pricespu;
+
+import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceSpuRespVO;
+
+import java.util.List;
+
+/**
+ * 附加产品设置 Service 接口
+ *
+ * @author 管理员
+ */
+public interface PriceSpuService {
+
+
+    List<PriceSpuRespVO> getListByObjectId(Long id);
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/pricespu/PriceSpuServiceImpl.java

@@ -0,0 +1,59 @@
+package com.yc.ship.module.product.service.pricespu;
+
+import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceSpuRespVO;
+import com.yc.ship.module.product.dal.dataobject.pricespu.PriceSpuDO;
+import com.yc.ship.module.product.dal.dataobject.productSpu.ProductSpuDO;
+import com.yc.ship.module.product.service.productSpu.ProductSpuService;
+import com.yc.ship.module.resource.controller.admin.category.vo.CategoryRespVO;
+import com.yc.ship.module.resource.dal.dataobject.category.CategoryDO;
+import com.yc.ship.module.resource.service.category.CategoryService;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import com.yc.ship.module.product.dal.mysql.pricespu.PriceSpuMapper;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 附加产品设置 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class PriceSpuServiceImpl implements PriceSpuService {
+
+    @Resource
+    private PriceSpuMapper priceSpuMapper;
+
+    @Resource
+    private ProductSpuService productSpuService;
+
+    @Resource
+    private CategoryService categoryService;
+
+
+    @Override
+    public List<PriceSpuRespVO> getListByObjectId(Long id) {
+        List<PriceSpuDO> list = priceSpuMapper.selectListByObjectId(id);
+        List<PriceSpuRespVO> respVOList = BeanUtils.toBean(list, PriceSpuRespVO.class);
+        List<Long> spuIds = CollectionUtils.convertList(respVOList, PriceSpuRespVO::getSpuId);
+        List<ProductSpuDO> spuList = productSpuService.getProductList(spuIds);
+        Map<Long, ProductSpuDO> spuMap = CollectionUtils.convertMap(spuList, ProductSpuDO::getId);
+        //产品分组
+        List<Long> categoryIds = CollectionUtils.convertList(spuList, ProductSpuDO::getCategoryId);
+        List<CategoryDO> categoryList = categoryService.getListByIds(categoryIds);
+        Map<Long, CategoryDO> categoryMap = CollectionUtils.convertMap(categoryList, CategoryDO::getId);
+        respVOList.stream().forEach(item -> {
+           item.setPrice(spuMap.get(item.getSpuId()).getSalePrice());
+           item.setSpuName(spuMap.get(item.getSpuId()).getProductName());
+           item.setSpuCategoryName(categoryMap.get(spuMap.get(item.getSpuId()).getCategoryId()).getCateName());
+        });
+        return respVOList;
+    }
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/pricetemplate/PriceTemplateServiceImpl.java

@@ -9,11 +9,13 @@ import com.yc.ship.module.product.dal.dataobject.pricearea.PriceAreaDO;
 import com.yc.ship.module.product.dal.dataobject.pricefloor.PriceFloorDO;
 import com.yc.ship.module.product.dal.dataobject.priceroommodel.PriceRoomModelDO;
 import com.yc.ship.module.product.dal.dataobject.pricesinglesetting.PriceSingleSettingDO;
+import com.yc.ship.module.product.dal.dataobject.pricespu.PriceSpuDO;
 import com.yc.ship.module.product.dal.dataobject.pricetemplate.PriceTemplateDO;
 import com.yc.ship.module.product.dal.mysql.pricearea.PriceAreaMapper;
 import com.yc.ship.module.product.dal.mysql.pricefloor.PriceFloorMapper;
 import com.yc.ship.module.product.dal.mysql.priceroommodel.PriceRoomModelMapper;
 import com.yc.ship.module.product.dal.mysql.pricesinglesetting.PriceSingleSettingMapper;
+import com.yc.ship.module.product.dal.mysql.pricespu.PriceSpuMapper;
 import com.yc.ship.module.product.dal.mysql.pricetemplate.PriceTemplateMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -50,6 +52,9 @@ public class PriceTemplateServiceImpl implements PriceTemplateService {
     @Resource
     private PriceAreaMapper priceAreaMapper;
 
+    @Resource
+    private PriceSpuMapper priceSpuMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createPriceTemplate(PriceTemplateSaveReqVO createReqVO) {
@@ -143,6 +148,13 @@ public class PriceTemplateServiceImpl implements PriceTemplateService {
         });
         priceAreaMapper.insertBatch(insertAreaList);
 
+        // 插入附加产品
+        List<PriceSpuDO> spuList = vo.getSpuList();
+        spuList.stream().forEach(spu -> {
+            spu.setObjectId(objectId);
+        });
+        priceSpuMapper.insertBatch(spuList);
+
     }
 
     private void deleteRelation(Long objectId) {
@@ -150,6 +162,7 @@ public class PriceTemplateServiceImpl implements PriceTemplateService {
         priceFloorMapper.deleteByObjectId(objectId);
         priceSingleSettingMapper.deleteByObjectId(objectId);
         priceAreaMapper.deleteByObjectId(objectId);
+        priceSpuMapper.deleteByObjectId(objectId);
     }
 
 }

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

@@ -179,7 +179,7 @@ public class VoyageStockDistributeServiceImpl implements VoyageStockDistributeSe
                     stockDistributeDO.setDistributorId(store.getAgencyId());
                     stockDistributeDO.setDistributorName(otcIdDistributorMap.get(store.getAgencyId()).getName());
                     stockDistributeDO.setStoreId(store.getId());
-                    stockDistributeDO.setStoreName(store.getName());
+                    stockDistributeDO.setStoreName(store.getStoreName());
                     stockDistributeDO.setShipId(voyage.getShipId());
                     list.add(stockDistributeDO);
                 });

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/category/CategoryService.java

@@ -99,4 +99,6 @@ public interface CategoryService {
 
     List<CategoryRespVO> getListByIds(CategoryListReqVO reqVO);
     List<CategoryRespVO> getCategoryRespListByIds(Long id);
+
+    List<CategoryDO> getListByIds(List<Long> ids);
 }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/category/CategoryServiceImpl.java

@@ -29,10 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -299,6 +296,14 @@ public class CategoryServiceImpl implements CategoryService {
         return categoryMapper.getAllUpCategoryById(id, 1);
     }
 
+    @Override
+    public List<CategoryDO> getListByIds(List<Long> ids) {
+        if(ids.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return categoryMapper.selectByIds(ids);
+    }
+
     private String getAllParentIds(Long id) {
         if (0L == id) {
             return "";