From ea19c10b1fdb154c6052a37be2cde8fd0e4e172b Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 12 Apr 2024 09:44:39 +0800 Subject: [PATCH 1/8] =?UTF-8?q?1.=E5=B7=A5=E5=8E=82=E5=93=81=E7=B1=BB=202.?= =?UTF-8?q?=E5=BC=80=E5=8D=95=E5=8F=8A=E5=85=A5=E5=BA=93=E5=93=81=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BasicdataFactoryCategoryEntity.java | 1 + .../entity/BasicdataOpenIncomingSettingEntity.java | 1 + .../logpm/basicdata/feign/IBasicdataBrandClient.java | 2 ++ .../java/com/logpm/trunkline/dto/OpenOrderDTO.java | 1 + .../logpm/warehouse/entity/WarehouseWaybillEntity.java | 7 +++++++ .../controller/BasicdataCategoryController.java | 9 +++++++++ .../controller/BasicdataFactoryCategoryController.java | 2 +- .../controller/BasicdataOpenIncomingController.java | 4 ++-- .../basicdata/dto/BasicdataFactoryCategoryDTO.java | 2 ++ .../logpm/basicdata/feign/BasicdataBrandClient.java | 10 ++++++++++ .../basicdata/mapper/BasicdataCategoryMapper.java | 2 ++ .../logpm/basicdata/mapper/BasicdataCategoryMapper.xml | 7 +++++++ .../mapper/BasicdataFactoryCategoryMapper.xml | 1 + .../mapper/BasicdataOpenIncomingSettingMapper.java | 2 +- .../mapper/BasicdataOpenIncomingSettingMapper.xml | 6 ++---- .../basicdata/service/IBasicdataCategoryService.java | 3 +++ .../service/IBasicdataOpenIncomingSettingService.java | 3 +-- .../service/impl/BasicdataCategoryServiceImpl.java | 5 +++++ .../impl/BasicdataFactoryCategoryServiceImpl.java | 2 +- .../impl/BasicdataOpenIncomingSettingServiceImpl.java | 4 ++-- .../trunkline/service/impl/OpenOrderServiceImpl.java | 8 +++++++- 21 files changed, 68 insertions(+), 14 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFactoryCategoryEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFactoryCategoryEntity.java index 3b270b04e..8731594c6 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFactoryCategoryEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFactoryCategoryEntity.java @@ -41,6 +41,7 @@ public class BasicdataFactoryCategoryEntity extends TenantEntity { private Long categoryId; + private String category; private String firsts; private String seconds; private String thirds; diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataOpenIncomingSettingEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataOpenIncomingSettingEntity.java index 30775faa6..1e5c1b02b 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataOpenIncomingSettingEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataOpenIncomingSettingEntity.java @@ -41,6 +41,7 @@ public class BasicdataOpenIncomingSettingEntity extends TenantEntity { private Long warehouseId; + private String warehouseName; private String brand; private Long brandId; diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java index c644f26cd..fa19bf326 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java @@ -53,4 +53,6 @@ public interface IBasicdataBrandClient { @GetMapping(API_PREFIX+"/findAllList") List findAllList(); + @GetMapping(API_PREFIX+"/findEntityByName") + BasicdataBrandEntity findEntityByName(@RequestParam("brand") String brand); } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java index cfd7000b9..76b62614f 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java @@ -12,6 +12,7 @@ public class OpenOrderDTO implements Serializable { private Long waybillId; + private Long brandId;//品牌id private String brand;//品牌 private String trainNumber;//客户车次号 private String waybillNo;//运单号 diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java index c84a94390..cc1700288 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java @@ -64,11 +64,18 @@ public class WarehouseWaybillEntity extends TenantEntity { */ @ApiModelProperty(value = "客户车次") private String customerTrain; + /** + * 品牌 + */ + @ApiModelProperty(value = "品牌id") + private Long brandId; + /** * 品牌 */ @ApiModelProperty(value = "品牌") private String brand; + /** * 发货单位 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCategoryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCategoryController.java index 9d03708d7..9d824d1d5 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCategoryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCategoryController.java @@ -104,6 +104,15 @@ public class BasicdataCategoryController extends BladeController { return R.data(tree); } + @PostMapping("/listName") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入basicdataCategory") + public R listName(@RequestBody BasicdataCategoryVO basicdataCategory) { + List list = basicdataCategoryService.listName(basicdataCategory); + return R.data(list); + } + + /** * 品类 新增 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFactoryCategoryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFactoryCategoryController.java index faf44a5e6..8f9f5e2bf 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFactoryCategoryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFactoryCategoryController.java @@ -71,7 +71,7 @@ public class BasicdataFactoryCategoryController extends BladeController { public R remove(@RequestBody BasicdataFactoryCategoryDTO basicdataFactoryCategoryDTO) { String method = "############remove: "; log.info(method+"请求参数{}",basicdataFactoryCategoryDTO); - Long factoryCategoryId = basicdataFactoryCategoryDTO.getId(); + Long factoryCategoryId = basicdataFactoryCategoryDTO.getFactoryCategoryId(); try{ return R.status(basicdataFactoryCategoryService.removeById(factoryCategoryId)); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataOpenIncomingController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataOpenIncomingController.java index 99dea9c6f..5afc32aaf 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataOpenIncomingController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataOpenIncomingController.java @@ -3,8 +3,8 @@ package com.logpm.basicdata.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.basicdata.dto.BasicdataOpenIncomingDTO; +import com.logpm.basicdata.entity.BasicdataOpenIncomingSettingEntity; import com.logpm.basicdata.service.IBasicdataOpenIncomingSettingService; -import com.logpm.basicdata.vo.BasicdataOpenIncomingSettingVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -34,7 +34,7 @@ public class BasicdataOpenIncomingController { log.info(method+"请求参数{}",basicdataOpenIncomingDTO); try{ - IPage pages = basicdataOpenIncomingSettingService.pageList(basicdataOpenIncomingDTO); + IPage pages = basicdataOpenIncomingSettingService.pageList(basicdataOpenIncomingDTO); return R.data(pages); }catch (CustomerException e){ log.error(e.message,e); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataFactoryCategoryDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataFactoryCategoryDTO.java index d3f9abb81..3e89456c7 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataFactoryCategoryDTO.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataFactoryCategoryDTO.java @@ -9,4 +9,6 @@ public class BasicdataFactoryCategoryDTO extends BasicdataFactoryCategoryEntity private Integer pageSize; private Integer pageNum; + private Long factoryCategoryId; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataBrandClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataBrandClient.java index a60bdf53f..618b33e8f 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataBrandClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataBrandClient.java @@ -17,6 +17,7 @@ package com.logpm.basicdata.feign; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.basicdata.entity.BasicdataBrandEntity; import com.logpm.basicdata.service.IBasicdataBrandService; @@ -58,4 +59,13 @@ public class BasicdataBrandClient implements IBasicdataBrandClient { return basicdataBrandService.findAllList(); } + @Override + public BasicdataBrandEntity findEntityByName(String brand) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("brand_name",brand) + .eq("is_deleted",0); + + return basicdataBrandService.getOne(queryWrapper); + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.java index ed6e4a0cb..82c46328e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.java @@ -56,4 +56,6 @@ public interface BasicdataCategoryMapper extends BaseMapper lazyTree(String tenantId,Long parentId); List findListByName(@Param("goodsName") String goodsName); + + List listName(@Param("name") String name); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.xml index 2b76b3c50..0bd13388a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.xml @@ -113,6 +113,13 @@ limit 10 + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml index 354249236..7c950352a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml @@ -6,6 +6,7 @@ select * from logpm_basicdata_factory_category where 1=1 + and is_deleted = 0 and brand = #{param.brand} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.java index 4d6acfe13..07487e246 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface BasicdataOpenIncomingSettingMapper extends BaseMapper { - IPage pageList(IPage page, @Param("param") BasicdataOpenIncomingDTO basicdataOpenIncomingDTO); + IPage pageList(IPage page, @Param("param") BasicdataOpenIncomingDTO basicdataOpenIncomingDTO); BasicdataOpenIncomingSettingEntity findEntityByParam(@Param("param") BasicdataOpenIncomingDTO basicdataOpenIncomingDTO); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.xml index b71de652a..554831b43 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.xml @@ -2,11 +2,9 @@ - + select lboi.* from logpm_basicdata_open_incoming lboi - left join logpm_warehouse_warehouse lww on lww.id = lboi.warehouse_id where 1=1 and lboi.is_deleted = 0 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCategoryService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCategoryService.java index e7bf3b115..07a89ee28 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCategoryService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCategoryService.java @@ -54,4 +54,7 @@ public interface IBasicdataCategoryService extends BaseService lazyTree( String tenantId,Long parentId); List findListByName(String goodsName); + + List listName(BasicdataCategoryVO basicdataCategory); + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataOpenIncomingSettingService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataOpenIncomingSettingService.java index c89c27fe4..360b6203e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataOpenIncomingSettingService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataOpenIncomingSettingService.java @@ -3,12 +3,11 @@ package com.logpm.basicdata.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.basicdata.dto.BasicdataOpenIncomingDTO; import com.logpm.basicdata.entity.BasicdataOpenIncomingSettingEntity; -import com.logpm.basicdata.vo.BasicdataOpenIncomingSettingVO; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; public interface IBasicdataOpenIncomingSettingService extends BaseService { - IPage pageList(BasicdataOpenIncomingDTO basicdataOpenIncomingDTO); + IPage pageList(BasicdataOpenIncomingDTO basicdataOpenIncomingDTO); R addEntity(BasicdataOpenIncomingDTO basicdataOpenIncomingDTO); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCategoryServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCategoryServiceImpl.java index 9fdc3d6e2..a7714d832 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCategoryServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCategoryServiceImpl.java @@ -63,4 +63,9 @@ public class BasicdataCategoryServiceImpl extends BaseServiceImpl listName(BasicdataCategoryVO basicdataCategory) { + return baseMapper.listName(basicdataCategory.getName()); + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataFactoryCategoryServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataFactoryCategoryServiceImpl.java index 2e40ea431..76b06e81a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataFactoryCategoryServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataFactoryCategoryServiceImpl.java @@ -36,7 +36,7 @@ public class BasicdataFactoryCategoryServiceImpl extends BaseServiceImpl implements IBasicdataOpenIncomingSettingService { @Override - public IPage pageList(BasicdataOpenIncomingDTO basicdataOpenIncomingDTO) { + public IPage pageList(BasicdataOpenIncomingDTO basicdataOpenIncomingDTO) { IPage page = new Page<>(); page.setCurrent(basicdataOpenIncomingDTO.getPageNum()); page.setSize(basicdataOpenIncomingDTO.getPageSize()); - IPage pageList = baseMapper.pageList(page,basicdataOpenIncomingDTO); + IPage pageList = baseMapper.pageList(page,basicdataOpenIncomingDTO); return pageList; } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 45db9235e..20b199bb2 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -297,9 +297,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Long departureWarehouseId = openOrderDTO.getDepartureWarehouseId(); Long destinationWarehouseId = openOrderDTO.getDestinationWarehouseId(); + String brand = openOrderDTO.getBrand(); + BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand); + WarehouseWaybillEntity waybillEntity = new WarehouseWaybillEntity(); waybillEntity.setWaybillNo(waybillNo); - waybillEntity.setBrand(openOrderDTO.getBrand()); + if(!Objects.isNull(basicdataBrandEntity)){ + waybillEntity.setBrandId(basicdataBrandEntity.getId()); + } + waybillEntity.setBrand(brand); waybillEntity.setOrderNo(openOrderDTO.getOrderCode()); waybillEntity.setDepartureWarehouseId(departureWarehouseId); waybillEntity.setDepartureWarehouseName(openOrderDTO.getDepartureWarehouseName()); From b35b4294815d2f281af0f968b9b707d2fbf569c7 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 12 Apr 2024 11:04:21 +0800 Subject: [PATCH 2/8] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=9F=A5=E4=B8=8D?= =?UTF-8?q?=E5=87=BA=E9=9B=B6=E6=8B=85=E9=85=8D=E9=80=81=E5=8D=95=E5=AD=90?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionStockArticleMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 6fc72d26b..1ef2ad855 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -625,10 +625,13 @@ WHERE ldpll.order_package_loading_status != '20' AND ldpll.order_package_reservation_status !='20' AND ldpll.order_package_status != '70' - AND ldpll.conditions = 1 + AND ldpll.conditions != 2 AND ldsaa.warehouse_id = #{par.warehouseId} AND ldpll.warehouse_id = #{par.warehouseId} AND ldsaa.type_service = #{par.typeService} + + and ldsaa.order_code like concat(#{par.orderCode},'%') + GROUP BY ldsaa.id ) AS t ON t.id = ldsa.id From 184582e8e5d1d8d9d7183a53efc55186cad11813 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 12 Apr 2024 11:36:32 +0800 Subject: [PATCH 3/8] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=8B=86=E5=8D=95?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E8=AE=A2=E5=8D=95=E5=8F=B7=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java | 1 + .../warehouse/service/impl/WarehouseWaybillServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index 0b5017e6e..97a6741d1 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -47,6 +47,7 @@ import com.logpm.warehouse.service.*; import com.logpm.warehouse.vo.*; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.mapstruct.factory.Mappers; import org.springblade.common.constant.RedisKeyConstant; import org.springblade.common.constant.common.IsOrNoConstant; import org.springblade.common.exception.CustomerException; diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index aa1164d68..f5cb793b8 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -445,6 +445,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl Date: Fri, 12 Apr 2024 14:13:40 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E4=BD=93=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/BooleanEnums.java | 21 +++ .../common/enums/BooleanZeroOneEnums.java | 21 +++ .../springblade/common/model/DictBean.java | 15 ++ .../org/springblade/common/model/IDict.java | 170 ++++++++++++++++++ .../BasicdataPriceCategoryBasicEntity.java | 60 +++++++ .../BasicdataPriceCategoryDispatchEntity.java | 72 ++++++++ ...BasicdataPriceCategoryWarehouseEntity.java | 74 ++++++++ .../entity/BasicdataPriceEntity.java | 70 ++++++++ .../BasicdataPriceFullVehicleEntity.java | 59 ++++++ .../entity/BasicdataPriceGeneralEntity.java | 57 ++++++ .../entity/BasicdataPriceRouteEntity.java | 67 +++++++ .../entity/BasicdataPriceTemplateEntity.java | 151 ++++++++++++++++ .../feign/IBasicdataPriceClient.java | 45 +++++ .../vo/BasicdataPriceBasicUpdateVO.java | 49 +++++ .../vo/BasicdataPriceCategoryVO.java | 63 +++++++ .../vo/BasicdataPriceFullVehicleVO.java | 43 +++++ .../basicdata/vo/BasicdataPriceGeneralVO.java | 34 ++++ .../basicdata/vo/BasicdataPricePageVO.java | 58 ++++++ .../basicdata/vo/BasicdataPriceRouteVO.java | 44 +++++ .../vo/BasicdataPriceTemplateVO.java | 77 ++++++++ .../logpm/basicdata/vo/BasicdataPriceVO.java | 33 ++++ .../com/logpm/basicdata/vo/PriceBasicVO.java | 43 +++++ .../logpm/basicdata/vo/PriceCategoryVO.java | 20 +++ .../vo/PriceDispatchAdditionalVO.java | 49 +++++ .../basicdata/vo/PriceDispatchBasicVO.java | 45 +++++ .../logpm/basicdata/vo/PriceDispatchVO.java | 64 +++++++ .../com/logpm/basicdata/vo/PricePickupVO.java | 35 ++++ .../com/logpm/basicdata/vo/PriceRouteVO.java | 60 +++++++ .../logpm/basicdata/vo/PriceTrunkLineVO.java | 37 ++++ .../java/com/logpm/basicdata/vo/PriceVO.java | 35 ++++ .../vo/PriceWarehouseAdditionalVO.java | 47 +++++ .../basicdata/vo/PriceWarehouseBasicVO.java | 49 +++++ .../logpm/basicdata/vo/PriceWarehouseVO.java | 24 +++ .../logpm/factorydata/enums/NodeEnums.java | 54 ------ .../com/logpm/factorydata/vo/NodePushMsg.java | 4 +- .../impl/DistributionAsyncServiceImpl.java | 43 +++-- .../zbom/enums/ZbomNodeMappingEnums.java | 34 ++-- .../zbom/mq/ZbomNodeDataPushListener.java | 26 +-- .../report/mapper/ReportDeliverMapper.xml | 8 +- .../logpm/trunkline/dto/LoadScanBrandDTO.java | 4 + .../mapper/TrunklineCarsLoadMapper.java | 2 +- .../mapper/TrunklineCarsLoadMapper.xml | 6 +- .../impl/TrunklineCarsLoadServiceImpl.java | 72 ++++---- 43 files changed, 1893 insertions(+), 151 deletions(-) create mode 100644 blade-biz-common/src/main/java/org/springblade/common/enums/BooleanEnums.java create mode 100644 blade-biz-common/src/main/java/org/springblade/common/enums/BooleanZeroOneEnums.java create mode 100644 blade-biz-common/src/main/java/org/springblade/common/model/DictBean.java create mode 100644 blade-biz-common/src/main/java/org/springblade/common/model/IDict.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryBasicEntity.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryDispatchEntity.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryWarehouseEntity.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceEntity.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceFullVehicleEntity.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceGeneralEntity.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceRouteEntity.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceTemplateEntity.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataPriceClient.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceBasicUpdateVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceCategoryVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceFullVehicleVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceGeneralVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPricePageVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceRouteVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceTemplateVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceBasicVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceCategoryVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceDispatchAdditionalVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceDispatchBasicVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceDispatchVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PricePickupVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceRouteVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceTrunkLineVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseAdditionalVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseBasicVO.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseVO.java delete mode 100644 blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/enums/NodeEnums.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/enums/BooleanEnums.java b/blade-biz-common/src/main/java/org/springblade/common/enums/BooleanEnums.java new file mode 100644 index 000000000..35fa896b6 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/enums/BooleanEnums.java @@ -0,0 +1,21 @@ +package org.springblade.common.enums; + +import org.springblade.common.model.IDict; + +/** + * 布尔枚举值 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum BooleanEnums implements IDict { + + NO(false, "否"), + YES(true, "是"), + ; + + BooleanEnums(Boolean code, String text) { + init(code, text); + } + +} diff --git a/blade-biz-common/src/main/java/org/springblade/common/enums/BooleanZeroOneEnums.java b/blade-biz-common/src/main/java/org/springblade/common/enums/BooleanZeroOneEnums.java new file mode 100644 index 000000000..a3b34ff2b --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/enums/BooleanZeroOneEnums.java @@ -0,0 +1,21 @@ +package org.springblade.common.enums; + +import org.springblade.common.model.IDict; + +/** + * 布尔枚举值 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum BooleanZeroOneEnums implements IDict { + + NO(0, "否"), + YES(1, "是"), + ; + + BooleanZeroOneEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/DictBean.java b/blade-biz-common/src/main/java/org/springblade/common/model/DictBean.java new file mode 100644 index 000000000..ded8b1e03 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/model/DictBean.java @@ -0,0 +1,15 @@ +package org.springblade.common.model; + +import lombok.Data; + +/** + * 字典bean + * 只有code和text，可用于展示下拉框 + * + * @author zqb + */ +@Data +public class DictBean implements IDict { + private final T code; + private final String text; +} diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/IDict.java b/blade-biz-common/src/main/java/org/springblade/common/model/IDict.java new file mode 100644 index 000000000..cc73966cc --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/model/IDict.java @@ -0,0 +1,170 @@ +package org.springblade.common.model; + +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + + +/** + * 字典接口 + *

+ * 自定义的字典枚举类实现本接口后可省略属性code和text，以及对应的get方法 + * 在构造方法中只需调用init方法即可初始化 + * + * @author zqb + * @date 2024-04-01 + */ +public interface IDict { + /** + * 通过code获取value + * + * @param clazz 枚举class + * @param code code + * @return text + */ + static String getTextByCode(Class> clazz, T code) { + return Stream.of(clazz.getEnumConstants()) + .filter((IDict e) -> e.getCode().equals(code)) + .map(IDict::getText) + .findAny().orElse(null); + } + + /** + * 通过text获取code + * + * @param clazz 枚举class + * @param text text + * @return code + */ + static T getCodeByText(Class> clazz, String text) { + return Stream.of(clazz.getEnumConstants()) + .filter((IDict e) -> e.getText().equals(text)) + .map(IDict::getCode) + .findAny().orElse(null); + } + + /** + * 通过code获取字典枚举实例 + * + * @param clazz 枚举class + * @param code code + * @param 字典code类型 + * @param 枚举类型 + * @return 字典枚举实例 + */ + @SuppressWarnings("unchecked") + static > R getByCode(Class> clazz, T code) { + return Stream.of(clazz.getEnumConstants()) + .filter((IDict e) -> (e.getCode().equals(code))) + .map(v -> (R) v) + .findAny() + .orElse(null); + } + + /** + * 获取给定的字典枚举项（常用下拉框数据请求） + * + * @param enums 可指定需要哪些项 + * @return List + */ + @SafeVarargs + static > List> getItems(E... enums) { + return Stream.of(enums) + .map(DictPool::getDict) + .collect(Collectors.toList()); + } + + /** + * 获取所有字典枚举项，除开指定的枚举 + * + * @param exclude 指定排除的枚举 + * @return List + */ + @SafeVarargs + @SuppressWarnings("unchecked") + static > List> getItemsExclude(E... exclude) { + Class> clazz = (Class>) exclude.getClass().getComponentType(); + IDict[] allEnum = clazz.getEnumConstants(); + List> excludeList = Arrays.asList(exclude); + return Stream.of(allEnum) + .filter(e -> !excludeList.contains(e)) + .map(DictPool::getDict) + .collect(Collectors.toList()); + } + + /** + * 获取所有字典枚举项（常用下拉框数据请求） + * 枚举值上标记@Deprecated的不会返回 + * + * @param clazz 字典枚举类 + * @return List + */ + static List> getAll(Class> clazz) { + Map fieldCache = Arrays.stream(clazz.getDeclaredFields()). + filter(Field::isEnumConstant). + collect(Collectors.toMap(Field::getName, Function.identity())); + IDict[] allEnum = clazz.getEnumConstants(); + return Stream.of(allEnum) + .filter(e -> !fieldCache.get(((Enum) e).name()).isAnnotationPresent(Deprecated.class)) + .map(DictPool::getDict) + .collect(Collectors.toList()); + } + + /** + * 初始化 + * + * @param code 字典编码 + * @param text 字典文本 + */ + default void init(T code, String text) { + DictPool.putDict(this, code, text); + } + + /** + * 获取编码 + * + * @return 编码 + */ + default T getCode() { + return DictPool.getDict(this).getCode(); + } + + /** + * 获取文本 + * + * @return 文本 + */ + default String getText() { + return DictPool.getDict(this).getText(); + } + + + @SuppressWarnings("all") + class DictPool { + private static final Map DICT_MAP = new ConcurrentHashMap<>(); + + private static final Map> DICT_NAME_CLASS_MAP = new ConcurrentHashMap<>(); + + static void putDict(IDict dict, T code, String text) { + DICT_NAME_CLASS_MAP.put(dict.getClass().getName(), dict.getClass()); + DICT_MAP.put(dict, new DictBean<>(code, text)); + } + + public static List> getDict(String dictName) { + Class aClass = DICT_NAME_CLASS_MAP.get(dictName); + return IDict.getAll((Class>) aClass); + } + + static , T> DictBean getDict(K dict) { + return DICT_MAP.get(dict); + } + + + } + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryBasicEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryBasicEntity.java new file mode 100644 index 000000000..26a50d26d --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryBasicEntity.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 基础价格按品类计费基础价格（提货，干线） 实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +@TableName("logpm_basicdata_price_category_basic") +@ApiModel(value = "BasicdataPriceCategory对象", description = "基础价格按品类计费基础价格") +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceCategoryBasicEntity extends TenantEntity { + @ApiModelProperty(value = "预留1") + private String reserve1; + @ApiModelProperty(value = "预留2") + private String reserve2; + @ApiModelProperty(value = "预留3") + private String reserve3; + @ApiModelProperty(value = "预留4") + private String reserve4; + @ApiModelProperty(value = "预留5") + private String reserve5; + @ApiModelProperty(value = "业务id") + private Long boId; + @ApiModelProperty(value = "基础价格id") + private Long priceId; + @ApiModelProperty(value = "品类id") + private Long categoryId; + @ApiModelProperty(value = "计费类型（1：按件，3：按方，4：按重量）") + private Integer type; + @ApiModelProperty(value = "服务类型（1：提货，2：提货路径，3：干线，4：干线路径）") + private Integer serviceType; + @ApiModelProperty(value = "单价") + private Double price; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryDispatchEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryDispatchEntity.java new file mode 100644 index 000000000..7e8728ae1 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryDispatchEntity.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 基础价格按品类计费配送费 实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +@TableName("logpm_basicdata_price_category_dispatch") +@ApiModel(value = "BasicdataPriceCategory对象", description = "基础价格按品类计费配送费") +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceCategoryDispatchEntity extends TenantEntity { + @ApiModelProperty(value = "预留1") + private String reserve1; + @ApiModelProperty(value = "预留2") + private String reserve2; + @ApiModelProperty(value = "预留3") + private String reserve3; + @ApiModelProperty(value = "预留4") + private String reserve4; + @ApiModelProperty(value = "预留5") + private String reserve5; + @ApiModelProperty(value = "业务id") + private Long boId; + @ApiModelProperty(value = "基础价格id") + private Long priceId; + @ApiModelProperty(value = "品类id") + private Long categoryId; + @ApiModelProperty(value = "计费类型（1：按件，2：按方，3：按重量，4：按公里，5：按吨公里，6：按吨）") + private Integer type; + @ApiModelProperty(value = "费用类型（1：普通费，2附加费）") + private Integer costType; + @ApiModelProperty(value = "服务类型（1：配送）") + private Integer serviceType; + @ApiModelProperty(value = "单价") + private Double price; + @ApiModelProperty(value = "遗留单价") + private Double leaveBehindPrice; + @ApiModelProperty(value = "分货费") + private Double sortPrice; + @ApiModelProperty(value = "操作/装卸费") + private Double handlingPrice; + @ApiModelProperty(value = "平移费") + private Double relocationPrice; + @ApiModelProperty(value = "上楼费") + private Double upstairsDeliveryPrice; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryWarehouseEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryWarehouseEntity.java new file mode 100644 index 000000000..d4002783b --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceCategoryWarehouseEntity.java @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 基础价格按品类计费仓储费 实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +@TableName("logpm_basicdata_price_category_warehouse") +@ApiModel(value = "BasicdataPriceCategoryWarehouseEntity", description = "基础价格按品类计费仓储费") +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceCategoryWarehouseEntity extends TenantEntity { + @ApiModelProperty(value = "预留1") + private String reserve1; + @ApiModelProperty(value = "预留2") + private String reserve2; + @ApiModelProperty(value = "预留3") + private String reserve3; + @ApiModelProperty(value = "预留4") + private String reserve4; + @ApiModelProperty(value = "预留5") + private String reserve5; + @ApiModelProperty(value = "业务id") + private Long boId; + @ApiModelProperty(value = "基础价格id") + private Long priceId; + @ApiModelProperty(value = "品类id") + private Long categoryId; + @ApiModelProperty(value = "计费类型（1：按件，2：按方，3：按重量，4：按吨）") + private Integer type; + @ApiModelProperty(value = "费用类型（1：普通费，2附加费）") + private Integer costType; + @ApiModelProperty(value = "服务类型（1：仓储）") + private Integer serviceType; + @ApiModelProperty(value = "30天内") + private Double withinThirtyPrice; + @ApiModelProperty(value = "30-60天") + private Double betweenThirtySixtyPrice; + @ApiModelProperty(value = "60天外") + private Double beyondSixtyPrice; + @ApiModelProperty(value = "上限价格") + private Double maximumPrice; + @ApiModelProperty(value = "操作/装卸费") + private Double operatePrice; + @ApiModelProperty(value = "仓储管理费") + private Double warehouseManagementPrice; + @ApiModelProperty(value = "仓储分货费") + private Double warehouseSortPrice; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceEntity.java new file mode 100644 index 000000000..d80f89430 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceEntity.java @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +import java.util.Date; + +/** + * 基础价格表 实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +@TableName("logpm_basicdata_price") +@ApiModel(value = "BasicdataPrice对象", description = "基础价格表") +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceEntity extends TenantEntity { + + @ApiModelProperty(value = "预留1") + private String reserve1; + @ApiModelProperty(value = "预留2") + private String reserve2; + @ApiModelProperty(value = "预留3") + private String reserve3; + @ApiModelProperty(value = "预留4") + private String reserve4; + @ApiModelProperty(value = "预留5") + private String reserve5; + @ApiModelProperty(value = "模板id") + private Long templateId; + @ApiModelProperty(value = "客户id") + private Long clientId; + @ApiModelProperty(value = "品牌id") + private Long brandId; + @ApiModelProperty(value = "维护状态(1:未维护,2:已维护,3:已到期)") + private Integer maintenanceStatus; + @ApiModelProperty(value = "生效时间") + private Date effectiveTime; + @ApiModelProperty(value = "到期时间") + private Date expiryTime; + + @ApiModelProperty(value = "配送-上楼费免费楼层") + private Integer dispatchStairsCarryingCharge; + @ApiModelProperty(value = "配送-向上判断件数") + private Double dispatchUpwardJudgment; + @ApiModelProperty(value = "配送-向上判断价格") + private Double dispatchUpwardJudgmentCost; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceFullVehicleEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceFullVehicleEntity.java new file mode 100644 index 000000000..c3633394c --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceFullVehicleEntity.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 基础价格整车计费 实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +@TableName("logpm_basicdata_price_full_vehicle") +@ApiModel(value = "BasicdataPriceFullVehicle对象", description = "基础价格整车计费") +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceFullVehicleEntity extends TenantEntity { + + @ApiModelProperty(value = "预留1") + private String reserve1; + @ApiModelProperty(value = "预留2") + private String reserve2; + @ApiModelProperty(value = "预留3") + private String reserve3; + @ApiModelProperty(value = "预留4") + private String reserve4; + @ApiModelProperty(value = "预留5") + private String reserve5; + @ApiModelProperty(value = "业务id") + private Long boId; + @ApiModelProperty(value = "基础价格id") + private Long priceId; + @ApiModelProperty(value = "类型（1：整车提货,2:干线整车运输,3:整车配送,4:提货路径,5:干线路径）") + private Integer type; + @ApiModelProperty(value = "车型") + private Integer vehicleType; + @ApiModelProperty(value = "整车计费（元/车）") + private Double price; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceGeneralEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceGeneralEntity.java new file mode 100644 index 000000000..82654948f --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceGeneralEntity.java @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 基础价格一般计费 实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +@TableName("logpm_basicdata_price_general") +@ApiModel(value = "BasicdataPriceGeneral对象", description = "基础价格一般计费") +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceGeneralEntity extends TenantEntity { + @ApiModelProperty(value = "预留1") + private String reserve1; + @ApiModelProperty(value = "预留2") + private String reserve2; + @ApiModelProperty(value = "预留3") + private String reserve3; + @ApiModelProperty(value = "预留4") + private String reserve4; + @ApiModelProperty(value = "预留5") + private String reserve5; + @ApiModelProperty(value = "业务id") + private Long boId; + @ApiModelProperty(value = "基础价格id") + private Long priceId; + @ApiModelProperty(value = "服务类型（1：提货，2：提货路径，3：干线，4:干线路径，5：配送，6：配送遗留）") + private Integer serviceType; + @ApiModelProperty(value = "最低计费") + private Double minCost; + @ApiModelProperty(value = "加算价格") + private Double additionalCost; +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceRouteEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceRouteEntity.java new file mode 100644 index 000000000..00b5e21cf --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceRouteEntity.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 基础价格路径 实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +@TableName("logpm_basicdata_price_route") +@ApiModel(value = "BasicdataPriceRoute对象", description = "基础价格路径") +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceRouteEntity extends TenantEntity { + + @ApiModelProperty(value = "预留1") + private String reserve1; + @ApiModelProperty(value = "预留2") + private String reserve2; + @ApiModelProperty(value = "预留3") + private String reserve3; + @ApiModelProperty(value = "预留4") + private String reserve4; + @ApiModelProperty(value = "预留5") + private String reserve5; + @ApiModelProperty(value = "基础价格id") + private Long priceId; + @ApiModelProperty(value = "类型（1：提货，2：干线）") + private Integer serviceType; + @ApiModelProperty(value = "始发地省份id") + private Long startProvinceId; + @ApiModelProperty(value = "始发地城市id") + private Long startCityId; + @ApiModelProperty(value = "始发地区县id") + private Long startCountyId; + @ApiModelProperty(value = "目的地省份id") + private Long endProvinceId; + @ApiModelProperty(value = "目的地城市id") + private Long endCityId; + @ApiModelProperty(value = "目的地区县id") + private Long endCountyId; + @ApiModelProperty(value = "发货单位") + private Long sendOrgId; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceTemplateEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceTemplateEntity.java new file mode 100644 index 000000000..52d192196 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceTemplateEntity.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * 基础价格模板表 实体类 + * + * @author zqb + * @since 2024-04-01 + */ +@Data +@TableName("logpm_basicdata_price_template") +@ApiModel(value = "BasicdataPriceTemplate对象", description = "基础价格模板表") +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceTemplateEntity extends TenantEntity { + @ApiModelProperty(value = "预留1") + private String reserve1; + @ApiModelProperty(value = "预留2") + private String reserve2; + @ApiModelProperty(value = "预留3") + private String reserve3; + @ApiModelProperty(value = "预留4") + private String reserve4; + @ApiModelProperty(value = "预留5") + private String reserve5; + @ApiModelProperty(value = "模板名称") + @NotEmpty(message = "模板名称不能为空") + private String name; + @ApiModelProperty(value = "品牌id") + @NotNull(message = "品牌id不能为空") + private Long brandId; + @ApiModelProperty(value = "服务类型") + @NotEmpty(message = "服务类型不能为空") + private String serviceType; + @ApiModelProperty(value = "提货计价方式") + private String pickupPricingType; + @ApiModelProperty(value = "提货是否统一区域计费") + private Integer pickupIsUnifyAreaBill; + @ApiModelProperty(value = "提货是否区分品类") + private Integer pickupIsByCategory; + @ApiModelProperty(value = "提货-按件计费品类") + private String pickupPieceCategory; + @ApiModelProperty(value = "提货-按方计费品类") + private String pickupCubeCategory; + @ApiModelProperty(value = "提货-按重量计费品类") + private String pickupWeightCategory; + @ApiModelProperty(value = "提货-是否最低计费") + private Integer pickupIsMinCost; + @ApiModelProperty(value = "提货-最低计费类型（1：价格 2:件数 3:平方数 4:千克数）") + private Integer pickupMinCostType; + @ApiModelProperty(value = "干线-计价方式") + private String trunklinePricingType; + @ApiModelProperty(value = "干线-是否统一区域计费") + private Integer trunklineIsUnifyAreaBill; + @ApiModelProperty(value = "干线-是否区分品类") + private Integer trunklineIsByCategory; + @ApiModelProperty(value = "干线-按件计费品类") + private String trunklinePieceCategory; + @ApiModelProperty(value = "干线-按方计费品类") + private String trunklineCubeCategory; + @ApiModelProperty(value = "干线-按重量计费品类") + private String trunklineWeightCategory; + @ApiModelProperty(value = "干线-是否特殊配置") + private Integer trunklineIsPeculiarSetup; + @ApiModelProperty(value = "干线-是否最低计费") + private Integer trunklineIsMinCost; + @ApiModelProperty(value = "干线-最低计费类型（1：价格 2:件数 3:立方数 4:千克数）") + private Integer trunklineMinCostType; + @ApiModelProperty(value = "仓储-计价方式") + private Integer warehousePricingType; + @ApiModelProperty(value = "仓储-计费模式") + private Integer warehousePricingMode; + @ApiModelProperty(value = "仓储-计算基准") + private Integer warehouseCalculationBasis; + @ApiModelProperty(value = "仓储-是否区分品类") + private Integer warehouseIsByCategory; + @ApiModelProperty(value = "仓储-仓储费品类") + private String warehousePieceCategory; + @ApiModelProperty(value = "仓储-附加费计价单位") + private Integer warehouseSubjoinFeeUnit; + @ApiModelProperty(value = "仓储-是否有管理费") + private Integer warehouseIsManageFee; + @ApiModelProperty(value = "仓储-是否有操作/装卸费") + private Integer warehouseIsOperateFee; + @ApiModelProperty(value = "仓储-是否有分拣费") + private Integer warehouseIsSortFee; + @ApiModelProperty(value = "仓储-是否按品类附加费计费") + private Integer warehouseIsCategorySubjoin; + @ApiModelProperty(value = "仓储-附加费品类") + private String warehouseSubjoinCategory; + @ApiModelProperty(value = "配送-服务类型") + private Integer dispatchServiceType; + @ApiModelProperty(value = "配送-计价方式") + private String dispatchPricingType; + @ApiModelProperty(value = "配送-是否区分品类") + private Integer dispatchIsByCategory; + @ApiModelProperty(value = "配送-是否遗留件") + private Integer dispatchIsLeaveBehind; + @ApiModelProperty(value = "配送-按件计费品类") + private String dispatchPieceCategory; + @ApiModelProperty(value = "配送-按方计费品类") + private String dispatchCubeCategory; + @ApiModelProperty(value = "配送-按重量计费品类") + private String dispatchWeightCategory; + @ApiModelProperty(value = "配送-是否按品类附加费计费") + private Integer dispatchIsCategorySubjoin; + @ApiModelProperty(value = "配送-是否有分货费") + private Integer dispatchIsSortFee; + @ApiModelProperty(value = "配送-是否有操作/装卸费") + private Integer dispatchIsOperateFee; + @ApiModelProperty(value = "配送-是否有上楼费") + private Integer dispatchIsStairsCarryingCharge; + @ApiModelProperty(value = "配送-是否配置免费楼层") + private Integer dispatchIsFeeFloor; + @ApiModelProperty(value = "配送-是否有平移费") + private Integer dispatchIsShiftingCharge; + @ApiModelProperty(value = "配送-附加费品类") + private String dispatchSubjoinCategory; + @ApiModelProperty(value = "配送-是否最低计费") + private Integer dispatchIsMinCost; + @ApiModelProperty(value = "配送-最低计费方式") + private Integer dispatchMinCostMode; + @ApiModelProperty(value = "配送-最低计费类型（1：价格 2:件数 3:立方数）") + private Integer dispatchMinCostType; + @ApiModelProperty(value = "配送-是否向上判断") + private Integer dispatchIsUpwardJudgment; +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataPriceClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataPriceClient.java new file mode 100644 index 000000000..7f870ea29 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataPriceClient.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import com.logpm.basicdata.entity.BasicdataFreightDetailEntity; +import com.logpm.basicdata.vo.BasicdataFreightApiVO; +import org.springblade.common.constant.ModuleNameConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * 基础价格体系 Feign接口类 + * + * @author zqb + * @since 2024-04-11 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME +) +public interface IBasicdataPriceClient { + + String API_PREFIX = "/basicdataPrice/client"; + String PRICE = API_PREFIX + "/pirce"; + + @PostMapping(PRICE) + List pirce(@RequestBody BasicdataFreightApiVO param); + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceBasicUpdateVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceBasicUpdateVO.java new file mode 100644 index 000000000..394890b56 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceBasicUpdateVO.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; + +/** + * 基础配置 视图实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +public class BasicdataPriceBasicUpdateVO implements Serializable { + private static final long serialVersionUID = 1L; + + @NotNull(message = "修改数据id不能为空") + @ApiModelProperty(value = "id") + private Long id; + @NotNull(message = "模板不能为空") + @ApiModelProperty(value = "模板id") + private Long templateId; + @NotNull(message = "生效时间不能为空") + @ApiModelProperty(value = "生效时间") + private Date effectiveTime; + @NotNull(message = "到期时间不能为空") + @ApiModelProperty(value = "到期时间") + private Date expiryTime; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceCategoryVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceCategoryVO.java new file mode 100644 index 000000000..a238e40be --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceCategoryVO.java @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 基础价格按品类计费 视图实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +public class BasicdataPriceCategoryVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "品类id") + private Long categoryId; + @ApiModelProperty(value = "单价") + private Double price; + @ApiModelProperty(value = "30天内") + private Double withinThirtyPrice; + @ApiModelProperty(value = "30-60天") + private Double betweenThirtySixtyPrice; + @ApiModelProperty(value = "60天外") + private Double beyondSixtyPrice; + @ApiModelProperty(value = "上限价格") + private Double maximumPrice; + @ApiModelProperty(value = "遗留单价") + private Double leaveBehindPrice; + @ApiModelProperty(value = "操作/装卸费") + private Double operatePrice; + @ApiModelProperty(value = "仓储管理费") + private Double warehouseManagementPrice; + @ApiModelProperty(value = "仓储分货费") + private Double warehouseSortPrice; + @ApiModelProperty(value = "分货费") + private Double sortPrice; + @ApiModelProperty(value = "装卸费") + private Double handlingPrice; + @ApiModelProperty(value = "平移费") + private Double relocationPrice; + @ApiModelProperty(value = "上楼费") + private Double upstairsDeliveryPrice; +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceFullVehicleVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceFullVehicleVO.java new file mode 100644 index 000000000..729fa52b6 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceFullVehicleVO.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 基础价格整车计费 视图实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +public class BasicdataPriceFullVehicleVO implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "车型") + private Integer vehicleType; + + @ApiModelProperty(value = "整车计费（元/车）") + private Double price; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceGeneralVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceGeneralVO.java new file mode 100644 index 000000000..c29d31e24 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceGeneralVO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import com.logpm.basicdata.entity.BasicdataPriceGeneralEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 基础价格一般计费 视图实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceGeneralVO extends BasicdataPriceGeneralEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPricePageVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPricePageVO.java new file mode 100644 index 000000000..184118540 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPricePageVO.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 基础价格表 视图实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +public class BasicdataPricePageVO implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + private String id; + + @ApiModelProperty(value = "客户名称") + private String clientName; + + @ApiModelProperty(value = "品牌名称") + private String brandName; + + @ApiModelProperty(value = "模板服务类型") + private String serviceType; + + @ApiModelProperty(value = "维护状态") + private String maintenanceStatus; + + @ApiModelProperty(value = "修改时间") + private String updateTime; + + @ApiModelProperty(value = "生效时间") + private String effectiveTime; + + @ApiModelProperty(value = "过期时间") + private String expiryTime; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceRouteVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceRouteVO.java new file mode 100644 index 000000000..3c0410187 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceRouteVO.java @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import com.logpm.basicdata.entity.BasicdataPriceRouteEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 基础价格干线路径 视图实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceRouteVO extends BasicdataPriceRouteEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "始发地") + private String startCountyName; + + @ApiModelProperty(value = "目的地") + private String endCountyName; + + @ApiModelProperty(value = "发货单位") + private String sendOrgName; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceTemplateVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceTemplateVO.java new file mode 100644 index 000000000..7d5cd257c --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceTemplateVO.java @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import com.logpm.basicdata.entity.BasicdataPriceTemplateEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * 基础价格模板表 视图实体类 + * + * @author zqb + * @since 2024-04-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceTemplateVO extends BasicdataPriceTemplateEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "当前选择的服务类型") + private Integer checkType; + + @ApiModelProperty(value = "模版类型") + private String templateType; + + @ApiModelProperty(value = "用户名称") + private String userName; + + @ApiModelProperty(value = "品牌名称") + private String brandName; + + @ApiModelProperty(value = "提货-按件计费品类") + private List pickupPieceCategorys; + @ApiModelProperty(value = "提货-按方计费品类") + private List pickupCubeCategorys; + @ApiModelProperty(value = "提货-按重量计费品类") + private List pickupWeightCategorys; + + @ApiModelProperty(value = "干线-按件计费品类") + private List trunklinePieceCategorys; + @ApiModelProperty(value = "干线-按方计费品类") + private List trunklineCubeCategorys; + @ApiModelProperty(value = "干线-按重量计费品类") + private List trunklineWeightCategorys; + + @ApiModelProperty(value = "仓储-仓储费品类") + private List warehousePieceCategorys; + @ApiModelProperty(value = "仓储-附加费品类") + private List warehouseSubjoinCategorys; + + @ApiModelProperty(value = "配送-按件计费品类") + private List dispatchPieceCategorys; + @ApiModelProperty(value = "配送-按方计费品类") + private List dispatchCubeCategorys; + @ApiModelProperty(value = "配送-按重量计费品类") + private List dispatchWeightCategorys; + @ApiModelProperty(value = "配送-附加费品类") + private List dispatchSubjoinCategorys; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceVO.java new file mode 100644 index 000000000..8defd89a8 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPriceVO.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import com.logpm.basicdata.entity.BasicdataPriceEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 基础价格表 视图实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceVO extends BasicdataPriceEntity { + private static final long serialVersionUID = 1L; +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceBasicVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceBasicVO.java new file mode 100644 index 000000000..6863e4d9b --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceBasicVO.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 基础价格按品类计费 视图实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +public class PriceBasicVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "品类id") + private Long categoryId; + @ApiModelProperty(value = "单价") + private Double price; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceCategoryVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceCategoryVO.java new file mode 100644 index 000000000..409f52a2b --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceCategoryVO.java @@ -0,0 +1,20 @@ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 基础价格品类 + * @author zhaoqiaobo + * @create 2024-04-09 + */ +@Data +public class PriceCategoryVO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + @ApiModelProperty(value = "名称") + private String name; +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceDispatchAdditionalVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceDispatchAdditionalVO.java new file mode 100644 index 000000000..d029f78f4 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceDispatchAdditionalVO.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 基础价格按品类计费 视图实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +public class PriceDispatchAdditionalVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "品类id") + private Long categoryId; + @ApiModelProperty(value = "分货费") + private Double sortPrice; + @ApiModelProperty(value = "装卸费") + private Double handlingPrice; + @ApiModelProperty(value = "平移费") + private Double relocationPrice; + @ApiModelProperty(value = "上楼费") + private Double upstairsDeliveryPrice; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceDispatchBasicVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceDispatchBasicVO.java new file mode 100644 index 000000000..ead48dfb4 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceDispatchBasicVO.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 基础价格按品类计费 视图实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +public class PriceDispatchBasicVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "品类id") + private Long categoryId; + @ApiModelProperty(value = "单价") + private Double price; + @ApiModelProperty(value = "遗留单价") + private Double leaveBehindPrice; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceDispatchVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceDispatchVO.java new file mode 100644 index 000000000..672683f78 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceDispatchVO.java @@ -0,0 +1,64 @@ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 价格配送vo + * + * @author zhaoqiaobo + * @create 2024-04-03 + */ +@Data +public class PriceDispatchVO implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "整车计费") + private List fullVehicle; + + @ApiModelProperty(value = "按件品类计费") + private List pieceCategory; + + @ApiModelProperty(value = "按方品类计费") + private List cubeCategory; + + @ApiModelProperty(value = "按重量品类计费") + private List weightCategory; + + @ApiModelProperty(value = "按公里计费") + private List kilometerCost; + + @ApiModelProperty(value = "按吨公里计费") + private List tonKilometerCost; + + @ApiModelProperty(value = "按吨计费") + private List tonCost; + + @ApiModelProperty(value = "附加费") + private List additionalCategory; + + @ApiModelProperty(value = "配送-上楼费免费楼层") + private Integer dispatchStairsCarryingCharge; + + @ApiModelProperty(value = "最低计费") + private Double minCost; + + @ApiModelProperty(value = "加算价格") + private Double additionalCost; + + @ApiModelProperty(value = "遗留最低计费") + private Double leaveBehindMinCost; + + @ApiModelProperty(value = "遗留加算价格") + private Double leaveBehindAdditionalCost; + + @ApiModelProperty(value = "向上判断件数") + private Double dispatchUpwardJudgment; + + @ApiModelProperty(value = "向上判断加价") + private Double dispatchUpwardJudgmentCost; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PricePickupVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PricePickupVO.java new file mode 100644 index 000000000..04a54fde3 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PricePickupVO.java @@ -0,0 +1,35 @@ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 价格提货vo + * @author zhaoqiaobo + * @create 2024-04-03 + */ +@Data +public class PricePickupVO implements Serializable { + + @ApiModelProperty(value = "整车计费") + private List fullVehicle; + + @ApiModelProperty(value = "按件品类计费") + private List pieceCategory; + + @ApiModelProperty(value = "按方品类计费") + private List cubeCategory; + + @ApiModelProperty(value = "按重量品类计费") + private List weightCategory; + + @ApiModelProperty(value = "最低计费") + private Double minCost; + + @ApiModelProperty(value = "加算价格") + private Double additionalCost; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceRouteVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceRouteVO.java new file mode 100644 index 000000000..fcd3e8937 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceRouteVO.java @@ -0,0 +1,60 @@ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 价格提货vo + * + * @author zhaoqiaobo + * @create 2024-04-03 + */ +@Data +public class PriceRouteVO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "基础价格id") + private Long priceId; + + @ApiModelProperty(value = "类型（1：提货，2：干线）") + private Integer serviceType; + + @ApiModelProperty(value = "始发地省份id") + private Long startProvinceId; + @ApiModelProperty(value = "始发地城市id") + private Long startCityId; + @ApiModelProperty(value = "始发地区县id") + private Long startCountyId; + @ApiModelProperty(value = "目的地省份id") + private Long endProvinceId; + @ApiModelProperty(value = "目的地城市id") + private Long endCityId; + @ApiModelProperty(value = "目的地区县id") + private Long endCountyId; + @ApiModelProperty(value = "发货单位") + private Long sendOrgId; + + @ApiModelProperty(value = "整车计费") + private List fullVehicle; + + @ApiModelProperty(value = "按件品类计费") + private List pieceCategory; + + @ApiModelProperty(value = "按方品类计费") + private List cubeCategory; + + @ApiModelProperty(value = "按重量品类计费") + private List weightCategory; + + @ApiModelProperty(value = "最低计费") + private Double minCost; + + @ApiModelProperty(value = "加算价格") + private Double additionalCost; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceTrunkLineVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceTrunkLineVO.java new file mode 100644 index 000000000..053e904e8 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceTrunkLineVO.java @@ -0,0 +1,37 @@ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 价格干线vo + * @author zhaoqiaobo + * @create 2024-04-03 + */ +@Data +public class PriceTrunkLineVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "整车计费") + private List fullVehicle; + + @ApiModelProperty(value = "按件品类计费") + private List pieceCategory; + + @ApiModelProperty(value = "按方品类计费") + private List cubeCategory; + + @ApiModelProperty(value = "按重量品类计费") + private List weightCategory; + + @ApiModelProperty(value = "最低计费") + private Double minCost; + + @ApiModelProperty(value = "加算价格") + private Double additionalCost; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceVO.java new file mode 100644 index 000000000..4587aab9d --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceVO.java @@ -0,0 +1,35 @@ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 价格vo + * + * @author zhaoqiaobo + * @create 2024-04-03 + */ +@Data +public class PriceVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "修改数据id不能为空") + @ApiModelProperty(value = "主键") + private Long id; + @NotNull(message = "请确定当前修改的服务类型") + @ApiModelProperty(value = "当前选择的服务类型") + private Integer checkType; + @ApiModelProperty(value = "提货") + private PricePickupVO pickup; + @ApiModelProperty(value = "干线") + private PriceTrunkLineVO trunkLine; + @ApiModelProperty(value = "仓储") + private PriceWarehouseVO warehouse; + @ApiModelProperty(value = "配送") + private PriceDispatchVO dispatch; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseAdditionalVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseAdditionalVO.java new file mode 100644 index 000000000..9511abf98 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseAdditionalVO.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 基础价格按品类计费 视图实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +public class PriceWarehouseAdditionalVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "品类id") + private Long categoryId; + @ApiModelProperty(value = "操作/装卸费") + private Double operatePrice; + @ApiModelProperty(value = "仓储管理费") + private Double warehouseManagementPrice; + @ApiModelProperty(value = "仓储分货费") + private Double warehouseSortPrice; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseBasicVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseBasicVO.java new file mode 100644 index 000000000..ea7e4e4d6 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseBasicVO.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 基础价格按品类计费 视图实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +public class PriceWarehouseBasicVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "品类id") + private Long categoryId; + @ApiModelProperty(value = "30天内") + private Double withinThirtyPrice; + @ApiModelProperty(value = "30-60天") + private Double betweenThirtySixtyPrice; + @ApiModelProperty(value = "60天外") + private Double beyondSixtyPrice; + @ApiModelProperty(value = "上限价格") + private Double maximumPrice; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseVO.java new file mode 100644 index 000000000..bbe9c3d63 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/PriceWarehouseVO.java @@ -0,0 +1,24 @@ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 价格仓储vo + * + * @author zhaoqiaobo + * @create 2024-04-03 + */ +@Data +public class PriceWarehouseVO implements Serializable { + + @ApiModelProperty(value = "按品类计费") + private List catergory; + + @ApiModelProperty(value = "附加费") + private List additionalCategory; + +} diff --git a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/enums/NodeEnums.java b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/enums/NodeEnums.java deleted file mode 100644 index 7966ac629..000000000 --- a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/enums/NodeEnums.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.logpm.factorydata.enums; - -import lombok.Getter; - -import java.io.Serializable; - -/** - * 作业节点枚举 - * - * @author zhaoqiaobo - * @create 2024-03-20 15:19 - */ -@Getter -public enum NodeEnums implements Serializable { - - INITIAL_DATA_ENTRY(10, "数据入库"), - INITIAL_WAREHOUSE_ENTRY(20, "始发仓入库"), - BILLING(30, "开单"), - INITIAL_WAREHOUSE_LOADING(40, "始发仓装车"), - CANCEL_INITIAL_WAREHOUSE_LOADING(50, "始发仓取消装车"), - INITIAL_WAREHOUSE_DEPART(60, "始发仓发车"), - CANCEL_INITIAL_WAREHOUSE_DEPART(70, "始发仓取消发车"), - NET_ARRIVE_CAR(80,"网点到车"), - CANCEL_NET_ARRIVE_CAR(90,"网点取消到车"), - UNLOAD_INCOMING_WAREHOUSE(100,"卸车入库"), - TRANSFER_WAREHOUSE_UNLOADING(110, "网点卸车确认"), - TRANSFER_WAREHOUSE_DEPART(120, "网点发车"), - CANEL_TRANSFER_WAREHOUSE_DEPART(130, "网点取消发车"), - FINAL_NET_ARRIVE_CAR(140,"终点到车"), - CANCEL_FINAL_NET_ARRIVE_CAR(150,"终点取消到车"), - SIGN_DIRECT_SHIPPER(160,"直发商家签收"), - END_WAREHOUSE_UNLOADING(170, "末端仓卸车确认"), - TRIPARTITE_TRANSFER_DEPART(180, "三方中转发车"), - CANCEL_TRIPARTITE_TRANSFER_DEPART(190, "三方中转取消发车"), - ARRICE_TRIPARTITE_TRANSFER_DEPART(200, "三方中转到达"), - sign_TRIPARTITE_TRANSFER_DEPART(210, "三方中转签收"), - SORTING_TRAYS(220, "分拣打托"), - UN_SORTING_TRAYS(230, "包件解托"), - PUTAWAY(240, "上架"), - DELIST(250, "下架"), - STOCKING_OPERATION(260, "备货作业"), - DISTRIBUTION_LOADING(270, "配送装车"), - DISTRIBUTION_SIGN_FOR(280, "配送签收"), - CLERK_REVIEW(290, "文员复核"); - - private Integer code; - private String value; - - NodeEnums(Integer code, String value) { - this.code = code; - this.value = value; - } - -} diff --git a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/vo/NodePushMsg.java b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/vo/NodePushMsg.java index a2b0f9d35..5eee16854 100644 --- a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/vo/NodePushMsg.java +++ b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/vo/NodePushMsg.java @@ -2,7 +2,7 @@ package com.logpm.factorydata.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.logpm.factorydata.enums.BrandEnums; -import com.logpm.factorydata.enums.NodeEnums; +import org.springblade.common.constant.WorkNodeEnums; import com.logpm.factorydata.enums.SignForStatusEnums; import lombok.AllArgsConstructor; import lombok.Builder; @@ -33,7 +33,7 @@ public class NodePushMsg implements Serializable { /** * 作业节点 */ - private NodeEnums node; + private WorkNodeEnums node; /** * 操作人 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 6d25ee5ab..ca80ab8b3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -77,7 +77,7 @@ import com.logpm.factory.mt.dto.MtReceiveImagesDTO; import com.logpm.factory.mt.feign.IMtOrderMainClinet; import com.logpm.factory.oupai.feign.IOuPaiFactoryClinet; import com.logpm.factorydata.enums.BrandEnums; -import com.logpm.factorydata.enums.NodeEnums; +import org.springblade.common.constant.WorkNodeEnums; import com.logpm.factorydata.util.FactoryDataMessageSender; import com.logpm.factorydata.vo.NodePushMsg; import com.logpm.trunkline.dto.AddWaybillTrackDTO; @@ -337,16 +337,16 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { log.debug("####修改包件预约状态"); ids.forEach(i -> { DistributionParcelListEntity distributionParcelListEntity = new DistributionParcelListEntity(); - if ("1".equals(distributionParcelListEntity.getConditions())){ + if ("1".equals(distributionParcelListEntity.getConditions())) { distributionParcelListEntity.setId(i); distributionParcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue()); int i1 = distributionParcelListMapper.updateById(distributionParcelListEntity); log.debug("####修改包件预约数量===={}", i1); - }else if ("3".equals(distributionParcelListEntity.getConditions())){ + } else if ("3".equals(distributionParcelListEntity.getConditions())) { DistributionParcelNumberEntity distributionParcelNumberEntity = distributionParcelNumberService.getOne(Wrappers.query().lambda() .eq(DistributionParcelNumberEntity::getParcelListId, i) ); - if (distributionParcelNumberEntity.getQuantity() == (distributionParcelNumberEntity.getDeliveryQuantity() + distributionParcelNumberEntity.getOutboundQuantity())){ + if (distributionParcelNumberEntity.getQuantity() == (distributionParcelNumberEntity.getDeliveryQuantity() + distributionParcelNumberEntity.getOutboundQuantity())) { log.debug("####修改包件预约数量===={}", i); distributionParcelListEntity.setId(i); int i1 = distributionParcelListMapper.updateById(distributionParcelListEntity); @@ -768,7 +768,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { if (a.get() == b.get()) { //下架 list.forEach(i -> { - warehouseUpdownTypeClient.downPackage(i, stockupDTO.getWarehouseId(),"备货包件下架"); + warehouseUpdownTypeClient.downPackage(i, stockupDTO.getWarehouseId(), "备货包件下架"); }); } @@ -805,7 +805,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { // } //维护订单状态 // distributionStockArticleService.updateOrderInfo(parcelListEntity.getOrderCode(),parcelListEntity.getWarehouseId()); - warehouseUpdownTypeClient.downPackage(parcelListEntity.getOrderPackageCode(), parcelListEntity.getWarehouseId(),"配送装车包件下架"); + warehouseUpdownTypeClient.downPackage(parcelListEntity.getOrderPackageCode(), parcelListEntity.getWarehouseId(), "配送装车包件下架"); checkReservationAndDeliveryLoadingStatus(deliveryId, reservationId); } @@ -1470,7 +1470,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } String collect = updatePackageList.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(",")); - warehouseUpdownTypeClient.downPackageOrDelTray(collect, warehouseId,"装车下架解托"); + warehouseUpdownTypeClient.downPackageOrDelTray(collect, warehouseId, "装车下架解托"); // 进行批量下架 } @@ -1602,13 +1602,12 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { try { - if(ObjectUtils.isNull(brand)){ - log.info( " 品牌 为null 不执行 后续的代码"); - return ; + if (ObjectUtils.isNull(brand)) { + log.info(" 品牌 为null 不执行 后续的代码"); + return; } - log.info(">>>>>>>>>>>>>>> 文员复核推送 品牌 {} ", brand); assert brand != null; @@ -1656,7 +1655,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } } NodePushMsg msg = new NodePushMsg(); - msg.setNode(NodeEnums.CLERK_REVIEW); + msg.setNode(WorkNodeEnums.CLERK_REVIEW); msg.setBrand(BrandEnums.ZB); msg.setOperator(distributionSignforEntity.getDeliveryDriverName()); msg.setOperatorTime(new Date()); @@ -1861,19 +1860,19 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { List ids = list.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList()); //查询包件 List distributionParcelListEntities = distributionParcelListService.listByIds(ids); - List packageIds = distributionParcelListEntities.stream().filter(f -> OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(f.getOrderPackageLoadingStatus())|| !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())).map(DistributionParcelListEntity::getId).collect(Collectors.toList()); - if (Func.isNotEmpty(packageIds)){ + List packageIds = distributionParcelListEntities.stream().filter(f -> OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(f.getOrderPackageLoadingStatus()) || !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())).map(DistributionParcelListEntity::getId).collect(Collectors.toList()); + if (Func.isNotEmpty(packageIds)) { distributionParcelListService.update(new UpdateWrapper().lambda() - .set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.daiyuyue.getValue()) - .set(DistributionParcelListEntity::getOrderPackageLoadingStatus,OrderPackageLoadingStatusConstant.weizhuancghe.getValue()) - .set(DistributionParcelListEntity::getOrderPackageStatus,OrderPackageStatusConstant.yiruku.getValue()) - .set(DistributionParcelListEntity::getOrderPackageStockupStatus,OrderPackageStockupStatusConstant.daibeihuo.getValue()) - .in(DistributionParcelListEntity::getId,packageIds) + .set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue()) + .set(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.weizhuancghe.getValue()) + .set(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiruku.getValue()) + .set(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.daibeihuo.getValue()) + .in(DistributionParcelListEntity::getId, packageIds) ); billPackageService.update(new UpdateWrapper().lambda() - .set(DistrilbutionBillPackageEntity::getPacketBarStatus,2) - .eq(DistrilbutionBillPackageEntity::getBillLadingId,l) - .in(DistrilbutionBillPackageEntity::getParceListId,packageIds) + .set(DistrilbutionBillPackageEntity::getPacketBarStatus, 2) + .eq(DistrilbutionBillPackageEntity::getBillLadingId, l) + .in(DistrilbutionBillPackageEntity::getParceListId, packageIds) ); } String collect = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getOrderCode).distinct().collect(Collectors.joining(",")); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java index d094b5d79..1c2217bc3 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java @@ -1,7 +1,7 @@ package com.logpm.factorydata.zbom.enums; import cn.hutool.core.util.ObjectUtil; -import com.logpm.factorydata.enums.NodeEnums; +import org.springblade.common.constant.WorkNodeEnums; import lombok.Getter; /** @@ -13,40 +13,40 @@ import lombok.Getter; @Getter public enum ZbomNodeMappingEnums { - STATION_REACH_VEHICLE(ZbomNodeEnums.STATION_REACH_VEHICLE, NodeEnums.INITIAL_WAREHOUSE_ENTRY, 1), + STATION_REACH_VEHICLE(ZbomNodeEnums.STATION_REACH_VEHICLE, WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY, 1), /** * 场站发车 -- 始发仓发车 */ - STATION_DEPART(ZbomNodeEnums.STATION_DEPART, NodeEnums.INITIAL_WAREHOUSE_DEPART, 1), + STATION_DEPART(ZbomNodeEnums.STATION_DEPART, WorkNodeEnums.INITIAL_WAREHOUSE_DEPART, 1), /** * 在途 -- 中转仓卸货确认 */ - INTRANSIT_UNLOADING(ZbomNodeEnums.INTRANSIT, NodeEnums.TRANSFER_WAREHOUSE_UNLOADING, 1), + INTRANSIT_UNLOADING(ZbomNodeEnums.INTRANSIT, WorkNodeEnums.TRANSFER_WAREHOUSE_UNLOADING, 1), /** * 在途 -- 中转仓发车 */ - INTRANSIT(ZbomNodeEnums.INTRANSIT, NodeEnums.TRANSFER_WAREHOUSE_DEPART, 1), + INTRANSIT(ZbomNodeEnums.INTRANSIT, WorkNodeEnums.TRANSFER_WAREHOUSE_DEPART, 1), /** * 在途 -- 末端仓卸货确认 */ - DELIVERY_ARRIVAL(ZbomNodeEnums.INTRANSIT, NodeEnums.END_WAREHOUSE_UNLOADING, 1), + DELIVERY_ARRIVAL(ZbomNodeEnums.INTRANSIT, WorkNodeEnums.END_WAREHOUSE_UNLOADING, 1), /** * 在途 -- 三方中转发车 */ - INTRANSIT_TRIPARTITE_TRANSFER_DEPART(ZbomNodeEnums.INTRANSIT, NodeEnums.TRIPARTITE_TRANSFER_DEPART, 1), + INTRANSIT_TRIPARTITE_TRANSFER_DEPART(ZbomNodeEnums.INTRANSIT, WorkNodeEnums.TRIPARTITE_TRANSFER_DEPART, 1), /** * 全部签收 -- 文员复核 */ - SIGN_FOR(ZbomNodeEnums.SIGN_FOR, NodeEnums.CLERK_REVIEW, 1), + SIGN_FOR(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.CLERK_REVIEW, 1), /** * 部分签收 -- 文员复核 */ - PARTIAL_RECEIPT(ZbomNodeEnums.PARTIAL_RECEIPT, NodeEnums.CLERK_REVIEW, 2); + PARTIAL_RECEIPT(ZbomNodeEnums.PARTIAL_RECEIPT, WorkNodeEnums.CLERK_REVIEW, 2); /** * 系统作业节点 */ - private NodeEnums nodeEnums; + private WorkNodeEnums workNodeEnums; /** * 志邦作业节点 */ @@ -57,23 +57,23 @@ public enum ZbomNodeMappingEnums { */ private Integer status; - ZbomNodeMappingEnums(ZbomNodeEnums zbomNodeEnums, NodeEnums nodeEnums, Integer status) { - this.nodeEnums = nodeEnums; + ZbomNodeMappingEnums(ZbomNodeEnums zbomNodeEnums, WorkNodeEnums workNodeEnums, Integer status) { + this.workNodeEnums = workNodeEnums; this.zbomNodeEnums = zbomNodeEnums; this.status = status; } - public static ZbomNodeEnums getZbomByNodeAndStatus(NodeEnums nodeEnums) { - return getZbomByNodeAndStatus(nodeEnums, 1); + public static ZbomNodeEnums getZbomByNodeAndStatus(WorkNodeEnums workNodeEnums) { + return getZbomByNodeAndStatus(workNodeEnums, 1); } - public static ZbomNodeEnums getZbomByNodeAndStatus(NodeEnums nodeEnums, Integer status) { + public static ZbomNodeEnums getZbomByNodeAndStatus(WorkNodeEnums workNodeEnums, Integer status) { ZbomNodeMappingEnums[] values = values(); for (ZbomNodeMappingEnums value : values) { - NodeEnums nodeEnums1 = value.getNodeEnums(); + WorkNodeEnums workNodeEnums1 = value.getWorkNodeEnums(); Integer status1 = value.getStatus(); ZbomNodeEnums zbomNodeEnums = value.getZbomNodeEnums(); - if (ObjectUtil.equal(nodeEnums1, nodeEnums) && ObjectUtil.equal(status1, status)) { + if (ObjectUtil.equal(workNodeEnums1, workNodeEnums) && ObjectUtil.equal(status1, status)) { return zbomNodeEnums; } } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java index 211312b0d..56e69a9d2 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java @@ -9,7 +9,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.logpm.factorydata.enums.BrandEnums; -import com.logpm.factorydata.enums.NodeEnums; +import org.springblade.common.constant.WorkNodeEnums; import com.logpm.factorydata.feign.IFactoryDataClient; import com.logpm.factorydata.vo.NodePushMsg; import com.logpm.factorydata.vo.SendMsg; @@ -98,7 +98,7 @@ public class ZbomNodeDataPushListener { JSONObject entries = JSONUtil.parseObj(msg); // 节点 String node = entries.getStr("node"); - NodeEnums nodeEnums = EnumUtil.fromString(NodeEnums.class, node); + WorkNodeEnums workNodeEnums = EnumUtil.fromString(WorkNodeEnums.class, node); // 2 获取业务数据 List packageCodeList = getBizData(entries); if (CollUtil.isNotEmpty(packageCodeList)) { @@ -112,7 +112,7 @@ public class ZbomNodeDataPushListener { } // 签收节点获取组装未签收数据 Map noSignNumberMap = null; - if (EnumUtil.equals(NodeEnums.CLERK_REVIEW, node)) { + if (EnumUtil.equals(WorkNodeEnums.CLERK_REVIEW, node)) { noSignNumberMap = getNoSignNumber(packageCodeList); } // 获取历史发送的节点数据 @@ -128,7 +128,7 @@ public class ZbomNodeDataPushListener { List nodeConfirmLsit = new ArrayList<>(); Map sendMsgMap = new HashMap<>(); // 构建提交参数 - buildParam(entries, node, nodeEnums, orders, noSignNumberMap, nodeOrderMap, nodeConfirmLsit, sendMsgMap); + buildParam(entries, node, workNodeEnums, orders, noSignNumberMap, nodeOrderMap, nodeConfirmLsit, sendMsgMap); try { // 推送给志邦 if (CollUtil.isNotEmpty(nodeConfirmLsit)) { @@ -199,12 +199,12 @@ public class ZbomNodeDataPushListener { } } - private void buildParam(JSONObject entries, String node, NodeEnums nodeEnums, List orders, + private void buildParam(JSONObject entries, String node, WorkNodeEnums workNodeEnums, List orders, Map noSignNumberMap, Map nodeOrderMap, List nodeConfirmLsit, Map sendMsgMap) { if (CollUtil.isNotEmpty(orders)) { for (NodeDataDTO nodeData : orders) { - ZbomNodeEnums zbNode = ZbomNodeMappingEnums.getZbomByNodeAndStatus(nodeEnums); + ZbomNodeEnums zbNode = ZbomNodeMappingEnums.getZbomByNodeAndStatus(workNodeEnums); String departCode = nodeData.getDepartCode(); String platformOrderCode = nodeData.getPlatformOrderCode(); String key = departCode + platformOrderCode; @@ -222,7 +222,7 @@ public class ZbomNodeDataPushListener { nodeOrderEntity = new ZbFactoryNodeOrderEntity(); } // 如果是签收节点，需要判断是否为全部签收和部分签收 - if (EnumUtil.equals(NodeEnums.CLERK_REVIEW, node)) { + if (EnumUtil.equals(WorkNodeEnums.CLERK_REVIEW, node)) { // 签收节点设置签收数量 Integer signNumber = Convert.toInt(nodeData.getSignQty()); log.info("key：{}，签收数量：{}", departCode + "_" + platformOrderCode, signNumber); @@ -240,7 +240,7 @@ public class ZbomNodeDataPushListener { js.add(entries1); } NodePushMsg nodePushMsg = NodePushMsg.builder() - .node(NodeEnums.CLERK_REVIEW) + .node(WorkNodeEnums.CLERK_REVIEW) .operator(paramDTO.getOperator()) .operatorTime(DateUtil.parseDateTime(paramDTO.getOperatorTime())) .address(paramDTO.getAddress()) @@ -256,14 +256,14 @@ public class ZbomNodeDataPushListener { sendMsgMap.put(key, message); } else { // 查询当前未签收的数量与当前签收数量比较，如果未签收数较大，则是部分签收 - paramDTO.setNode(ZbomNodeMappingEnums.getZbomByNodeAndStatus(nodeEnums, ZbomConstants.Status.SIGN_FOR_SECTION_STATUS).getCode()); + paramDTO.setNode(ZbomNodeMappingEnums.getZbomByNodeAndStatus(workNodeEnums, ZbomConstants.Status.SIGN_FOR_SECTION_STATUS).getCode()); paramDTO.setSignQty(nodeData.getSignQty()); if (ObjectUtil.isNotEmpty(noSignNumberMap) && noSignNumberMap.containsKey(key)) { Integer noSignNum = noSignNumberMap.get(key); if (noSignNum <= signNumber) { // 全部签收 log.info("{} 全部签收", platformOrderCode); - paramDTO.setNode(ZbomNodeMappingEnums.getZbomByNodeAndStatus(nodeEnums, ZbomConstants.Status.SIGN_FOR_ALL_STATUS).getCode()); + paramDTO.setNode(ZbomNodeMappingEnums.getZbomByNodeAndStatus(workNodeEnums, ZbomConstants.Status.SIGN_FOR_ALL_STATUS).getCode()); } } else { continue; @@ -272,7 +272,7 @@ public class ZbomNodeDataPushListener { // 如果之前发送的是部分签收，则之后的所有签收节点都发部分签收 if (StrUtil.isNotEmpty(pushNode) && pushNode.contains(ZbomNodeEnums.PARTIAL_RECEIPT.getIndex().toString())) { log.info("{} 部分签收", platformOrderCode); - paramDTO.setNode(ZbomNodeMappingEnums.getZbomByNodeAndStatus(nodeEnums, ZbomConstants.Status.SIGN_FOR_SECTION_STATUS).getCode()); + paramDTO.setNode(ZbomNodeMappingEnums.getZbomByNodeAndStatus(workNodeEnums, ZbomConstants.Status.SIGN_FOR_SECTION_STATUS).getCode()); } currentNode = ZbomNodeEnums.getByCode(paramDTO.getNode()); } @@ -371,8 +371,8 @@ public class ZbomNodeDataPushListener { if (!EnumUtil.contains(NodeNeedEnums.class, node)) { return true; } - NodeEnums nodeEnums = EnumUtil.fromString(NodeEnums.class, node); - if (ObjectUtil.isEmpty(nodeEnums)) { + WorkNodeEnums workNodeEnums = EnumUtil.fromString(WorkNodeEnums.class, node); + if (ObjectUtil.isEmpty(workNodeEnums)) { return true; } List content = entries.getBeanList("content", JSONObject.class); diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml index 6f7be516b..58f8d103e 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml @@ -31,9 +31,9 @@ d.warehouse_name warehouse_name, CASE WHEN d.type = 1 THEN - '市配' - WHEN d.type = 2 THEN '商配' + WHEN d.type = 2 THEN + '市配' ELSE '' END type, CASE @@ -157,9 +157,9 @@ obj.delivery_address delivery_address, CASE WHEN lddl.type = 1 THEN - '市配' - WHEN lddl.type = 2 THEN '商配' + WHEN lddl.type = 2 THEN + '市配' ELSE '' END type, CASE diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/LoadScanBrandDTO.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/LoadScanBrandDTO.java index 702c3cc27..274d33434 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/LoadScanBrandDTO.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/LoadScanBrandDTO.java @@ -18,4 +18,8 @@ public class LoadScanBrandDTO implements Serializable { * 包件码 */ private String packageCode; + /** + * 始发仓 + */ + private String startWarehouseId; } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java index 0d40ababd..548e321e6 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java @@ -41,6 +41,6 @@ public interface TrunklineCarsLoadMapper extends BaseMapper carsOrderIdList, @Param("isCustomer") String isCustomer); - List fingPackageCodeByLoadId(@Param("loadId") Long loadId); + List fingPackageCodeByLoadId(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index aab47ff31..e9b561f0f 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -495,11 +495,11 @@ diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 02b5f682e..08a4a4f32 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -24,7 +24,7 @@ import com.logpm.distribution.feign.IDistributionParcelListClient; import com.logpm.distribution.feign.IDistributionParcelNumberClient; import com.logpm.distribution.feign.IDistributionStockArticleClient; import com.logpm.factorydata.enums.BrandEnums; -import com.logpm.factorydata.enums.NodeEnums; +import org.springblade.common.constant.WorkNodeEnums; import com.logpm.factorydata.util.FactoryDataMessageSender; import com.logpm.factorydata.vo.NodePushMsg; import com.logpm.trunkline.bean.Resp; @@ -178,8 +178,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl brands = this.baseMapper.fingPackageCodeByLoadId(loadId); - NodeEnums node = null; + if (startCarType == 1) { //车辆配载发车 //查询发站仓节点信息 @@ -232,9 +231,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl brands = this.baseMapper.fingPackageCodeByLoadId(loadId, warehouseId); + WorkNodeEnums node = null; + sendFactoryData(brands, node, warehouseId, 1); } catch (Exception e) { log.error("同步工厂数据失败", e); } @@ -342,19 +333,40 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl brands, NodeEnums node, String address) { + private void sendFactoryData(List brands, WorkNodeEnums node, Long warehouseId, Integer type) { + // 查询详细地址为仓库的地址 + BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); + String warehouseAddress = ""; if (CollUtil.isNotEmpty(brands)) { for (LoadScanBrandDTO brand : brands) { String packageCode = brand.getPackageCode(); if (StrUtil.isEmpty(packageCode)) { continue; } + // 发车 + if (ObjectUtil.equal(type, 1)) { + if (ObjectUtil.isEmpty(node)) { + if (ObjectUtil.equal(warehouseId, brand.getStartWarehouseId())) { + node = WorkNodeEnums.INITIAL_WAREHOUSE_DEPART; + } else { + node = WorkNodeEnums.TRANSFER_WAREHOUSE_DEPART; + } + } + if (ObjectUtil.isNotEmpty(warehouseEntity)) { + warehouseAddress = "从【" + warehouseEntity.getName() + "】发出"; + } + } else if (ObjectUtil.equal(type, 2)) { + // 到车 + if (ObjectUtil.isNotEmpty(warehouseEntity)) { + warehouseAddress = "到达【" + warehouseEntity.getName() + "】"; + } + } NodePushMsg msg = new NodePushMsg(); msg.setNode(node); msg.setBrand(BrandEnums.getByValue(brand.getBrand())); msg.setOperator(AuthUtil.getUser().getNickName()); msg.setOperatorTime(new Date()); - msg.setAddress(address); + msg.setAddress(warehouseAddress); List contents = new ArrayList<>(); ArrayList codes = CollUtil.newArrayList(packageCode.split(",")); if (CollUtil.isNotEmpty(codes)) { @@ -889,10 +901,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl brands = this.baseMapper.fingPackageCodeByLoadId(loadId); - NodeEnums node = null; + + WorkNodeEnums node = null; if (unloadType == 1) { - node = NodeEnums.TRANSFER_WAREHOUSE_UNLOADING; + node = WorkNodeEnums.TRANSFER_WAREHOUSE_UNLOADING; //网点卸车确认 if ("40".equals(loadStatus)) { log.warn("#############unloadByLoadId: 当前节点为终点 loadId={} loadStatus={}", loadId, loadStatus); @@ -918,7 +930,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl brands = this.baseMapper.fingPackageCodeByLoadId(loadId, warehouseId); + sendFactoryData(brands, node, warehouseId, 2); } catch (Exception e) { log.error("卸车确认推送工厂失败", e); } @@ -1756,13 +1763,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl brands = this.baseMapper.fingPackageCodeByLoadId(loadId); - // 查询详细地址为仓库的地址 - String warehouseAddress = null; - if (ObjectUtil.isNotEmpty(warehouseEntity)) { - warehouseAddress = "从【" + warehouseEntity.getName() + "】发出"; - } - this.sendFactoryData(brands, NodeEnums.TRIPARTITE_TRANSFER_DEPART, warehouseAddress); + List brands = this.baseMapper.fingPackageCodeByLoadId(loadId, warehouseId); + this.sendFactoryData(brands, WorkNodeEnums.TRIPARTITE_TRANSFER_DEPART, warehouseId, 3); } catch (Exception e) { log.error("三方中转发车节点推送工厂失败", e); } From f93bb863d9ed5f7f80ac39edad31d5178dfeb2cd Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Fri, 12 Apr 2024 14:37:16 +0800 Subject: [PATCH 5/8] =?UTF-8?q?feat(all):=20=E6=B7=BB=E5=8A=A0=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E4=BD=93=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/basicdata/config/XxlJobConfig.java | 74 ++ .../controller/BasicdataPriceController.java | 102 ++ .../BasicdataPriceRouteController.java | 101 ++ .../BasicdataPriceTemplateController.java | 150 +++ .../basicdata/dto/BasicdataPriceDTO.java | 34 + .../basicdata/dto/BasicdataPriceRouteDTO.java | 34 + .../dto/BasicdataPriceTemplateDTO.java | 34 + .../basicdata/excel/BasicdataPriceExcel.java | 43 + .../excel/BasicdataPriceRouteExcel.java | 43 + .../excel/BasicdataPriceTemplateExcel.java | 43 + .../basicdata/job/BasicdataPriceJob.java | 73 ++ .../mapper/BasicdataCategoryMapper.java | 5 +- .../mapper/BasicdataCategoryMapper.xml | 22 +- .../BasicdataPriceCategoryBasicMapper.java | 34 + .../BasicdataPriceCategoryBasicMapper.xml | 9 + .../BasicdataPriceCategoryDispatchMapper.java | 34 + .../BasicdataPriceCategoryDispatchMapper.xml | 9 + ...BasicdataPriceCategoryWarehouseMapper.java | 35 + .../BasicdataPriceCategoryWarehouseMapper.xml | 9 + .../BasicdataPriceFullVehicleMapper.java | 47 + .../BasicdataPriceFullVehicleMapper.xml | 14 + .../mapper/BasicdataPriceGeneralMapper.java | 39 + .../mapper/BasicdataPriceGeneralMapper.xml | 10 + .../mapper/BasicdataPriceMapper.java | 56 + .../basicdata/mapper/BasicdataPriceMapper.xml | 35 + .../mapper/BasicdataPriceRouteMapper.java | 54 + .../mapper/BasicdataPriceRouteMapper.xml | 19 + .../mapper/BasicdataPriceTemplateMapper.java | 54 + .../mapper/BasicdataPriceTemplateMapper.xml | 19 + .../BasicdataPriceTrunklineRouteMapper.java | 44 + .../BasicdataPriceTrunklineRouteMapper.xml | 14 + .../service/IBasicdataCategoryService.java | 3 +- .../IBasicdataPriceCategoryBasicService.java | 39 + ...BasicdataPriceCategoryDispatchService.java | 39 + ...asicdataPriceCategoryWarehouseService.java | 39 + .../IBasicdataPriceFullVehicleService.java | 35 + .../IBasicdataPriceGeneralService.java | 40 + .../service/IBasicdataPriceRouteService.java | 57 + .../service/IBasicdataPriceService.java | 61 + .../IBasicdataPriceTemplateService.java | 66 ++ .../impl/BasicdataCategoryServiceImpl.java | 5 + ...asicdataPriceCategoryBasicServiceImpl.java | 41 + ...cdataPriceCategoryDispatchServiceImpl.java | 41 + ...dataPriceCategoryWarehouseServiceImpl.java | 41 + .../BasicdataPriceFullVehicleServiceImpl.java | 41 + .../BasicdataPriceGeneralServiceImpl.java | 42 + .../impl/BasicdataPriceRouteServiceImpl.java | 273 +++++ .../impl/BasicdataPriceServiceImpl.java | 1018 +++++++++++++++++ .../BasicdataPriceTemplateServiceImpl.java | 437 +++++++ .../wrapper/BasicdataPriceRouteWrapper.java | 50 + .../BasicdataPriceTemplateWrapper.java | 50 + .../wrapper/BasicdataPriceWrapper.java | 50 + .../src/main/resources/application.yml | 12 +- .../ReportBillLoadingController.java | 6 +- .../report/mapper/ReportDeliverMapeer.java | 2 +- .../logpm/report/service/ExportReader.java | 3 +- 56 files changed, 3773 insertions(+), 11 deletions(-) create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/config/XxlJobConfig.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceRouteController.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceTemplateController.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataPriceDTO.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataPriceRouteDTO.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataPriceTemplateDTO.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataPriceExcel.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataPriceRouteExcel.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataPriceTemplateExcel.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/job/BasicdataPriceJob.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryBasicMapper.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryBasicMapper.xml create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryDispatchMapper.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryDispatchMapper.xml create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryWarehouseMapper.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryWarehouseMapper.xml create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceFullVehicleMapper.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceFullVehicleMapper.xml create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceGeneralMapper.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceGeneralMapper.xml create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceRouteMapper.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceRouteMapper.xml create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTemplateMapper.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTemplateMapper.xml create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTrunklineRouteMapper.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTrunklineRouteMapper.xml create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceCategoryBasicService.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceCategoryDispatchService.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceCategoryWarehouseService.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceFullVehicleService.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceGeneralService.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceRouteService.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceTemplateService.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceCategoryBasicServiceImpl.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceCategoryDispatchServiceImpl.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceCategoryWarehouseServiceImpl.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceFullVehicleServiceImpl.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceGeneralServiceImpl.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceRouteServiceImpl.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/BasicdataPriceRouteWrapper.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/BasicdataPriceTemplateWrapper.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/BasicdataPriceWrapper.java diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/config/XxlJobConfig.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/config/XxlJobConfig.java new file mode 100644 index 000000000..eb0b2901c --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/config/XxlJobConfig.java @@ -0,0 +1,74 @@ +package com.logpm.basicdata.config; + +import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * xxl-job config + * + * @author xuxueli 2017-04-28 + */ +@Configuration(proxyBeanMethods = false) +public class XxlJobConfig { + private final Logger logger = LoggerFactory.getLogger(XxlJobConfig.class); + + @Value("${xxl.job.admin.addresses}") + private String adminAddresses; + + @Value("${xxl.job.executor.appname}") + private String appName; + + @Value("${xxl.job.executor.ip}") + private String ip; + + @Value("${xxl.job.executor.port}") + private int port; + + @Value("${xxl.job.accessToken}") + private String accessToken; + + @Value("${xxl.job.executor.logpath}") + private String logPath; + + @Value("${xxl.job.executor.logretentiondays}") + private int logRetentionDays; + + + @Bean + public XxlJobSpringExecutor xxlJobExecutor() { + logger.info(">>>>>>>>>>> xxl-job config init."); + XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor(); + xxlJobSpringExecutor.setAdminAddresses(adminAddresses); + xxlJobSpringExecutor.setAppName(appName); + xxlJobSpringExecutor.setIp(ip); + xxlJobSpringExecutor.setPort(port); + xxlJobSpringExecutor.setAccessToken(accessToken); + xxlJobSpringExecutor.setLogPath(logPath); + xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); + + return xxlJobSpringExecutor; + } + + /** + * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP； + * + * 1、引入依赖： + * + * org.springframework.cloud + * spring-cloud-commons + * ${version} + * + * + * 2、配置文件，或者容器启动变量 + * spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.' + * + * 3、获取IP + * String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); + */ + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java new file mode 100644 index 000000000..98182005a --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.basicdata.service.IBasicdataPriceService; +import com.logpm.basicdata.vo.BasicdataPriceBasicUpdateVO; +import com.logpm.basicdata.vo.BasicdataPricePageVO; +import com.logpm.basicdata.vo.BasicdataPriceVO; +import com.logpm.basicdata.vo.PriceVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + * 基础价格表 控制器 + * + * @author zqb + * @since 2024-04-02 + */ +@RestController +@AllArgsConstructor +@RequestMapping("basicdataPrice") +@Api(value = "基础价格表", tags = "基础价格表接口") +public class BasicdataPriceController extends BladeController { + + private final IBasicdataPriceService basicdataPriceService; + + /** + * 基础价格表 详情 + */ + @GetMapping("/{id}") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入basicdataPrice") + public R detail(@PathVariable Long id) { + PriceVO detail = basicdataPriceService.detail(id); + return R.data(detail); + } + + + /** + * 基础价格表 自定义分页 + */ + @GetMapping + @ApiOperationSupport(order = 2) + @ApiOperation(value = "基础价格分页", notes = "传入basicdataPrice") + public R> page(BasicdataPriceVO basicdataPrice, Query query) { + IPage pages = basicdataPriceService.selectBasicdataPricePage(Condition.getPage(query), basicdataPrice); + return R.data(pages); + } + + /** + * 基础价格表 修改 + */ + @PatchMapping + @ApiOperationSupport(order = 4) + @ApiOperation(value = "基础配置", notes = "传入basicdataPrice") + public R basicUpdate(@Valid @RequestBody BasicdataPriceBasicUpdateVO vo) { + return R.status(basicdataPriceService.basicUpdate(vo)); + } + + /** + * 基础价格表 修改 + */ + @PutMapping + @ApiOperationSupport(order = 3) + @ApiOperation(value = "修改", notes = "传入basicdataPrice") + public R update(@Valid @RequestBody PriceVO vo) { + Boolean res = basicdataPriceService.updatePrice(vo); + return R.status(res); + } + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceRouteController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceRouteController.java new file mode 100644 index 000000000..3c582d535 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceRouteController.java @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.controller; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.basicdata.service.IBasicdataPriceRouteService; +import com.logpm.basicdata.vo.BasicdataPriceRouteVO; +import com.logpm.basicdata.vo.PriceRouteVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + * 基础价格路径 控制器 + * + * @author zqb + * @since 2024-04-08 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/priceRoute") +@Api(value = "基础价格路径", tags = "基础价格路径接口") +public class BasicdataPriceRouteController extends BladeController { + + private final IBasicdataPriceRouteService basicdataPriceRouteService; + + /** + * 基础价格路径 详情 + */ + @GetMapping("/{id}") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入basicdataPriceRoute") + public R detail(@PathVariable Long id) { + PriceRouteVO detail = basicdataPriceRouteService.detail(id); + return R.data(detail); + } + + /** + * 基础价格路径 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入basicdataPriceRoute") + public R> page(BasicdataPriceRouteVO basicdataPriceRoute, Query query) { + IPage pages = basicdataPriceRouteService.selectBasicdataPriceRoutePage(Condition.getPage(query), basicdataPriceRoute); + return R.data(pages); + } + + /** + * 基础价格路径 新增 + */ + @PostMapping("submit") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增/修改", notes = "传入basicdataPriceRoute") + public R save(@Valid @RequestBody PriceRouteVO vo) { + Long id = basicdataPriceRouteService.saveRoute(vo); + return R.success(StrUtil.toString(id)); + } + + /** + * 基础价格路径 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(basicdataPriceRouteService.deleteLogic(Func.toLongList(ids))); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceTemplateController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceTemplateController.java new file mode 100644 index 000000000..4462ff8ad --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceTemplateController.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.basicdata.entity.BasicdataPriceTemplateEntity; +import com.logpm.basicdata.excel.BasicdataPriceTemplateExcel; +import com.logpm.basicdata.service.IBasicdataPriceTemplateService; +import com.logpm.basicdata.vo.BasicdataPriceTemplateVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.constant.BladeConstant; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.List; +import java.util.Map; + +/** + * 基础价格模板表 控制器 + * + * @author zqb + * @since 2024-04-01 + */ +@RestController +@AllArgsConstructor +@RequestMapping("priceTemplate") +@Api(value = "基础价格模板表", tags = "基础价格模板表接口") +public class BasicdataPriceTemplateController extends BladeController { + + private final IBasicdataPriceTemplateService basicdataPriceTemplateService; + + /** + * 基础价格模板表 详情 + */ + @GetMapping("/{id}") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "根据id获取详情") + public R detail(@PathVariable Long id) { + BasicdataPriceTemplateVO basicdataPriceTemplateVO = basicdataPriceTemplateService.detail(id); + return R.data(basicdataPriceTemplateVO); + } + + /** + * 基础价格模板表 自定义分页 + */ + @GetMapping + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入basicdataPriceTemplate") + public R> page(BasicdataPriceTemplateVO basicdataPriceTemplate, Query query) { + IPage pages = basicdataPriceTemplateService.selectBasicdataPriceTemplatePage(Condition.getPage(query), basicdataPriceTemplate); + return R.data(pages); + } + + /** + * 基础价格模板表 新增 + */ + @PostMapping + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入basicdataPriceTemplate") + public R save(@Valid @RequestBody BasicdataPriceTemplateEntity basicdataPriceTemplate) { + Long id = basicdataPriceTemplateService.saveTemplate(basicdataPriceTemplate); + return R.data(id); + } + + /** + * 基础价格模板表 修改 + */ + @PutMapping + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入basicdataPriceTemplate") + public R updateByCheckType(@Valid @RequestBody BasicdataPriceTemplateVO basicdataPriceTemplate) { + return R.status(basicdataPriceTemplateService.updateByCheckType(basicdataPriceTemplate)); + } + + /** + * 基础价格模板表 清除指定类型数据 + */ + @PatchMapping + @ApiOperationSupport(order = 6) + @ApiOperation(value = "清除指定类型数据", notes = "传入basicdataPriceTemplate") + public R clearDataByServiceType(@RequestParam("templateId") Long templateId, @RequestParam("checkType") Integer checkType) { + return R.status(basicdataPriceTemplateService.clearDataByServiceType(templateId, checkType)); + } + + /** + * 基础价格模板表 删除 + */ + @DeleteMapping + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(basicdataPriceTemplateService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-basicdataPriceTemplate") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入basicdataPriceTemplate") + public void exportBasicdataPriceTemplate(@ApiIgnore @RequestParam Map basicdataPriceTemplate, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(basicdataPriceTemplate, BasicdataPriceTemplateEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BasicdataPriceTemplate::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(BasicdataPriceTemplateEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = basicdataPriceTemplateService.exportBasicdataPriceTemplate(queryWrapper); + ExcelUtil.export(response, "基础价格模板表数据" + DateUtil.time(), "基础价格模板表数据表", list, BasicdataPriceTemplateExcel.class); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataPriceDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataPriceDTO.java new file mode 100644 index 000000000..fe5564179 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataPriceDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.dto; + +import com.logpm.basicdata.entity.BasicdataPriceEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 基础价格表 数据传输对象实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceDTO extends BasicdataPriceEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataPriceRouteDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataPriceRouteDTO.java new file mode 100644 index 000000000..c0c92c3ea --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataPriceRouteDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.dto; + +import com.logpm.basicdata.entity.BasicdataPriceRouteEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 基础价格路径 数据传输对象实体类 + * + * @author zqb + * @since 2024-04-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceRouteDTO extends BasicdataPriceRouteEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataPriceTemplateDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataPriceTemplateDTO.java new file mode 100644 index 000000000..7601efb24 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataPriceTemplateDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.dto; + +import com.logpm.basicdata.entity.BasicdataPriceTemplateEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 基础价格模板表 数据传输对象实体类 + * + * @author zqb + * @since 2024-04-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataPriceTemplateDTO extends BasicdataPriceTemplateEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataPriceExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataPriceExcel.java new file mode 100644 index 000000000..0eadf27d7 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataPriceExcel.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel; + + +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; + + +/** + * 基础价格表 Excel实体类 + * + * @author zqb + * @since 2024-04-02 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataPriceRouteExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataPriceRouteExcel.java new file mode 100644 index 000000000..6ef21ab50 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataPriceRouteExcel.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel; + + +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; + + +/** + * 基础价格路径 Excel实体类 + * + * @author zqb + * @since 2024-04-08 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceRouteExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataPriceTemplateExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataPriceTemplateExcel.java new file mode 100644 index 000000000..b09607779 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataPriceTemplateExcel.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel; + + +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; + + +/** + * 基础价格模板表 Excel实体类 + * + * @author zqb + * @since 2024-04-01 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceTemplateExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/job/BasicdataPriceJob.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/job/BasicdataPriceJob.java new file mode 100644 index 000000000..1a68c342e --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/job/BasicdataPriceJob.java @@ -0,0 +1,73 @@ +package com.logpm.basicdata.job; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.logpm.basicdata.entity.BasicdataPriceEntity; +import com.logpm.basicdata.entity.BasicdataStoreBrandEntity; +import com.logpm.basicdata.service.IBasicdataClientService; +import com.logpm.basicdata.service.IBasicdataPriceService; +import com.logpm.basicdata.service.IBasicdataStoreBrandService; +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author zhaoqiaobo + * @create 2024-04-02 + */ +@AllArgsConstructor +@Component +public class BasicdataPriceJob { + + private final IBasicdataClientService clientService; + private final IBasicdataStoreBrandService storeBrandService; + private final IBasicdataPriceService priceService; + + /** + * 定时生成价格体系基础数据 + * 根据客户品牌关系表中的品牌和客户id生成价格体系表，只处理不存在的数据 + * + * @param param + * @return + * @throws Exception + */ + @XxlJob("initPrice") + public ReturnT factoryJobHandler(String param) throws Exception { + List list = storeBrandService.list(Wrappers.lambdaQuery().eq(BasicdataStoreBrandEntity::getIsDeleted, 0)); + List priceList = priceService.list(Wrappers.lambdaQuery().eq(BasicdataPriceEntity::getIsDeleted, 0)); + Map priceMap = new HashMap<>(); + List priceEntities = new ArrayList<>(); + if (CollUtil.isNotEmpty(priceList)) { + for (BasicdataPriceEntity basicdataPriceEntity : priceList) { + Long brandId = basicdataPriceEntity.getBrandId(); + Long clientId = basicdataPriceEntity.getClientId(); + priceMap.put(brandId.toString() + clientId.toString(), basicdataPriceEntity); + } + } + for (BasicdataStoreBrandEntity basicdataStoreBrandEntity : list) { + String brandId = basicdataStoreBrandEntity.getBrandId(); + Long clientId = basicdataStoreBrandEntity.getClientId(); + if (!priceMap.containsKey(brandId + clientId)) { + BasicdataPriceEntity basicdataPriceEntity = new BasicdataPriceEntity(); + basicdataPriceEntity.setClientId(clientId); + basicdataPriceEntity.setBrandId(Convert.toLong(brandId)); + basicdataPriceEntity.setMaintenanceStatus(1); + basicdataPriceEntity.setTenantId(basicdataStoreBrandEntity.getTenantId()); + priceEntities.add(basicdataPriceEntity); + } + } + if (CollUtil.isNotEmpty(priceEntities)) { + priceService.saveBatch(priceEntities); + } + return ReturnT.SUCCESS; + } + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.java index 82c46328e..060a3d5b3 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.basicdata.entity.BasicdataCategoryEntity; import com.logpm.basicdata.excel.BasicdataCategoryExcel; import com.logpm.basicdata.vo.BasicdataCategoryVO; +import com.logpm.basicdata.vo.PriceCategoryVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -57,5 +58,7 @@ public interface BasicdataCategoryMapper extends BaseMapper findListByName(@Param("goodsName") String goodsName); - List listName(@Param("name") String name); + List listName(@Param("name") String name); + + List findCategoryByIds(@Param("ids") List ids); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.xml index 0bd13388a..214df9e81 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.xml @@ -117,8 +117,26 @@ select * from logpm_basicdata_category where `name` like concat(#{name},"%") - and is_deleted = 0 - limit 10 + and is_deleted = 0 + limit 10 + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryBasicMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryBasicMapper.java new file mode 100644 index 000000000..347953556 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryBasicMapper.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.basicdata.entity.BasicdataPriceCategoryBasicEntity; +import org.apache.ibatis.annotations.Delete; + +/** + * 基础价格按品类计费 Mapper 接口 + * + * @author zqb + * @since 2024-04-02 + */ +public interface BasicdataPriceCategoryBasicMapper extends BaseMapper { + + @Delete("delete from logpm_basicdata_price_category_basic where price_id = #{priceId}") + void removeByPriceId(Long priceId); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryBasicMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryBasicMapper.xml new file mode 100644 index 000000000..bdafb2b6e --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryBasicMapper.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryDispatchMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryDispatchMapper.java new file mode 100644 index 000000000..ea058a90c --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryDispatchMapper.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.basicdata.entity.BasicdataPriceCategoryDispatchEntity; +import org.apache.ibatis.annotations.Delete; + +/** + * 基础价格按品类计费 Mapper 接口 + * + * @author zqb + * @since 2024-04-02 + */ +public interface BasicdataPriceCategoryDispatchMapper extends BaseMapper { + + + @Delete("delete from logpm_basicdata_price_category_dispatch where price_id = #{priceId}") + void removeByPriceId(Long priceId); +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryDispatchMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryDispatchMapper.xml new file mode 100644 index 000000000..ecb449676 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryDispatchMapper.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryWarehouseMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryWarehouseMapper.java new file mode 100644 index 000000000..8ab88655c --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryWarehouseMapper.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.basicdata.entity.BasicdataPriceCategoryWarehouseEntity; +import org.apache.ibatis.annotations.Delete; + +/** + * 基础价格按品类计费 Mapper 接口 + * + * @author zqb + * @since 2024-04-02 + */ +public interface BasicdataPriceCategoryWarehouseMapper extends BaseMapper { + + + @Delete("delete from logpm_basicdata_price_category_warehouse where price_id = #{priceId}") + void removeByPriceId(Long priceId); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryWarehouseMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryWarehouseMapper.xml new file mode 100644 index 000000000..da5f1fd57 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceCategoryWarehouseMapper.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceFullVehicleMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceFullVehicleMapper.java new file mode 100644 index 000000000..1f88cfffc --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceFullVehicleMapper.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.entity.BasicdataPriceFullVehicleEntity; +import com.logpm.basicdata.vo.BasicdataPriceFullVehicleVO; +import org.apache.ibatis.annotations.Delete; + +import java.util.List; + +/** + * 基础价格整车计费 Mapper 接口 + * + * @author zqb + * @since 2024-04-02 + */ +public interface BasicdataPriceFullVehicleMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param basicdataPriceFullVehicle + * @return + */ + List selectBasicdataPriceFullVehiclePage(IPage page, BasicdataPriceFullVehicleVO basicdataPriceFullVehicle); + + @Delete("delete from logpm_basicdata_price_full_vehicle where price_id = #{priceId}") + void removeByPriceId(Long priceId); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceFullVehicleMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceFullVehicleMapper.xml new file mode 100644 index 000000000..b747e8cb0 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceFullVehicleMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceGeneralMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceGeneralMapper.java new file mode 100644 index 000000000..93c8508ad --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceGeneralMapper.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.basicdata.entity.BasicdataPriceGeneralEntity; +import org.apache.ibatis.annotations.Delete; + +/** + * 基础价格一般计费 Mapper 接口 + * + * @author zqb + * @since 2024-04-02 + */ +public interface BasicdataPriceGeneralMapper extends BaseMapper { + + /** + * 根据价格ID删除logpm_basicdata_price_general表中的记录。 + * + * @param priceId 价格ID，用于指定要删除的价格记录。 + * @return void 方法没有返回值。 + */ + @Delete("delete from logpm_basicdata_price_general where price_id = #{priceId}") + void removeByPriceId(Long priceId); +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceGeneralMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceGeneralMapper.xml new file mode 100644 index 000000000..ecd8f22b7 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceGeneralMapper.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.java new file mode 100644 index 000000000..7b19a523b --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.entity.BasicdataPriceEntity; +import com.logpm.basicdata.excel.BasicdataPriceExcel; +import com.logpm.basicdata.vo.BasicdataPricePageVO; +import com.logpm.basicdata.vo.BasicdataPriceVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 基础价格表 Mapper 接口 + * + * @author zqb + * @since 2024-04-02 + */ +public interface BasicdataPriceMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param basicdataPrice + * @return + */ + List selectBasicdataPricePage(IPage page, BasicdataPriceVO basicdataPrice); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataPrice(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml new file mode 100644 index 000000000..8d0733875 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceRouteMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceRouteMapper.java new file mode 100644 index 000000000..e9d2c969d --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceRouteMapper.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.mapper; + +import com.logpm.basicdata.entity.BasicdataPriceRouteEntity; +import com.logpm.basicdata.vo.BasicdataPriceRouteVO; +import com.logpm.basicdata.excel.BasicdataPriceRouteExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * 基础价格路径 Mapper 接口 + * + * @author zqb + * @since 2024-04-08 + */ +public interface BasicdataPriceRouteMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param basicdataPriceRoute + * @return + */ + List selectBasicdataPriceRoutePage(IPage page, BasicdataPriceRouteVO basicdataPriceRoute); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataPriceRoute(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceRouteMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceRouteMapper.xml new file mode 100644 index 000000000..0d06caa9d --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceRouteMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTemplateMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTemplateMapper.java new file mode 100644 index 000000000..79062a7b5 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTemplateMapper.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.mapper; + +import com.logpm.basicdata.entity.BasicdataPriceTemplateEntity; +import com.logpm.basicdata.vo.BasicdataPriceTemplateVO; +import com.logpm.basicdata.excel.BasicdataPriceTemplateExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * 基础价格模板表 Mapper 接口 + * + * @author zqb + * @since 2024-04-01 + */ +public interface BasicdataPriceTemplateMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param basicdataPriceTemplate + * @return + */ + List selectBasicdataPriceTemplatePage(IPage page, BasicdataPriceTemplateVO basicdataPriceTemplate); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataPriceTemplate(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTemplateMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTemplateMapper.xml new file mode 100644 index 000000000..46b89da33 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTemplateMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTrunklineRouteMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTrunklineRouteMapper.java new file mode 100644 index 000000000..0301d6fe1 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTrunklineRouteMapper.java @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.entity.BasicdataPriceRouteEntity; +import com.logpm.basicdata.vo.BasicdataPriceRouteVO; + +import java.util.List; + +/** + * 基础价格干线路径 Mapper 接口 + * + * @author zqb + * @since 2024-04-02 + */ +public interface BasicdataPriceTrunklineRouteMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param basicdataPriceTrunklineRoute + * @return + */ + List selectBasicdataPriceTrunklineRoutePage(IPage page, BasicdataPriceRouteVO basicdataPriceTrunklineRoute); + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTrunklineRouteMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTrunklineRouteMapper.xml new file mode 100644 index 000000000..d9b532088 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceTrunklineRouteMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCategoryService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCategoryService.java index 07a89ee28..6e2185656 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCategoryService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCategoryService.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.basicdata.entity.BasicdataCategoryEntity; import com.logpm.basicdata.excel.BasicdataCategoryExcel; import com.logpm.basicdata.vo.BasicdataCategoryVO; +import com.logpm.basicdata.vo.PriceCategoryVO; import org.springblade.core.mp.base.BaseService; import java.util.List; @@ -56,5 +57,5 @@ public interface IBasicdataCategoryService extends BaseService findListByName(String goodsName); List listName(BasicdataCategoryVO basicdataCategory); - + List findCategoryByIds(List newArrayList); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceCategoryBasicService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceCategoryBasicService.java new file mode 100644 index 000000000..76ed4e6b4 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceCategoryBasicService.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.logpm.basicdata.entity.BasicdataPriceCategoryBasicEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * 基础价格按品类计费 服务类 + * + * @author zqb + * @since 2024-04-02 + */ +public interface IBasicdataPriceCategoryBasicService extends BaseService { + + /** + * 根据价格ID移除相关记录。 + * + * @param priceId 价格ID，用于标识需要被移除的记录。 + * 如果提供了一个不存在的价格ID，则该操作可能不执行任何操作。 + * 长整型，不能为null。 + */ + void removeByPriceId(Long priceId); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceCategoryDispatchService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceCategoryDispatchService.java new file mode 100644 index 000000000..178681615 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceCategoryDispatchService.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.logpm.basicdata.entity.BasicdataPriceCategoryDispatchEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * 基础价格按品类计费 服务类 + * + * @author zqb + * @since 2024-04-02 + */ +public interface IBasicdataPriceCategoryDispatchService extends BaseService { + + /** + * 根据价格ID移除相关记录。 + * + * @param priceId 价格ID，用于标识需要被移除的记录。 + * 如果提供了一个不存在的价格ID，则该操作可能不执行任何操作。 + * 长整型，不能为null。 + */ + void removeByPriceId(Long priceId); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceCategoryWarehouseService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceCategoryWarehouseService.java new file mode 100644 index 000000000..625baacdf --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceCategoryWarehouseService.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.logpm.basicdata.entity.BasicdataPriceCategoryWarehouseEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * 基础价格按品类计费 服务类 + * + * @author zqb + * @since 2024-04-02 + */ +public interface IBasicdataPriceCategoryWarehouseService extends BaseService { + + /** + * 根据价格ID移除相关记录。 + * + * @param priceId 价格ID，用于标识需要被移除的记录。 + * 如果提供了一个不存在的价格ID，则该操作可能不执行任何操作。 + * 长整型，不能为null。 + */ + void removeByPriceId(Long priceId); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceFullVehicleService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceFullVehicleService.java new file mode 100644 index 000000000..15e539464 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceFullVehicleService.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.logpm.basicdata.entity.BasicdataPriceFullVehicleEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * 基础价格整车计费 服务类 + * + * @author zqb + * @since 2024-04-02 + */ +public interface IBasicdataPriceFullVehicleService extends BaseService { + + /** + * 根据价格id删除 + * @param id + */ + void removeByPriceId(Long priceId); +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceGeneralService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceGeneralService.java new file mode 100644 index 000000000..6353cbc2a --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceGeneralService.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.logpm.basicdata.entity.BasicdataPriceGeneralEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * 基础价格一般计费 服务类 + * + * @author zqb + * @since 2024-04-02 + */ +public interface IBasicdataPriceGeneralService extends BaseService { + + /** + * 根据价格ID移除相关记录。 + * + * @param priceId 价格ID，用于标识需要被移除的记录。 + * 如果提供了一个不存在的价格ID，则该操作可能不执行任何操作。 + * 长整型，不能为null。 + */ + void removeByPriceId(Long priceId); + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceRouteService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceRouteService.java new file mode 100644 index 000000000..17ae98d02 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceRouteService.java @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.entity.BasicdataPriceRouteEntity; +import com.logpm.basicdata.excel.BasicdataPriceRouteExcel; +import com.logpm.basicdata.vo.BasicdataPriceRouteVO; +import com.logpm.basicdata.vo.PriceRouteVO; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * 基础价格路径 服务类 + * + * @author zqb + * @since 2024-04-08 + */ +public interface IBasicdataPriceRouteService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param basicdataPriceRoute + * @return + */ + IPage selectBasicdataPriceRoutePage(IPage page, BasicdataPriceRouteVO basicdataPriceRoute); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataPriceRoute(Wrapper queryWrapper); + + Long saveRoute(PriceRouteVO vo); + + PriceRouteVO detail(Long id); +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java new file mode 100644 index 000000000..2da42099d --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.entity.BasicdataPriceEntity; +import com.logpm.basicdata.excel.BasicdataPriceExcel; +import com.logpm.basicdata.vo.BasicdataPriceBasicUpdateVO; +import com.logpm.basicdata.vo.BasicdataPricePageVO; +import com.logpm.basicdata.vo.BasicdataPriceVO; +import com.logpm.basicdata.vo.PriceVO; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * 基础价格表 服务类 + * + * @author zqb + * @since 2024-04-02 + */ +public interface IBasicdataPriceService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param basicdataPrice + * @return + */ + IPage selectBasicdataPricePage(IPage page, BasicdataPriceVO basicdataPrice); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataPrice(Wrapper queryWrapper); + + Boolean basicUpdate(BasicdataPriceBasicUpdateVO vo); + + Boolean updatePrice(PriceVO vo); + + PriceVO detail(Long id); +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceTemplateService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceTemplateService.java new file mode 100644 index 000000000..22f0eebf3 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceTemplateService.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.basicdata.entity.BasicdataPriceTemplateEntity; +import com.logpm.basicdata.vo.BasicdataPriceTemplateVO; +import com.logpm.basicdata.excel.BasicdataPriceTemplateExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 基础价格模板表 服务类 + * + * @author zqb + * @since 2024-04-01 + */ +public interface IBasicdataPriceTemplateService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param basicdataPriceTemplate + * @return + */ + IPage selectBasicdataPriceTemplatePage(IPage page, BasicdataPriceTemplateVO basicdataPriceTemplate); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataPriceTemplate(Wrapper queryWrapper); + + Boolean updateByCheckType(BasicdataPriceTemplateVO basicdataPriceTemplate); + + BasicdataPriceTemplateVO detail(Long id); + + Long saveTemplate(BasicdataPriceTemplateEntity basicdataPriceTemplate); + + /** + * 根据服务类型清除数据。 + * + * @param templateId 模板ID，用于指定需要清除数据的模板。 + * @param checkType 检查类型，用于指定清除数据的检查类型。 + * @return 返回一个布尔值，表示数据是否成功被清除。 + */ + Boolean clearDataByServiceType(Long templateId, Integer checkType); +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCategoryServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCategoryServiceImpl.java index a7714d832..003f4ee0c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCategoryServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCategoryServiceImpl.java @@ -24,6 +24,7 @@ import com.logpm.basicdata.excel.BasicdataCategoryExcel; import com.logpm.basicdata.mapper.BasicdataCategoryMapper; import com.logpm.basicdata.service.IBasicdataCategoryService; import com.logpm.basicdata.vo.BasicdataCategoryVO; +import com.logpm.basicdata.vo.PriceCategoryVO; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; @@ -67,5 +68,9 @@ public class BasicdataCategoryServiceImpl extends BaseServiceImpl listName(BasicdataCategoryVO basicdataCategory) { return baseMapper.listName(basicdataCategory.getName()); } + @Override + public List findCategoryByIds(List ids) { + return baseMapper.findCategoryByIds(ids); + } } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceCategoryBasicServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceCategoryBasicServiceImpl.java new file mode 100644 index 000000000..2e53f9d2f --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceCategoryBasicServiceImpl.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.logpm.basicdata.entity.BasicdataPriceCategoryBasicEntity; +import com.logpm.basicdata.mapper.BasicdataPriceCategoryBasicMapper; +import com.logpm.basicdata.service.IBasicdataPriceCategoryBasicService; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 基础价格按品类计费 服务实现类 + * + * @author zqb + * @since 2024-04-02 + */ +@Service +public class BasicdataPriceCategoryBasicServiceImpl extends BaseServiceImpl implements IBasicdataPriceCategoryBasicService { + + @Override + public void removeByPriceId(Long priceId) { + if (ObjectUtil.isNotEmpty(priceId)) { + baseMapper.removeByPriceId(priceId); + } + } +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceCategoryDispatchServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceCategoryDispatchServiceImpl.java new file mode 100644 index 000000000..46452531e --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceCategoryDispatchServiceImpl.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.logpm.basicdata.entity.BasicdataPriceCategoryDispatchEntity; +import com.logpm.basicdata.mapper.BasicdataPriceCategoryDispatchMapper; +import com.logpm.basicdata.service.IBasicdataPriceCategoryDispatchService; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 基础价格按品类计费 服务实现类 + * + * @author zqb + * @since 2024-04-02 + */ +@Service +public class BasicdataPriceCategoryDispatchServiceImpl extends BaseServiceImpl implements IBasicdataPriceCategoryDispatchService { + + @Override + public void removeByPriceId(Long priceId) { + if (ObjectUtil.isNotEmpty(priceId)) { + this.baseMapper.removeByPriceId(priceId); + } + } +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceCategoryWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceCategoryWarehouseServiceImpl.java new file mode 100644 index 000000000..272d76059 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceCategoryWarehouseServiceImpl.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.logpm.basicdata.entity.BasicdataPriceCategoryWarehouseEntity; +import com.logpm.basicdata.mapper.BasicdataPriceCategoryWarehouseMapper; +import com.logpm.basicdata.service.IBasicdataPriceCategoryWarehouseService; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 基础价格按品类计费 服务实现类 + * + * @author zqb + * @since 2024-04-02 + */ +@Service +public class BasicdataPriceCategoryWarehouseServiceImpl extends BaseServiceImpl implements IBasicdataPriceCategoryWarehouseService { + + @Override + public void removeByPriceId(Long priceId) { + if (ObjectUtil.isNotEmpty(priceId)) { + baseMapper.removeByPriceId(priceId); + } + } +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceFullVehicleServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceFullVehicleServiceImpl.java new file mode 100644 index 000000000..8bb24ff0e --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceFullVehicleServiceImpl.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.logpm.basicdata.entity.BasicdataPriceFullVehicleEntity; +import com.logpm.basicdata.mapper.BasicdataPriceFullVehicleMapper; +import com.logpm.basicdata.service.IBasicdataPriceFullVehicleService; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 基础价格整车计费 服务实现类 + * + * @author zqb + * @since 2024-04-02 + */ +@Service +public class BasicdataPriceFullVehicleServiceImpl extends BaseServiceImpl implements IBasicdataPriceFullVehicleService { + + @Override + public void removeByPriceId(Long priceId) { + if (ObjectUtil.isNotEmpty(priceId)) { + this.baseMapper.removeByPriceId(priceId); + } + } +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceGeneralServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceGeneralServiceImpl.java new file mode 100644 index 000000000..e7423d2dc --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceGeneralServiceImpl.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.logpm.basicdata.entity.BasicdataPriceGeneralEntity; +import com.logpm.basicdata.mapper.BasicdataPriceGeneralMapper; +import com.logpm.basicdata.service.IBasicdataPriceGeneralService; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 基础价格一般计费 服务实现类 + * + * @author zqb + * @since 2024-04-02 + */ +@Service +public class BasicdataPriceGeneralServiceImpl extends BaseServiceImpl implements IBasicdataPriceGeneralService { + + + @Override + public void removeByPriceId(Long priceId) { + if (ObjectUtil.isNotEmpty(priceId)) { + baseMapper.removeByPriceId(priceId); + } + } +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceRouteServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceRouteServiceImpl.java new file mode 100644 index 000000000..851c42c73 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceRouteServiceImpl.java @@ -0,0 +1,273 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.logpm.basicdata.entity.BasicdataPriceCategoryBasicEntity; +import com.logpm.basicdata.entity.BasicdataPriceFullVehicleEntity; +import com.logpm.basicdata.entity.BasicdataPriceGeneralEntity; +import com.logpm.basicdata.entity.BasicdataPriceRouteEntity; +import com.logpm.basicdata.enums.FullVehicleTypeEnums; +import com.logpm.basicdata.enums.GeneralServiceTypeEnums; +import com.logpm.basicdata.enums.PickupPricingTypeEnums; +import com.logpm.basicdata.enums.ServiceTypeEnums; +import com.logpm.basicdata.excel.BasicdataPriceRouteExcel; +import com.logpm.basicdata.mapper.BasicdataPriceRouteMapper; +import com.logpm.basicdata.service.IBasicdataPriceCategoryBasicService; +import com.logpm.basicdata.service.IBasicdataPriceFullVehicleService; +import com.logpm.basicdata.service.IBasicdataPriceGeneralService; +import com.logpm.basicdata.service.IBasicdataPriceRouteService; +import com.logpm.basicdata.vo.BasicdataPriceFullVehicleVO; +import com.logpm.basicdata.vo.BasicdataPriceRouteVO; +import com.logpm.basicdata.vo.PriceBasicVO; +import com.logpm.basicdata.vo.PriceRouteVO; +import lombok.RequiredArgsConstructor; +import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 基础价格路径 服务实现类 + * + * @author zqb + * @since 2024-04-08 + */ +@Service +@RequiredArgsConstructor +public class BasicdataPriceRouteServiceImpl extends BaseServiceImpl implements IBasicdataPriceRouteService { + + private final IBasicdataPriceFullVehicleService fullVehicleService; + private final IBasicdataPriceCategoryBasicService categoryBasicService; + private final IBasicdataPriceGeneralService generalService; + + @Override + public IPage selectBasicdataPriceRoutePage(IPage page, BasicdataPriceRouteVO basicdataPriceRoute) { + return page.setRecords(baseMapper.selectBasicdataPriceRoutePage(page, basicdataPriceRoute)); + } + + + @Override + public List exportBasicdataPriceRoute(Wrapper queryWrapper) { + List basicdataPriceRouteList = baseMapper.exportBasicdataPriceRoute(queryWrapper); + //basicdataPriceRouteList.forEach(basicdataPriceRoute -> { + // basicdataPriceRoute.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataPriceRoute.getType())); + //}); + return basicdataPriceRouteList; + } + + @Override + public Long saveRoute(PriceRouteVO vo) { + // 处理基础数据 + BasicdataPriceRouteEntity route = new BasicdataPriceRouteEntity(); + route.setId(vo.getId()); + route.setSendOrgId(vo.getSendOrgId()); + route.setPriceId(vo.getPriceId()); + route.setServiceType(vo.getServiceType()); + route.setStartCityId(vo.getStartCityId()); + route.setStartProvinceId(vo.getStartProvinceId()); + route.setStartCountyId(vo.getStartCountyId()); + route.setEndCityId(vo.getEndCityId()); + route.setEndProvinceId(vo.getEndProvinceId()); + route.setEndCountyId(vo.getEndCountyId()); + this.saveOrUpdate(route); + List fullVehicleEntities = new ArrayList<>(); + FullVehicleTypeEnums fullVehicleTypeEnums = null; + GeneralServiceTypeEnums generalServiceTypeEnums = null; + if (ObjectUtil.equal(vo.getServiceType(), ServiceTypeEnums.PICK_UP.getCode())) { + fullVehicleTypeEnums = FullVehicleTypeEnums.PICK_UP_ROUTE; + generalServiceTypeEnums = GeneralServiceTypeEnums.PICK_UP_ROUTE; + } else { + fullVehicleTypeEnums = FullVehicleTypeEnums.TRUNK_LINE_ROUTE; + generalServiceTypeEnums = GeneralServiceTypeEnums.TRUNK_LINE_ROUTE; + } + // 整车 + if (CollUtil.isNotEmpty(vo.getFullVehicle())) { + FullVehicleTypeEnums finalFullVehicleTypeEnums = fullVehicleTypeEnums; + vo.getFullVehicle().forEach(fullVehicle -> { + buildFullVehicle(route.getId(), fullVehicleEntities, fullVehicle, finalFullVehicleTypeEnums.getCode()); + }); + if (CollUtil.isNotEmpty(fullVehicleEntities)) { + fullVehicleService.saveOrUpdateBatch(fullVehicleEntities); + } + } + // 按件 + List categoryEntities = new ArrayList<>(); + if (CollUtil.isNotEmpty(vo.getPieceCategory())) { + vo.getPieceCategory().forEach(pieceCategory -> { + buildCategory(route.getId(), categoryEntities, pieceCategory, PickupPricingTypeEnums.PIECE.getCode()); + }); + } + // 按方 + if (CollUtil.isNotEmpty(vo.getCubeCategory())) { + vo.getCubeCategory().forEach(cubeCategory -> { + buildCategory(route.getId(), categoryEntities, cubeCategory, PickupPricingTypeEnums.CUBE.getCode()); + }); + } + // 按重量 + if (CollUtil.isNotEmpty(vo.getWeightCategory())) { + vo.getWeightCategory().forEach(weightCategory -> { + buildCategory(route.getId(), categoryEntities, weightCategory, PickupPricingTypeEnums.WEIGHT.getCode()); + }); + } + if (CollUtil.isNotEmpty(categoryEntities)) { + categoryBasicService.saveOrUpdateBatch(categoryEntities); + } + // 最低计费 + if (ObjectUtil.isNotEmpty(vo.getMinCost())) { + List priceGeneralEntities = new ArrayList<>(); + biuldGeneral(route.getId(), generalServiceTypeEnums.getCode(), vo.getMinCost(), vo.getAdditionalCost(), priceGeneralEntities); + generalService.saveOrUpdateBatch(priceGeneralEntities); + } + return route.getId(); + } + + @Override + public PriceRouteVO detail(Long id) { + // 1.查询基础数据 + BasicdataPriceRouteEntity route = this.getById(id); + if (ObjectUtil.isNotEmpty(route)) { + Integer serviceType = route.getServiceType(); + PriceRouteVO vo = new PriceRouteVO(); + BeanUtil.copyProperties(route, vo); + // 2.查询整车 + Integer type = null; + if (ObjectUtil.equal(serviceType, ServiceTypeEnums.PICK_UP.getCode())) { + type = FullVehicleTypeEnums.PICK_UP_ROUTE.getCode(); + } else { + type = FullVehicleTypeEnums.TRUNK_LINE_ROUTE.getCode(); + } + List fullVehicleEntities = fullVehicleService.list(Wrappers.lambdaQuery() + .eq(BasicdataPriceFullVehicleEntity::getBoId, route.getId()) + .eq(BasicdataPriceFullVehicleEntity::getType, type)); + if (CollUtil.isNotEmpty(fullVehicleEntities)) { + List fulls = new ArrayList<>(); + fullVehicleEntities.forEach(fullVehicle -> { + BasicdataPriceFullVehicleVO basicdataPriceFullVehicleVO = new BasicdataPriceFullVehicleVO(); + BeanUtil.copyProperties(fullVehicle, basicdataPriceFullVehicleVO); + fulls.add(basicdataPriceFullVehicleVO); + }); + vo.setFullVehicle(fulls); + } + // 3.按品类 + List categoryEntities = categoryBasicService.list(Wrappers.lambdaQuery() + .eq(BasicdataPriceCategoryBasicEntity::getBoId, route.getId())); + if (CollUtil.isNotEmpty(categoryEntities)) { + // 将categoryEntities转换为Map，其中type为key + Map> categoryMap = categoryEntities.stream().collect(Collectors.groupingBy(BasicdataPriceCategoryBasicEntity::getType)); + // 按件 + if (categoryMap.containsKey(PickupPricingTypeEnums.PIECE.getCode())) { + List pieceCategory = categoryMap.get(PickupPricingTypeEnums.PIECE.getCode()); + List pieceCategoryVO = new ArrayList<>(); + pieceCategory.forEach(piece -> { + PriceBasicVO basicdataPriceCategoryBasicVO = new PriceBasicVO(); + BeanUtil.copyProperties(piece, basicdataPriceCategoryBasicVO); + pieceCategoryVO.add(basicdataPriceCategoryBasicVO); + }); + vo.setPieceCategory(pieceCategoryVO); + } + // 按方 + if (categoryMap.containsKey(PickupPricingTypeEnums.CUBE.getCode())) { + List cubeCategory = categoryMap.get(PickupPricingTypeEnums.CUBE.getCode()); + List cubeCategoryVO = new ArrayList<>(); + cubeCategory.forEach(cube -> { + PriceBasicVO basicdataPriceCategoryBasicVO = new PriceBasicVO(); + BeanUtil.copyProperties(cube, basicdataPriceCategoryBasicVO); + cubeCategoryVO.add(basicdataPriceCategoryBasicVO); + }); + vo.setCubeCategory(cubeCategoryVO); + } + // 按重量 + if (categoryMap.containsKey(PickupPricingTypeEnums.WEIGHT.getCode())) { + List weightCategory = categoryMap.get(PickupPricingTypeEnums.WEIGHT.getCode()); + List weightCategoryVO = new ArrayList<>(); + weightCategory.forEach(weight -> { + PriceBasicVO basicdataPriceCategoryBasicVO = new PriceBasicVO(); + BeanUtil.copyProperties(weight, basicdataPriceCategoryBasicVO); + }); + vo.setWeightCategory(weightCategoryVO); + } + } + // 4.最低计费 + List generalEntities = generalService.list(Wrappers.lambdaQuery() + .eq(BasicdataPriceGeneralEntity::getBoId, route.getId())); + if (CollUtil.isNotEmpty(generalEntities)) { + BasicdataPriceGeneralEntity generalEntity = generalEntities.get(0); + vo.setId(generalEntity.getId()); + vo.setMinCost(generalEntity.getMinCost()); + vo.setAdditionalCost(generalEntity.getAdditionalCost()); + } + return vo; + } + throw new ServiceException("表单不存在"); + } + + private void biuldGeneral(Long priceId, Integer code, Double minCost, Double additionalCost, List generalList) { + // 1 最低计费一个价格体系一个服务类型只存在一条 + BasicdataPriceGeneralEntity generalEntity = generalService.getOne(Wrappers.lambdaQuery() + .eq(BasicdataPriceGeneralEntity::getBoId, priceId) + .eq(BasicdataPriceGeneralEntity::getServiceType, code) + ); + if (ObjectUtil.isEmpty(generalEntity)) { + generalEntity = new BasicdataPriceGeneralEntity(); + generalEntity.setBoId(priceId); + generalEntity.setServiceType(code); + } + // 设置最低计费和加算价格 + generalEntity.setMinCost(minCost); + generalEntity.setAdditionalCost(additionalCost); + generalList.add(generalEntity); + + } + + private void buildCategory(Long priceId, List cubeCategoryEntities, PriceBasicVO cubeCategory, Integer type) { + BasicdataPriceCategoryBasicEntity categoryEntity = new BasicdataPriceCategoryBasicEntity(); + Long id = cubeCategory.getId(); + if (ObjectUtil.isEmpty(id)) { + categoryEntity.setBoId(priceId); + categoryEntity.setType(type); + } else { + categoryEntity.setId(id); + } + categoryEntity.setPrice(cubeCategory.getPrice()); + categoryEntity.setCategoryId(cubeCategory.getCategoryId()); + cubeCategoryEntities.add(categoryEntity); + } + + private void buildFullVehicle(Long priceId, List fullVehicleEntities, BasicdataPriceFullVehicleVO fullVehicle, Integer type) { + BasicdataPriceFullVehicleEntity basicdataPriceFullVehicleEntity = new BasicdataPriceFullVehicleEntity(); + basicdataPriceFullVehicleEntity.setPrice(fullVehicle.getPrice()); + basicdataPriceFullVehicleEntity.setVehicleType(fullVehicle.getVehicleType()); + if (ObjectUtil.isEmpty(fullVehicle.getId())) { + basicdataPriceFullVehicleEntity.setBoId(priceId); + basicdataPriceFullVehicleEntity.setType(type); + } else { + basicdataPriceFullVehicleEntity.setId(fullVehicle.getId()); + } + fullVehicleEntities.add(basicdataPriceFullVehicleEntity); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java new file mode 100644 index 000000000..81b245754 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java @@ -0,0 +1,1018 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.logpm.basicdata.entity.BasicdataPriceCategoryBasicEntity; +import com.logpm.basicdata.entity.BasicdataPriceCategoryDispatchEntity; +import com.logpm.basicdata.entity.BasicdataPriceCategoryWarehouseEntity; +import com.logpm.basicdata.entity.BasicdataPriceEntity; +import com.logpm.basicdata.entity.BasicdataPriceFullVehicleEntity; +import com.logpm.basicdata.entity.BasicdataPriceGeneralEntity; +import com.logpm.basicdata.entity.BasicdataPriceTemplateEntity; +import com.logpm.basicdata.enums.CostTypeEnums; +import com.logpm.basicdata.enums.DispatchPricingTypeEnums; +import com.logpm.basicdata.enums.FullVehicleTypeEnums; +import com.logpm.basicdata.enums.GeneralServiceTypeEnums; +import com.logpm.basicdata.enums.PickupPricingTypeEnums; +import com.logpm.basicdata.enums.ServiceTypeEnums; +import com.logpm.basicdata.enums.TrunkLinePricingTypeEnums; +import com.logpm.basicdata.enums.WarehousePricingTypeEnums; +import com.logpm.basicdata.excel.BasicdataPriceExcel; +import com.logpm.basicdata.mapper.BasicdataPriceMapper; +import com.logpm.basicdata.service.IBasicdataPriceCategoryBasicService; +import com.logpm.basicdata.service.IBasicdataPriceCategoryDispatchService; +import com.logpm.basicdata.service.IBasicdataPriceCategoryWarehouseService; +import com.logpm.basicdata.service.IBasicdataPriceFullVehicleService; +import com.logpm.basicdata.service.IBasicdataPriceGeneralService; +import com.logpm.basicdata.service.IBasicdataPriceService; +import com.logpm.basicdata.service.IBasicdataPriceTemplateService; +import com.logpm.basicdata.vo.BasicdataPriceBasicUpdateVO; +import com.logpm.basicdata.vo.BasicdataPriceFullVehicleVO; +import com.logpm.basicdata.vo.BasicdataPricePageVO; +import com.logpm.basicdata.vo.BasicdataPriceVO; +import com.logpm.basicdata.vo.PriceBasicVO; +import com.logpm.basicdata.vo.PriceDispatchAdditionalVO; +import com.logpm.basicdata.vo.PriceDispatchBasicVO; +import com.logpm.basicdata.vo.PriceDispatchVO; +import com.logpm.basicdata.vo.PricePickupVO; +import com.logpm.basicdata.vo.PriceTrunkLineVO; +import com.logpm.basicdata.vo.PriceVO; +import com.logpm.basicdata.vo.PriceWarehouseAdditionalVO; +import com.logpm.basicdata.vo.PriceWarehouseBasicVO; +import com.logpm.basicdata.vo.PriceWarehouseVO; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.enums.BooleanZeroOneEnums; +import org.springblade.common.model.IDict; +import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 基础价格表 服务实现类 + * + * @author zqb + * @since 2024-04-02 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class BasicdataPriceServiceImpl extends BaseServiceImpl implements IBasicdataPriceService { + + private final IBasicdataPriceTemplateService templateService; + + private final IBasicdataPriceFullVehicleService fullVehicleService; + private final IBasicdataPriceCategoryDispatchService categoryDispatchService; + private final IBasicdataPriceCategoryBasicService categoryBasicService; + private final IBasicdataPriceCategoryWarehouseService categoryWarehouseService; + private final IBasicdataPriceGeneralService generalService; + + @Override + public IPage selectBasicdataPricePage(IPage page, BasicdataPriceVO basicdataPrice) { + List basicdataPriceVOS = baseMapper.selectBasicdataPricePage(page, basicdataPrice); + if (CollUtil.isNotEmpty(basicdataPriceVOS)) { + for (BasicdataPricePageVO basicdataPriceVO : basicdataPriceVOS) { + // 维护状态 + if (StrUtil.isNotEmpty(basicdataPriceVO.getExpiryTime())) { + DateTime now = DateUtil.date(); + DateTime dateTime = DateUtil.parseDate(basicdataPriceVO.getExpiryTime()); + if (now.isAfter(dateTime)) { + // 已到期 + basicdataPriceVO.setMaintenanceStatus("已过期"); + } + } + // 服务类型 + String serviceType = basicdataPriceVO.getServiceType(); + if (StrUtil.isNotEmpty(serviceType)) { + List res = new ArrayList<>(); + List split = StrUtil.split(serviceType, ","); + for (String s : split) { + res.add(IDict.getTextByCode(ServiceTypeEnums.class, Convert.toInt(s))); + } + basicdataPriceVO.setServiceType(StrUtil.join("/", res)); + } + } + } + return page.setRecords(basicdataPriceVOS); + } + + + @Override + public List exportBasicdataPrice(Wrapper queryWrapper) { + List basicdataPriceList = baseMapper.exportBasicdataPrice(queryWrapper); + return basicdataPriceList; + } + + @Override + public Boolean basicUpdate(BasicdataPriceBasicUpdateVO vo) { + if (DateUtil.compare(vo.getEffectiveTime(), vo.getExpiryTime()) > 0) { + throw new ServiceException("生效时间大于到期时间，请检查。"); + } + // 如果是切换模版，则删除所有本价格相关的数据 + BasicdataPriceEntity entity = this.getById(vo.getId()); + if (ObjectUtil.isNotEmpty(entity)) { + Long templateId = entity.getTemplateId(); + if (!ObjectUtil.equal(templateId, vo.getTemplateId())) { + // 删除数据 + deleteByPriceId(vo.getId()); + log.info("价格体系：{} 切换模版删除数据", vo.getId()); + } + } + BasicdataPriceEntity basicdataPriceEntity = new BasicdataPriceEntity(); + basicdataPriceEntity.setId(vo.getId()); + basicdataPriceEntity.setTemplateId(vo.getTemplateId()); + basicdataPriceEntity.setEffectiveTime(vo.getEffectiveTime()); + basicdataPriceEntity.setExpiryTime(vo.getExpiryTime()); + basicdataPriceEntity.setMaintenanceStatus(2); + int res = this.baseMapper.updateById(basicdataPriceEntity); + return res > 0; + } + + private void deleteByPriceId(Long id) { + fullVehicleService.removeByPriceId(id); + categoryDispatchService.removeByPriceId(id); + categoryBasicService.removeByPriceId(id); + categoryWarehouseService.removeByPriceId(id); + generalService.removeByPriceId(id); + } + + @Override + @Transactional + public Boolean updatePrice(PriceVO vo) { + Long priceId = vo.getId(); + BasicdataPriceEntity priceEntity = this.baseMapper.selectById(priceId); + if (ObjectUtil.isEmpty(priceEntity)) { + throw new ServiceException("表单不存在，请检查参数"); + } + Long templateId = priceEntity.getTemplateId(); + if (ObjectUtil.isEmpty(templateId)) { + throw new ServiceException("模版为空，请检查"); + } + BasicdataPriceTemplateEntity templateEntity = templateService.getById(templateId); + if (ObjectUtil.isEmpty(templateEntity)) { + throw new ServiceException("模版不存在，请检查"); + } + Integer checkType = vo.getCheckType(); + String serviceType = templateEntity.getServiceType(); + if (!serviceType.contains(checkType.toString())) { + throw new ServiceException("模版中不存在当前修改的服务类型，请检查"); + } + // 获取服务类型枚举 + ServiceTypeEnums serviceTypeEnum = IDict.getByCode(ServiceTypeEnums.class, checkType); + BasicdataPriceEntity priceEntity1 = new BasicdataPriceEntity(); + priceEntity1.setId(priceEntity.getId()); + priceEntity1.setMaintenanceStatus(2); + switch (serviceTypeEnum) { + case PICK_UP: + buildPickup(vo.getPickup(), priceId, templateEntity); + break; + case TRUNK_LINE: + buildTrunkLine(vo.getTrunkLine(), priceId, templateEntity); + break; + case INSTALL: + break; + case WAREHOUSE: + buildWarehouse(vo.getWarehouse(), priceId, templateEntity); + break; + case DISPATCH: + buildDispatchCategory(vo.getDispatch(), priceEntity1, templateEntity); + break; + default: + throw new ServiceException("服务类型不存在，请检查"); + } + this.baseMapper.updateById(priceEntity1); + return Boolean.TRUE; + } + + @Override + public PriceVO detail(Long id) { + BasicdataPriceEntity priceEntity = this.getById(id); + if (ObjectUtil.isEmpty(priceEntity)) { + throw new ServiceException("表单不存在，请检查参数"); + } + Long templateId = priceEntity.getTemplateId(); + if (ObjectUtil.isEmpty(templateId)) { + throw new ServiceException("模版为空，请检查"); + } + BasicdataPriceTemplateEntity templateEntity = templateService.getById(templateId); + if (ObjectUtil.isEmpty(templateEntity)) { + throw new ServiceException("模版不存在，请检查"); + } + PriceVO vo = new PriceVO(); + vo.setId(priceEntity.getId()); + + String serviceType = templateEntity.getServiceType(); + + // 获取整车数据 + Map> fullMap = new HashMap<>(); + List list = fullVehicleService.list(Wrappers.lambdaQuery() + .eq(BasicdataPriceFullVehicleEntity::getBoId, priceEntity.getId())); + if (CollUtil.isNotEmpty(list)) { + // 按类型分组放到fullMap中 + list.forEach(item -> { + Integer type = item.getType(); + List collect = fullMap.get(type); + if (ObjectUtil.isEmpty(collect)) { + collect = new ArrayList<>(); + } + collect.add(item); + fullMap.put(type, collect); + }); + } + // 获取品类数据 + Map> basicMap = new HashMap<>(); + List basicList = categoryBasicService.list(Wrappers.lambdaQuery() + .eq(BasicdataPriceCategoryBasicEntity::getBoId, priceEntity.getId())); + if (CollUtil.isNotEmpty(basicList)) { + // 按类型分组放到basicMap中 + basicList.forEach(item -> { + Integer type = item.getServiceType(); + List collect = basicMap.get(type); + if (ObjectUtil.isEmpty(collect)) { + collect = new ArrayList<>(); + } + collect.add(item); + basicMap.put(type, collect); + }); + } + Map> warehouseMap = new HashMap<>(); + List warehouseList = categoryWarehouseService.list(Wrappers.lambdaQuery() + .eq(BasicdataPriceCategoryWarehouseEntity::getBoId, priceEntity.getId())); + if (CollUtil.isNotEmpty(warehouseList)) { + // 按类型分组放到warehouseMap中 + warehouseList.forEach(item -> { + Integer type = item.getCostType(); + List collect = warehouseMap.get(type); + if (ObjectUtil.isEmpty(collect)) { + collect = new ArrayList<>(); + } + collect.add(item); + warehouseMap.put(type, collect); + }); + } + Map> dispatchMap = new HashMap<>(); + List dispatchList = categoryDispatchService.list(Wrappers.lambdaQuery() + .eq(BasicdataPriceCategoryDispatchEntity::getBoId, priceEntity.getId())); + if (CollUtil.isNotEmpty(dispatchList)) { + // 按类型分组放到dispatchMap中 + dispatchList.forEach(item -> { + Integer type = item.getCostType(); + List collect = dispatchMap.get(type); + if (ObjectUtil.isEmpty(collect)) { + collect = new ArrayList<>(); + } + collect.add(item); + dispatchMap.put(type, collect); + }); + } + // 获取一般费用 + Map> generalMap = new HashMap<>(); + List generalList = generalService.list(Wrappers.lambdaQuery() + .eq(BasicdataPriceGeneralEntity::getBoId, priceEntity.getId())); + if (CollUtil.isNotEmpty(generalList)) { + // 按类型分组放到generalMap中 + generalList.forEach(item -> { + Integer type = item.getServiceType(); + List collect = generalMap.get(type); + if (ObjectUtil.isEmpty(collect)) { + collect = new ArrayList<>(); + } + collect.add(item); + generalMap.put(type, collect); + }); + } + if (serviceType.contains(ServiceTypeEnums.PICK_UP.getCode().toString())) { + vo.setPickup(initPickUp(priceEntity, templateEntity, fullMap.get(1), basicMap.get(1), generalMap.get(1))); + } + if (serviceType.contains(ServiceTypeEnums.TRUNK_LINE.getCode().toString())) { + vo.setTrunkLine(initTrunkLine(priceEntity, templateEntity, fullMap.get(2), basicMap.get(3), generalMap.get(3))); + } + if (serviceType.contains(ServiceTypeEnums.WAREHOUSE.getCode().toString())) { + vo.setWarehouse(initWarehouse(priceEntity, templateEntity, warehouseMap)); + } + if (serviceType.contains(ServiceTypeEnums.DISPATCH.getCode().toString())) { + vo.setDispatch(initDispatch(priceEntity, templateEntity, fullMap.get(3), dispatchMap, generalMap.get(5), generalMap.get(6))); + } + return vo; + } + + private PriceDispatchVO initDispatch(BasicdataPriceEntity priceEntity, BasicdataPriceTemplateEntity templateEntity, List fullVehicleEntities, Map> dispatchMap, List generalEntities, List generalEntities1) { + PriceDispatchVO priceDispatchVO = new PriceDispatchVO(); + String dispatchPricingType = templateEntity.getDispatchPricingType(); + //品类 + Map> categoryBasicMap = new HashMap<>(); + List dispatchEntities = dispatchMap.get(1); + if (CollUtil.isNotEmpty(dispatchEntities)) { + // 将数据放到categoryBasicMap中 + dispatchEntities.forEach(item -> { + Integer type = item.getServiceType(); + List collect = categoryBasicMap.get(type); + if (ObjectUtil.isEmpty(collect)) { + collect = new ArrayList<>(); + } + collect.add(item); + categoryBasicMap.put(type, collect); + }); + } + + //整车 + if (dispatchPricingType.contains(DispatchPricingTypeEnums.COMPLETE_VEHICLE.getCode().toString())) { + if (CollUtil.isNotEmpty(fullVehicleEntities)) { + List basicVOList = new ArrayList<>(); + fullVehicleEntities.forEach(item -> { + BasicdataPriceFullVehicleVO basicVO = new BasicdataPriceFullVehicleVO(); + BeanUtil.copyProperties(item, basicVO); + basicVOList.add(basicVO); + }); + priceDispatchVO.setFullVehicle(basicVOList); + } + } + // 按件 + if (dispatchPricingType.contains(DispatchPricingTypeEnums.PIECE.getCode().toString())) { + List basicVOList = new ArrayList<>(); + List basicEntities = categoryBasicMap.get(DispatchPricingTypeEnums.PIECE.getCode()); + if (CollUtil.isNotEmpty(basicEntities)) { + basicEntities.forEach(item -> { + PriceDispatchBasicVO basicVO = new PriceDispatchBasicVO(); + BeanUtil.copyProperties(item, basicVO); + basicVOList.add(basicVO); + }); + } + priceDispatchVO.setPieceCategory(basicVOList); + } + // 按重量 + if (dispatchPricingType.contains(DispatchPricingTypeEnums.WEIGHT.getCode().toString())) { + List basicVOList = new ArrayList<>(); + List basicEntities = categoryBasicMap.get(DispatchPricingTypeEnums.WEIGHT.getCode()); + if (CollUtil.isNotEmpty(basicEntities)) { + basicEntities.forEach(item -> { + PriceDispatchBasicVO basicVO = new PriceDispatchBasicVO(); + BeanUtil.copyProperties(item, basicVO); + basicVOList.add(basicVO); + }); + } + priceDispatchVO.setWeightCategory(basicVOList); + } + // 按方 + if (dispatchPricingType.contains(DispatchPricingTypeEnums.CUBE.getCode().toString())) { + List basicVOList = new ArrayList<>(); + List basicEntities = categoryBasicMap.get(DispatchPricingTypeEnums.CUBE.getCode()); + if (CollUtil.isNotEmpty(basicEntities)) { + basicEntities.forEach(item -> { + PriceDispatchBasicVO basicVO = new PriceDispatchBasicVO(); + BeanUtil.copyProperties(item, basicVO); + basicVOList.add(basicVO); + }); + } + priceDispatchVO.setCubeCategory(basicVOList); + } + // 按公里 + if (dispatchPricingType.contains(DispatchPricingTypeEnums.KILOMETER.getCode().toString())) { + List basicVOList = new ArrayList<>(); + List basicEntities = categoryBasicMap.get(DispatchPricingTypeEnums.KILOMETER.getCode()); + if (CollUtil.isNotEmpty(basicEntities)) { + basicEntities.forEach(item -> { + PriceDispatchBasicVO basicVO = new PriceDispatchBasicVO(); + BeanUtil.copyProperties(item, basicVO); + basicVOList.add(basicVO); + }); + } + priceDispatchVO.setKilometerCost(basicVOList); + } + // 按吨 + if (dispatchPricingType.contains(DispatchPricingTypeEnums.TON.getCode().toString())) { + List basicVOList = new ArrayList<>(); + List basicEntities = categoryBasicMap.get(DispatchPricingTypeEnums.TON.getCode()); + if (CollUtil.isNotEmpty(basicEntities)) { + basicEntities.forEach(item -> { + PriceDispatchBasicVO basicVO = new PriceDispatchBasicVO(); + BeanUtil.copyProperties(item, basicVO); + basicVOList.add(basicVO); + }); + } + priceDispatchVO.setTonCost(basicVOList); + } + //按吨公里 + if (dispatchPricingType.contains(DispatchPricingTypeEnums.TON_PER_KILOMETER.getCode().toString())) { + List basicVOList = new ArrayList<>(); + List basicEntities = categoryBasicMap.get(DispatchPricingTypeEnums.TON_PER_KILOMETER.getCode()); + if (CollUtil.isNotEmpty(basicEntities)) { + basicEntities.forEach(item -> { + PriceDispatchBasicVO basicVO = new PriceDispatchBasicVO(); + BeanUtil.copyProperties(item, basicVO); + basicVOList.add(basicVO); + }); + } + priceDispatchVO.setTonKilometerCost(basicVOList); + } + //附加费 + List dispatchEntities1 = dispatchMap.get(2); + if (CollUtil.isNotEmpty(dispatchEntities1)) { + List basicVOList = new ArrayList<>(); + dispatchEntities1.forEach(item -> { + PriceDispatchAdditionalVO basicVO = new PriceDispatchAdditionalVO(); + BeanUtil.copyProperties(item, basicVO); + basicVOList.add(basicVO); + }); + priceDispatchVO.setAdditionalCategory(basicVOList); + } + // 一般费用 generalEntities + if (CollUtil.isNotEmpty(generalEntities)) { + BasicdataPriceGeneralEntity generalEntity = generalEntities.get(0); + priceDispatchVO.setMinCost(generalEntity.getMinCost()); + priceDispatchVO.setAdditionalCost(generalEntity.getAdditionalCost()); + } + if (CollUtil.isNotEmpty(generalEntities1)) { + BasicdataPriceGeneralEntity generalEntity = generalEntities1.get(0); + priceDispatchVO.setLeaveBehindMinCost(generalEntity.getMinCost()); + priceDispatchVO.setLeaveBehindAdditionalCost(generalEntity.getAdditionalCost()); + } + // 设置基础费用 + priceDispatchVO.setDispatchUpwardJudgment(priceEntity.getDispatchUpwardJudgment()); + priceDispatchVO.setDispatchUpwardJudgmentCost(priceEntity.getDispatchUpwardJudgmentCost()); + priceDispatchVO.setDispatchStairsCarryingCharge(priceEntity.getDispatchStairsCarryingCharge()); + return priceDispatchVO; + } + + private PriceWarehouseVO initWarehouse(BasicdataPriceEntity priceEntity, BasicdataPriceTemplateEntity templateEntity, Map> warehouseMap) { + PriceWarehouseVO priceWarehouseVO = new PriceWarehouseVO(); + Integer warehousePricingType = templateEntity.getWarehousePricingType(); + Map> categoryBasicMap = new HashMap<>(); + List warehouseEntities = warehouseMap.get(1); + if (CollUtil.isNotEmpty(warehouseEntities)) { + warehouseEntities.forEach(item -> { + Integer type = item.getCostType(); + List collect = categoryBasicMap.get(type); + if (ObjectUtil.isEmpty(collect)) { + collect = new ArrayList<>(); + } + collect.add(item); + categoryBasicMap.put(type, collect); + }); + } + // 按件 + if (warehousePricingType.equals(WarehousePricingTypeEnums.PIECE.getCode())) { + List warehouseEntities1 = categoryBasicMap.get(WarehousePricingTypeEnums.PIECE.getCode()); + if (CollUtil.isNotEmpty(warehouseEntities1)) { + List basicVOS = warehouseEntities1.stream().map(item -> { + PriceWarehouseBasicVO basicVO = new PriceWarehouseBasicVO(); + BeanUtil.copyProperties(item, basicVO); + return basicVO; + }).collect(Collectors.toList()); + priceWarehouseVO.setCatergory(basicVOS); + } + } else if (warehousePricingType.equals(WarehousePricingTypeEnums.CUBE.getCode())) { + List warehouseEntities2 = categoryBasicMap.get(WarehousePricingTypeEnums.CUBE.getCode()); + if (CollUtil.isNotEmpty(warehouseEntities2)) { + List basicVOS = warehouseEntities2.stream().map(item -> { + PriceWarehouseBasicVO basicVO = new PriceWarehouseBasicVO(); + BeanUtil.copyProperties(item, basicVO); + return basicVO; + }).collect(Collectors.toList()); + priceWarehouseVO.setCatergory(basicVOS); + } + } else if (warehousePricingType.equals(WarehousePricingTypeEnums.WEIGHT.getCode())) { + List warehouseEntities3 = categoryBasicMap.get(WarehousePricingTypeEnums.WEIGHT.getCode()); + if (CollUtil.isNotEmpty(warehouseEntities3)) { + List basicVOS = warehouseEntities3.stream().map(item -> { + PriceWarehouseBasicVO basicVO = new PriceWarehouseBasicVO(); + BeanUtil.copyProperties(item, basicVO); + return basicVO; + }).collect(Collectors.toList()); + priceWarehouseVO.setCatergory(basicVOS); + } + } else if (warehousePricingType.equals(WarehousePricingTypeEnums.TONNE.getCode())) { + List warehouseEntities4 = categoryBasicMap.get(WarehousePricingTypeEnums.TONNE.getCode()); + if (CollUtil.isNotEmpty(warehouseEntities4)) { + List basicVOS = warehouseEntities4.stream().map(item -> { + PriceWarehouseBasicVO basicVO = new PriceWarehouseBasicVO(); + BeanUtil.copyProperties(item, basicVO); + return basicVO; + }).collect(Collectors.toList()); + priceWarehouseVO.setCatergory(basicVOS); + } + } + // 附加费 + List warehouseEntities1 = warehouseMap.get(2); + if (CollUtil.isNotEmpty(warehouseEntities1)) { + List additionalVOS = warehouseEntities1.stream().map(item -> { + PriceWarehouseAdditionalVO additionalVO = new PriceWarehouseAdditionalVO(); + BeanUtil.copyProperties(item, additionalVO); + return additionalVO; + }).collect(Collectors.toList()); + priceWarehouseVO.setAdditionalCategory(additionalVOS); + } + return priceWarehouseVO; + } + + private PriceTrunkLineVO initTrunkLine(BasicdataPriceEntity priceEntity, BasicdataPriceTemplateEntity templateEntity, List fullVehicleEntities, List categoryBasicEntities, List generalEntities) { + // 参考initPickUp编写 + PriceTrunkLineVO priceTrunkLineVO = new PriceTrunkLineVO(); + Map> categoryBasicMap = new HashMap<>(); + initCategoryBasicMap(categoryBasicEntities, categoryBasicMap); + // 设置整车 + String trunklinePricingType = templateEntity.getTrunklinePricingType(); + if (trunklinePricingType.contains(TrunkLinePricingTypeEnums.COMPLETE_VEHICLE.getCode().toString())) { + if (CollUtil.isNotEmpty(fullVehicleEntities)) { + List fullVehicleVOS = fullVehicleEntities.stream().map(item -> { + BasicdataPriceFullVehicleVO basicdataPriceFullVehicleVO = new BasicdataPriceFullVehicleVO(); + BeanUtil.copyProperties(item, basicdataPriceFullVehicleVO); + return basicdataPriceFullVehicleVO; + }).collect(Collectors.toList()); + priceTrunkLineVO.setFullVehicle(fullVehicleVOS); + } + } + // 设置按件 + if (trunklinePricingType.contains(TrunkLinePricingTypeEnums.PIECE.getCode().toString())) { + List categoryBasicEntityList = categoryBasicMap.get(TrunkLinePricingTypeEnums.PIECE.getCode()); + if (CollUtil.isNotEmpty(categoryBasicEntityList)) { + List pieceCategoryVOS = categoryBasicEntityList.stream().map(item -> { + PriceBasicVO priceBasicVO = new PriceBasicVO(); + BeanUtil.copyProperties(item, priceBasicVO); + return priceBasicVO; + }).collect(Collectors.toList()); + priceTrunkLineVO.setPieceCategory(pieceCategoryVOS); + } + } + // 设置按方 + if (trunklinePricingType.contains(TrunkLinePricingTypeEnums.CUBE.getCode().toString())) { + List categoryBasicEntityList = categoryBasicMap.get(TrunkLinePricingTypeEnums.CUBE.getCode()); + if (CollUtil.isNotEmpty(categoryBasicEntityList)) { + List cubeCategoryVOS = categoryBasicEntityList.stream().map(item -> { + PriceBasicVO priceBasicVO = new PriceBasicVO(); + BeanUtil.copyProperties(item, priceBasicVO); + return priceBasicVO; + }).collect(Collectors.toList()); + priceTrunkLineVO.setCubeCategory(cubeCategoryVOS); + } + } + // 设置重量 + if (trunklinePricingType.contains(TrunkLinePricingTypeEnums.WEIGHT.getCode().toString())) { + List categoryBasicEntityList = categoryBasicMap.get(TrunkLinePricingTypeEnums.WEIGHT.getCode()); + if (CollUtil.isNotEmpty(categoryBasicEntityList)) { + List weightCategoryVOS = categoryBasicEntityList.stream().map(item -> { + PriceBasicVO priceBasicVO = new PriceBasicVO(); + BeanUtil.copyProperties(item, priceBasicVO); + return priceBasicVO; + }).collect(Collectors.toList()); + priceTrunkLineVO.setWeightCategory(weightCategoryVOS); + } + } + Integer pickupIsMinCost = templateEntity.getPickupIsMinCost(); + if (ObjectUtil.equal(pickupIsMinCost, BooleanZeroOneEnums.YES.getCode())) { + // 设置最低计费 + if (CollUtil.isNotEmpty(generalEntities)) { + BasicdataPriceGeneralEntity generalEntity = generalEntities.get(0); + priceTrunkLineVO.setMinCost(generalEntity.getMinCost()); + priceTrunkLineVO.setAdditionalCost(generalEntity.getAdditionalCost()); + } + } + return priceTrunkLineVO; + } + + private PricePickupVO initPickUp(BasicdataPriceEntity priceEntity, BasicdataPriceTemplateEntity templateEntity, + List fullVehicleEntities, + List categoryBasicEntities, + List generalEntities) { + PricePickupVO pricePickupVO = new PricePickupVO(); + Map> categoryBasicMap = new HashMap<>(); + initCategoryBasicMap(categoryBasicEntities, categoryBasicMap); + // 设置整车 + // fullVehicleEntities转为BasicdataPriceFullVehicleVO + String pickupPricingType = templateEntity.getPickupPricingType(); + if (pickupPricingType.contains(PickupPricingTypeEnums.COMPLETE_VEHICLE.getCode().toString())) { + List fullVehicleVOS = fullVehicleEntities.stream().map(item -> { + BasicdataPriceFullVehicleVO basicdataPriceFullVehicleVO = new BasicdataPriceFullVehicleVO(); + BeanUtil.copyProperties(item, basicdataPriceFullVehicleVO); + return basicdataPriceFullVehicleVO; + }).collect(Collectors.toList()); + pricePickupVO.setFullVehicle(fullVehicleVOS); + } + // 按件 + if (pickupPricingType.contains(PickupPricingTypeEnums.PIECE.getCode().toString())) { + List categoryBasicEntityList = categoryBasicMap.get(PickupPricingTypeEnums.PIECE.getCode()); + if (CollUtil.isNotEmpty(categoryBasicEntityList)) { + List basicVOS = categoryBasicEntities.stream().map(item -> { + PriceBasicVO basicVO = new PriceBasicVO(); + BeanUtil.copyProperties(item, basicVO); + return basicVO; + }).collect(Collectors.toList()); + pricePickupVO.setPieceCategory(basicVOS); + } + } + // 按方 + if (pickupPricingType.contains(PickupPricingTypeEnums.CUBE.getCode().toString())) { + List categoryBasicEntityList = categoryBasicMap.get(PickupPricingTypeEnums.CUBE.getCode()); + if (CollUtil.isNotEmpty(categoryBasicEntityList)) { + List basicVOS = categoryBasicEntityList.stream().map(item -> { + PriceBasicVO basicVO = new PriceBasicVO(); + BeanUtil.copyProperties(item, basicVO); + return basicVO; + }).collect(Collectors.toList()); + pricePickupVO.setCubeCategory(basicVOS); + } + } + // 按重量 + if (pickupPricingType.contains(PickupPricingTypeEnums.WEIGHT.getCode().toString())) { + List categoryBasicEntityList = categoryBasicMap.get(PickupPricingTypeEnums.WEIGHT.getCode()); + if (CollUtil.isNotEmpty(categoryBasicEntityList)) { + List basicVOS = categoryBasicEntityList.stream().map(item -> { + PriceBasicVO basicVO = new PriceBasicVO(); + BeanUtil.copyProperties(item, basicVO); + return basicVO; + }).collect(Collectors.toList()); + pricePickupVO.setWeightCategory(basicVOS); + } + } + Integer pickupIsMinCost = templateEntity.getPickupIsMinCost(); + if (ObjectUtil.equal(pickupIsMinCost, BooleanZeroOneEnums.YES.getCode())) { + // 设置最低计费 + if (CollUtil.isNotEmpty(generalEntities)) { + BasicdataPriceGeneralEntity generalEntity = generalEntities.get(0); + pricePickupVO.setMinCost(generalEntity.getMinCost()); + pricePickupVO.setAdditionalCost(generalEntity.getAdditionalCost()); + } + } + return pricePickupVO; + } + + private void initCategoryBasicMap(List categoryBasicEntities, Map> categoryBasicMap) { + if (CollUtil.isNotEmpty(categoryBasicEntities)) { + categoryBasicEntities.forEach(item -> { + Integer type = item.getType(); + List collect = categoryBasicMap.get(type); + if (ObjectUtil.isEmpty(collect)) { + collect = new ArrayList<>(); + } + collect.add(item); + categoryBasicMap.put(type, collect); + }); + } + } + + private void buildDispatchCategory(PriceDispatchVO dispatch, BasicdataPriceEntity priceEntity, BasicdataPriceTemplateEntity templateEntity) { + if (ObjectUtil.isEmpty(dispatch)) { + throw new ServiceException("配送为空，请检查"); + } + String dispatchPricingType = templateEntity.getDispatchPricingType(); + if (StrUtil.isEmpty(dispatchPricingType)) { + throw new ServiceException("配送模板中计价方式为空，请检查"); + } + // 整车 + if (dispatchPricingType.contains(DispatchPricingTypeEnums.COMPLETE_VEHICLE.getCode().toString()) + && CollUtil.isNotEmpty(dispatch.getFullVehicle())) { + List fullVehicleEntities = new ArrayList<>(); + dispatch.getFullVehicle().forEach(fullVehicle -> { + buildFullVehicle(priceEntity.getId(), fullVehicleEntities, fullVehicle, FullVehicleTypeEnums.DISPATCH.getCode()); + }); + if (CollUtil.isNotEmpty(fullVehicleEntities)) { + fullVehicleService.saveOrUpdateBatch(fullVehicleEntities); + } + } + // 按件 + List categoryList = new ArrayList<>(); + if (dispatchPricingType.contains(DispatchPricingTypeEnums.PIECE.getCode().toString()) + && CollUtil.isNotEmpty(dispatch.getPieceCategory())) { + dispatch.getPieceCategory().forEach(category -> { + Integer type = DispatchPricingTypeEnums.PIECE.getCode(); + Integer costType = CostTypeEnums.NOMAL.getCode(); + buildDispatchCategory(priceEntity.getId(), categoryList, category, type, costType); + }); + } + // 按重量 + if (dispatchPricingType.contains(DispatchPricingTypeEnums.WEIGHT.getCode().toString()) + && CollUtil.isNotEmpty(dispatch.getWeightCategory())) { + dispatch.getWeightCategory().forEach(category -> { + Integer type = DispatchPricingTypeEnums.WEIGHT.getCode(); + Integer costType = CostTypeEnums.NOMAL.getCode(); + buildDispatchCategory(priceEntity.getId(), categoryList, category, type, costType); + }); + } + // 按方 + if (dispatchPricingType.contains(DispatchPricingTypeEnums.CUBE.getCode().toString()) + && CollUtil.isNotEmpty(dispatch.getCubeCategory())) { + dispatch.getCubeCategory().forEach(category -> { + Integer type = DispatchPricingTypeEnums.CUBE.getCode(); + Integer costType = CostTypeEnums.NOMAL.getCode(); + buildDispatchCategory(priceEntity.getId(), categoryList, category, type, costType); + }); + } + // 按吨公里 + if (dispatchPricingType.contains(DispatchPricingTypeEnums.TON_PER_KILOMETER.getCode().toString()) + && CollUtil.isNotEmpty(dispatch.getTonKilometerCost())) { + dispatch.getTonKilometerCost().forEach(category -> { + Integer type = DispatchPricingTypeEnums.TON_PER_KILOMETER.getCode(); + Integer costType = CostTypeEnums.NOMAL.getCode(); + buildDispatchCategory(priceEntity.getId(), categoryList, category, type, costType); + }); + } + // 按公里 + if (dispatchPricingType.contains(DispatchPricingTypeEnums.KILOMETER.getCode().toString()) + && CollUtil.isNotEmpty(dispatch.getKilometerCost())) { + dispatch.getKilometerCost().forEach(category -> { + Integer type = DispatchPricingTypeEnums.KILOMETER.getCode(); + Integer costType = CostTypeEnums.NOMAL.getCode(); + buildDispatchCategory(priceEntity.getId(), categoryList, category, type, costType); + }); + } + // 按吨 + if (dispatchPricingType.contains(DispatchPricingTypeEnums.TON.getCode().toString()) + && CollUtil.isNotEmpty(dispatch.getTonCost())) { + dispatch.getTonCost().forEach(category -> { + Integer type = DispatchPricingTypeEnums.TON.getCode(); + Integer costType = CostTypeEnums.NOMAL.getCode(); + buildDispatchCategory(priceEntity.getId(), categoryList, category, type, costType); + }); + } + // 附加费 + if (CollUtil.isNotEmpty(dispatch.getAdditionalCategory())) { + dispatch.getAdditionalCategory().forEach(category -> { + BasicdataPriceCategoryDispatchEntity categoryBasicEntity = new BasicdataPriceCategoryDispatchEntity(); + categoryBasicEntity.setBoId(priceEntity.getId()); + categoryBasicEntity.setPriceId(priceEntity.getId()); + categoryBasicEntity.setCategoryId(category.getCategoryId()); + categoryBasicEntity.setCostType(CostTypeEnums.ADD.getCode()); + categoryBasicEntity.setServiceType(1); + categoryBasicEntity.setSortPrice(category.getSortPrice()); + categoryBasicEntity.setHandlingPrice(category.getHandlingPrice()); + categoryBasicEntity.setRelocationPrice(category.getRelocationPrice()); + categoryBasicEntity.setUpstairsDeliveryPrice(category.getUpstairsDeliveryPrice()); + if (ObjectUtil.isNotEmpty(category.getId())) { + categoryBasicEntity.setId(category.getId()); + } + categoryList.add(categoryBasicEntity); + }); + } + if (CollUtil.isNotEmpty(categoryList)) { + categoryDispatchService.saveOrUpdateBatch(categoryList); + } + // 一般费用 + if (ObjectUtil.equal(templateEntity.getDispatchIsMinCost(), BooleanZeroOneEnums.YES.getCode()) && ObjectUtil.isNotEmpty(dispatch.getMinCost())) { + List priceGeneralEntities = new ArrayList<>(); + Integer code = GeneralServiceTypeEnums.DISPATCH.getCode(); + Double minCost = dispatch.getMinCost(); + Double additionalCost = dispatch.getAdditionalCost(); + biuldGeneral(priceEntity.getId(), code, minCost, additionalCost, priceGeneralEntities); + Integer leaveBehindCode = GeneralServiceTypeEnums.DISPATCH_LEAVE_BEHIND.getCode(); + Double leaveBehindMinCost = dispatch.getLeaveBehindMinCost(); + Double leaveBehindAdditionalCost = dispatch.getLeaveBehindAdditionalCost(); + biuldGeneral(priceEntity.getId(), leaveBehindCode, leaveBehindMinCost, leaveBehindAdditionalCost, priceGeneralEntities); + if (CollUtil.isNotEmpty(priceGeneralEntities)) { + generalService.saveOrUpdateBatch(priceGeneralEntities); + } + } + // 其他价格 + priceEntity.setDispatchUpwardJudgmentCost(dispatch.getDispatchUpwardJudgmentCost()); + priceEntity.setDispatchUpwardJudgment(dispatch.getDispatchUpwardJudgment()); + priceEntity.setDispatchStairsCarryingCharge(dispatch.getDispatchStairsCarryingCharge()); + } + + private void buildDispatchCategory(Long priceId, List categoryList, com.logpm.basicdata.vo.PriceDispatchBasicVO category, Integer type, Integer costType) { + BasicdataPriceCategoryDispatchEntity categoryBasicEntity = new BasicdataPriceCategoryDispatchEntity(); + categoryBasicEntity.setBoId(priceId); + categoryBasicEntity.setPriceId(priceId); + categoryBasicEntity.setCategoryId(category.getCategoryId()); + categoryBasicEntity.setType(type); + categoryBasicEntity.setCostType(costType); + categoryBasicEntity.setServiceType(1); + categoryBasicEntity.setPrice(category.getPrice()); + categoryBasicEntity.setLeaveBehindPrice(category.getLeaveBehindPrice()); + if (ObjectUtil.isNotEmpty(category.getId())) { + categoryBasicEntity.setId(category.getId()); + } + categoryList.add(categoryBasicEntity); + } + + private void buildWarehouse(PriceWarehouseVO warehouse, Long priceId, BasicdataPriceTemplateEntity templateEntity) { + if (ObjectUtil.isEmpty(warehouse)) { + throw new ServiceException("仓储为空，请检查"); + } + // 按品类 + Integer warehousePricingType = templateEntity.getWarehousePricingType(); + List categoryList = new ArrayList<>(); + if (CollUtil.isNotEmpty(warehouse.getCatergory())) { + warehouse.getCatergory().forEach(category -> { + BasicdataPriceCategoryWarehouseEntity categoryBasicEntity = new BasicdataPriceCategoryWarehouseEntity(); + categoryBasicEntity.setBoId(priceId); + categoryBasicEntity.setPriceId(priceId); + categoryBasicEntity.setCategoryId(category.getCategoryId()); + categoryBasicEntity.setType(warehousePricingType); + categoryBasicEntity.setCostType(CostTypeEnums.NOMAL.getCode()); + categoryBasicEntity.setServiceType(1); + categoryBasicEntity.setWithinThirtyPrice(category.getWithinThirtyPrice()); + categoryBasicEntity.setBetweenThirtySixtyPrice(category.getBetweenThirtySixtyPrice()); + categoryBasicEntity.setBeyondSixtyPrice(category.getBeyondSixtyPrice()); + categoryBasicEntity.setMaximumPrice(category.getMaximumPrice()); + if (ObjectUtil.isNotEmpty(category.getId())) { + categoryBasicEntity.setId(category.getId()); + } + categoryList.add(categoryBasicEntity); + }); + } + List additionalCategory = warehouse.getAdditionalCategory(); + if (CollUtil.isNotEmpty(additionalCategory)) { + additionalCategory.forEach(category -> { + BasicdataPriceCategoryWarehouseEntity categoryBasicEntity = new BasicdataPriceCategoryWarehouseEntity(); + categoryBasicEntity.setBoId(priceId); + categoryBasicEntity.setPriceId(priceId); + categoryBasicEntity.setCategoryId(category.getCategoryId()); + categoryBasicEntity.setType(warehousePricingType); + categoryBasicEntity.setCostType(CostTypeEnums.ADD.getCode()); + categoryBasicEntity.setServiceType(1); + categoryBasicEntity.setWarehouseSortPrice(category.getWarehouseSortPrice()); + categoryBasicEntity.setWarehouseManagementPrice(category.getWarehouseManagementPrice()); + categoryBasicEntity.setOperatePrice(category.getOperatePrice()); + if (ObjectUtil.isNotEmpty(category.getId())) { + categoryBasicEntity.setId(category.getId()); + } + categoryList.add(categoryBasicEntity); + }); + } + if (CollUtil.isNotEmpty(categoryList)) { + categoryWarehouseService.saveOrUpdateBatch(categoryList); + } + } + + private void buildTrunkLine(PriceTrunkLineVO trunkLine, Long priceId, BasicdataPriceTemplateEntity templateEntity) { + if (ObjectUtil.isEmpty(trunkLine)) { + throw new ServiceException("干线为空，请检查"); + } + String trunkLinePricingType = templateEntity.getTrunklinePricingType(); + if (trunkLinePricingType.contains(TrunkLinePricingTypeEnums.COMPLETE_VEHICLE.getCode().toString()) && CollUtil.isNotEmpty(trunkLine.getFullVehicle())) { + List fullVehicleEntities = new ArrayList<>(); + trunkLine.getFullVehicle().forEach(fullVehicle -> { + buildFullVehicle(priceId, fullVehicleEntities, fullVehicle, FullVehicleTypeEnums.TRUNK_LINE.getCode()); + }); + if (CollUtil.isNotEmpty(fullVehicleEntities)) { + fullVehicleService.saveOrUpdateBatch(fullVehicleEntities); + } + } + List categoryEntities = new ArrayList<>(); + // 按件品类计费 + if (trunkLinePricingType.contains(TrunkLinePricingTypeEnums.PIECE.getCode().toString()) + && CollUtil.isNotEmpty(trunkLine.getPieceCategory())) { + trunkLine.getPieceCategory().forEach(pieceCategory -> { + buildCategory(priceId, categoryEntities, pieceCategory, TrunkLinePricingTypeEnums.PIECE.getCode(), 3); + }); + + } + // 按方品类计费 + if (trunkLinePricingType.contains(TrunkLinePricingTypeEnums.CUBE.getCode().toString()) + && CollUtil.isNotEmpty(trunkLine.getCubeCategory())) { + trunkLine.getCubeCategory().forEach(cubeCategory -> { + buildCategory(priceId, categoryEntities, cubeCategory, TrunkLinePricingTypeEnums.CUBE.getCode(), 3); + }); + } + // 按重量品类计费 + if (trunkLinePricingType.contains(TrunkLinePricingTypeEnums.WEIGHT.getCode().toString()) + && CollUtil.isNotEmpty(trunkLine.getWeightCategory())) { + trunkLine.getWeightCategory().forEach(cubeCategory -> { + buildCategory(priceId, categoryEntities, cubeCategory, TrunkLinePricingTypeEnums.WEIGHT.getCode(), 3); + }); + } + if (CollUtil.isNotEmpty(categoryEntities)) { + categoryBasicService.saveOrUpdateBatch(categoryEntities); + } + if (ObjectUtil.equal(templateEntity.getTrunklineIsMinCost(), BooleanZeroOneEnums.YES.getCode()) && ObjectUtil.isNotEmpty(trunkLine.getMinCost())) { + List priceGeneralEntities = new ArrayList<>(); + Integer code = GeneralServiceTypeEnums.TRUNK_LINE.getCode(); + Double minCost = trunkLine.getMinCost(); + Double additionalCost = trunkLine.getAdditionalCost(); + biuldGeneral(priceId, code, minCost, additionalCost, priceGeneralEntities); + generalService.saveOrUpdateBatch(priceGeneralEntities); + } + + } + + private void biuldGeneral(Long priceId, Integer code, Double minCost, Double additionalCost, List generalList) { + // 1 最低计费一个价格体系一个服务类型只存在一条 + BasicdataPriceGeneralEntity generalEntity = generalService.getOne(Wrappers.lambdaQuery() + .eq(BasicdataPriceGeneralEntity::getBoId, priceId) + .eq(BasicdataPriceGeneralEntity::getServiceType, code) + ); + if (ObjectUtil.isEmpty(generalEntity)) { + generalEntity = new BasicdataPriceGeneralEntity(); + generalEntity.setBoId(priceId); + generalEntity.setServiceType(code); + } + generalEntity.setPriceId(priceId); + // 设置最低计费和加算价格 + generalEntity.setMinCost(minCost); + generalEntity.setAdditionalCost(additionalCost); + generalList.add(generalEntity); + + } + + private void buildPickup(PricePickupVO pickup, Long priceId, BasicdataPriceTemplateEntity templateEntity) { + if (ObjectUtil.isEmpty(pickup)) { + throw new ServiceException("提货为空，请检查"); + } + String pickupPricingType = templateEntity.getPickupPricingType(); + // 整车 + if (pickupPricingType.contains(PickupPricingTypeEnums.COMPLETE_VEHICLE.getCode().toString()) + && CollUtil.isNotEmpty(pickup.getFullVehicle())) { + List fullVehicleEntities = new ArrayList<>(); + pickup.getFullVehicle().forEach(fullVehicle -> { + buildFullVehicle(priceId, fullVehicleEntities, fullVehicle, FullVehicleTypeEnums.PICK_UP.getCode()); + }); + if (CollUtil.isNotEmpty(fullVehicleEntities)) { + fullVehicleService.saveOrUpdateBatch(fullVehicleEntities); + } + } + List categoryEntities = new ArrayList<>(); + // 按件品类计费 + if (pickupPricingType.contains(PickupPricingTypeEnums.PIECE.getCode().toString()) + && CollUtil.isNotEmpty(pickup.getPieceCategory())) { + pickup.getPieceCategory().forEach(pieceCategory -> { + buildCategory(priceId, categoryEntities, pieceCategory, PickupPricingTypeEnums.PIECE.getCode(), 1); + }); + + } + // 按方品类计费 + if (pickupPricingType.contains(PickupPricingTypeEnums.CUBE.getCode().toString()) + && CollUtil.isNotEmpty(pickup.getCubeCategory())) { + pickup.getCubeCategory().forEach(cubeCategory -> { + buildCategory(priceId, categoryEntities, cubeCategory, PickupPricingTypeEnums.CUBE.getCode(), 1); + }); + } + // 按重量品类计费 + if (pickupPricingType.contains(PickupPricingTypeEnums.WEIGHT.getCode().toString()) + && CollUtil.isNotEmpty(pickup.getWeightCategory())) { + pickup.getWeightCategory().forEach(cubeCategory -> { + buildCategory(priceId, categoryEntities, cubeCategory, PickupPricingTypeEnums.WEIGHT.getCode(), 1); + }); + } + if (CollUtil.isNotEmpty(categoryEntities)) { + categoryBasicService.saveOrUpdateBatch(categoryEntities); + } + // 最低计费 + if (ObjectUtil.equal(templateEntity.getPickupIsMinCost(), BooleanZeroOneEnums.YES.getCode()) + && ObjectUtil.isNotEmpty(pickup.getMinCost())) { + List priceGeneralEntities = new ArrayList<>(); + biuldGeneral(priceId, GeneralServiceTypeEnums.PICK_UP.getCode(), pickup.getMinCost(), pickup.getAdditionalCost(), priceGeneralEntities); + generalService.saveOrUpdateBatch(priceGeneralEntities); + } + } + + private void buildFullVehicle(Long priceId, List fullVehicleEntities, BasicdataPriceFullVehicleVO fullVehicle, Integer type) { + BasicdataPriceFullVehicleEntity basicdataPriceFullVehicleEntity = new BasicdataPriceFullVehicleEntity(); + basicdataPriceFullVehicleEntity.setPrice(fullVehicle.getPrice()); + basicdataPriceFullVehicleEntity.setVehicleType(fullVehicle.getVehicleType()); + basicdataPriceFullVehicleEntity.setPriceId(priceId); + if (ObjectUtil.isEmpty(fullVehicle.getId())) { + basicdataPriceFullVehicleEntity.setBoId(priceId); + basicdataPriceFullVehicleEntity.setType(type); + } else { + basicdataPriceFullVehicleEntity.setId(fullVehicle.getId()); + } + fullVehicleEntities.add(basicdataPriceFullVehicleEntity); + } + + private void buildCategory(Long priceId, List cubeCategoryEntities, PriceBasicVO cubeCategory, Integer type, Integer serviceType) { + BasicdataPriceCategoryBasicEntity categoryEntity = new BasicdataPriceCategoryBasicEntity(); + Long id = cubeCategory.getId(); + if (ObjectUtil.isEmpty(id)) { + categoryEntity.setBoId(priceId); + categoryEntity.setType(type); + categoryEntity.setServiceType(serviceType); + } else { + categoryEntity.setId(id); + } + categoryEntity.setPriceId(priceId); + categoryEntity.setPrice(cubeCategory.getPrice()); + categoryEntity.setCategoryId(cubeCategory.getCategoryId()); + cubeCategoryEntities.add(categoryEntity); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java new file mode 100644 index 000000000..92ed8d11e --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java @@ -0,0 +1,437 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.entity.BasicdataBrandEntity; +import com.logpm.basicdata.entity.BasicdataPriceTemplateEntity; +import com.logpm.basicdata.enums.ServiceTypeEnums; +import com.logpm.basicdata.excel.BasicdataPriceTemplateExcel; +import com.logpm.basicdata.mapper.BasicdataPriceTemplateMapper; +import com.logpm.basicdata.service.IBasicdataBrandService; +import com.logpm.basicdata.service.IBasicdataCategoryService; +import com.logpm.basicdata.service.IBasicdataPriceTemplateService; +import com.logpm.basicdata.vo.BasicdataPriceTemplateVO; +import com.logpm.basicdata.vo.PriceCategoryVO; +import com.logpm.basicdata.wrapper.BasicdataPriceTemplateWrapper; +import lombok.AllArgsConstructor; +import org.springblade.common.constant.HttpConstants; +import org.springblade.common.model.IDict; +import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; +import org.springblade.system.entity.User; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 基础价格模板表 服务实现类 + * + * @author zqb + * @since 2024-04-01 + */ +@AllArgsConstructor +@Service +public class BasicdataPriceTemplateServiceImpl extends BaseServiceImpl implements IBasicdataPriceTemplateService { + + private final IUserClient userClient; + private final IBasicdataCategoryService categoryService; + private final IBasicdataBrandService brandService; + + @Override + public IPage selectBasicdataPriceTemplatePage(IPage page, BasicdataPriceTemplateVO basicdataPriceTemplate) { + List records = baseMapper.selectBasicdataPriceTemplatePage(page, basicdataPriceTemplate); + if (CollUtil.isNotEmpty(records)) { + List userIds = records.stream().map(BasicdataPriceTemplateVO::getCreateUser).collect(Collectors.toList()); + List brandIds = records.stream().map(BasicdataPriceTemplateVO::getBrandId).collect(Collectors.toList()); + List basicdataBrandEntities = brandService.listByIds(brandIds); + Map brandNameMap = new HashMap<>(); + if (CollUtil.isNotEmpty(basicdataBrandEntities)) { + brandNameMap = basicdataBrandEntities.stream().collect(Collectors.toMap(BasicdataBrandEntity::getId, BasicdataBrandEntity::getBrandName)); + } + R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), userIds.stream().map(Object::toString).collect(Collectors.joining(","))); + Map names = new HashMap<>(); + Map accounts = new HashMap<>(); + if (ObjectUtil.equal(HttpConstants.HTTP.HTTP_RESOURCE_CODE.SUCCESS_CODE, listR.getCode())) { + names = listR.getData().stream().collect(Collectors.toMap(User::getId, User::getName)); + accounts = listR.getData().stream().collect(Collectors.toMap(User::getId, User::getAccount)); + } + for (BasicdataPriceTemplateVO record : records) { + Long createUser = record.getCreateUser(); + if (ObjectUtil.equal(accounts.get(createUser), "admin")) { + record.setTemplateType("系统"); + } else { + record.setTemplateType("用户"); + } + record.setUserName(names.get(createUser)); + if (brandNameMap.containsKey(record.getBrandId())) { + record.setBrandName(brandNameMap.get(record.getBrandId())); + } + String serviceType = record.getServiceType(); + if (StrUtil.isNotEmpty(serviceType)) { + StringBuilder sb = new StringBuilder(); + List split = StrUtil.split(serviceType, ","); + for (String s : split) { + sb.append(IDict.getTextByCode(ServiceTypeEnums.class, Convert.toInt(s))).append("/"); + } + String s = sb.toString(); + record.setServiceType(s.substring(0, s.length() - 1)); + } + } + + } + return page.setRecords(records); + } + + @Override + public List exportBasicdataPriceTemplate(Wrapper queryWrapper) { + List basicdataPriceTemplateList = baseMapper.exportBasicdataPriceTemplate(queryWrapper); + //basicdataPriceTemplateList.forEach(basicdataPriceTemplate -> { + // basicdataPriceTemplate.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataPriceTemplate.getType())); + //}); + return basicdataPriceTemplateList; + } + + @Override + public Boolean updateByCheckType(BasicdataPriceTemplateVO basicdataPriceTemplate) { + Integer checkType = basicdataPriceTemplate.getCheckType(); + if (ObjectUtil.isEmpty(checkType)) { + throw new ServiceException("参数缺失，缺少当前选择的服务类型"); + } + if (ObjectUtil.isEmpty(basicdataPriceTemplate.getId())) { + throw new ServiceException("修改时，id不能为空"); + } + checkParam(basicdataPriceTemplate); + BasicdataPriceTemplateEntity priceTemplateEntity = new BasicdataPriceTemplateEntity(); + priceTemplateEntity.setId(basicdataPriceTemplate.getId()); + priceTemplateEntity.setServiceType(basicdataPriceTemplate.getServiceType()); + priceTemplateEntity.setName(basicdataPriceTemplate.getName()); + priceTemplateEntity.setBrandId(basicdataPriceTemplate.getBrandId()); + ServiceTypeEnums currentDict = IDict.getByCode(ServiceTypeEnums.class, checkType); + switch (currentDict) { + case PICK_UP: + String pickupPricingType = basicdataPriceTemplate.getPickupPricingType(); + if (StrUtil.isEmpty(pickupPricingType)) { + throw new ServiceException("请选择提货计价方式"); + } + priceTemplateEntity.setPickupPricingType(basicdataPriceTemplate.getPickupPricingType()); + priceTemplateEntity.setPickupIsByCategory(basicdataPriceTemplate.getPickupIsByCategory()); + priceTemplateEntity.setPickupPieceCategory(basicdataPriceTemplate.getPickupPieceCategory()); + priceTemplateEntity.setPickupCubeCategory(basicdataPriceTemplate.getPickupCubeCategory()); + priceTemplateEntity.setPickupWeightCategory(basicdataPriceTemplate.getPickupWeightCategory()); + priceTemplateEntity.setPickupIsMinCost(basicdataPriceTemplate.getPickupIsMinCost()); + priceTemplateEntity.setPickupMinCostType(basicdataPriceTemplate.getPickupMinCostType()); + break; + case TRUNK_LINE: + String trunklinePricingType = basicdataPriceTemplate.getTrunklinePricingType(); + if (StrUtil.isEmpty(trunklinePricingType)) { + throw new ServiceException("请选择干线计价方式"); + } + priceTemplateEntity.setTrunklinePricingType(basicdataPriceTemplate.getTrunklinePricingType()); + priceTemplateEntity.setTrunklineIsUnifyAreaBill(basicdataPriceTemplate.getTrunklineIsUnifyAreaBill()); + priceTemplateEntity.setTrunklineIsByCategory(basicdataPriceTemplate.getTrunklineIsByCategory()); + priceTemplateEntity.setTrunklinePieceCategory(basicdataPriceTemplate.getTrunklinePieceCategory()); + priceTemplateEntity.setTrunklineCubeCategory(basicdataPriceTemplate.getTrunklineCubeCategory()); + priceTemplateEntity.setTrunklineWeightCategory(basicdataPriceTemplate.getTrunklineWeightCategory()); + priceTemplateEntity.setTrunklineIsPeculiarSetup(basicdataPriceTemplate.getTrunklineIsPeculiarSetup()); + priceTemplateEntity.setTrunklineIsMinCost(basicdataPriceTemplate.getTrunklineIsMinCost()); + priceTemplateEntity.setTrunklineMinCostType(basicdataPriceTemplate.getTrunklineMinCostType()); + break; + case WAREHOUSE: + Integer warehousePricingType = basicdataPriceTemplate.getWarehousePricingType(); + if (ObjectUtil.isEmpty(warehousePricingType)) { + throw new ServiceException("请选择仓储计价方式"); + } + priceTemplateEntity.setWarehousePricingType(basicdataPriceTemplate.getWarehousePricingType()); + priceTemplateEntity.setWarehousePricingMode(basicdataPriceTemplate.getWarehousePricingMode()); + priceTemplateEntity.setWarehouseCalculationBasis(basicdataPriceTemplate.getWarehouseCalculationBasis()); + priceTemplateEntity.setWarehouseIsByCategory(basicdataPriceTemplate.getWarehouseIsByCategory()); + priceTemplateEntity.setWarehousePieceCategory(basicdataPriceTemplate.getWarehousePieceCategory()); + priceTemplateEntity.setWarehouseSubjoinFeeUnit(basicdataPriceTemplate.getWarehouseSubjoinFeeUnit()); + priceTemplateEntity.setWarehouseIsManageFee(basicdataPriceTemplate.getWarehouseIsManageFee()); + priceTemplateEntity.setWarehouseIsOperateFee(basicdataPriceTemplate.getWarehouseIsOperateFee()); + priceTemplateEntity.setWarehouseIsSortFee(basicdataPriceTemplate.getWarehouseIsSortFee()); + priceTemplateEntity.setWarehouseIsCategorySubjoin(basicdataPriceTemplate.getWarehouseIsCategorySubjoin()); + priceTemplateEntity.setWarehouseSubjoinCategory(basicdataPriceTemplate.getWarehouseSubjoinCategory()); + break; + case DISPATCH: + String dispatchPricingType = basicdataPriceTemplate.getDispatchPricingType(); + if (StrUtil.isEmpty(dispatchPricingType)) { + throw new ServiceException("请选择配送计价方式"); + } + priceTemplateEntity.setDispatchServiceType(basicdataPriceTemplate.getDispatchServiceType()); + priceTemplateEntity.setDispatchPricingType(basicdataPriceTemplate.getDispatchPricingType()); + priceTemplateEntity.setDispatchIsByCategory(basicdataPriceTemplate.getDispatchIsByCategory()); + priceTemplateEntity.setDispatchIsLeaveBehind(basicdataPriceTemplate.getDispatchIsLeaveBehind()); + priceTemplateEntity.setDispatchPieceCategory(basicdataPriceTemplate.getDispatchPieceCategory()); + priceTemplateEntity.setDispatchCubeCategory(basicdataPriceTemplate.getDispatchCubeCategory()); + priceTemplateEntity.setDispatchWeightCategory(basicdataPriceTemplate.getDispatchWeightCategory()); + priceTemplateEntity.setDispatchIsCategorySubjoin(basicdataPriceTemplate.getDispatchIsCategorySubjoin()); + priceTemplateEntity.setDispatchIsSortFee(basicdataPriceTemplate.getDispatchIsSortFee()); + priceTemplateEntity.setDispatchIsOperateFee(basicdataPriceTemplate.getDispatchIsOperateFee()); + priceTemplateEntity.setDispatchIsStairsCarryingCharge(basicdataPriceTemplate.getDispatchIsStairsCarryingCharge()); + priceTemplateEntity.setDispatchIsFeeFloor(basicdataPriceTemplate.getDispatchIsFeeFloor()); + priceTemplateEntity.setDispatchIsShiftingCharge(basicdataPriceTemplate.getDispatchIsShiftingCharge()); + priceTemplateEntity.setDispatchSubjoinCategory(basicdataPriceTemplate.getDispatchSubjoinCategory()); + priceTemplateEntity.setDispatchIsMinCost(basicdataPriceTemplate.getDispatchIsMinCost()); + priceTemplateEntity.setDispatchMinCostMode(basicdataPriceTemplate.getDispatchMinCostMode()); + priceTemplateEntity.setDispatchMinCostType(basicdataPriceTemplate.getDispatchMinCostType()); + priceTemplateEntity.setDispatchIsUpwardJudgment(basicdataPriceTemplate.getDispatchIsUpwardJudgment()); + break; + case INSTALL: + break; + default: + throw new ServiceException("当前选择的类型不存在"); + } + + this.baseMapper.updateById(priceTemplateEntity); + return Boolean.TRUE; + } + + @Override + public BasicdataPriceTemplateVO detail(Long id) { + BasicdataPriceTemplateEntity detail = this.getById(id); + BasicdataPriceTemplateVO basicdataPriceTemplateVO = null; + if (ObjectUtil.isNotEmpty(detail)) { + basicdataPriceTemplateVO = BasicdataPriceTemplateWrapper.build().entityVO(detail); + } + Set categoryIds = new HashSet<>(); + biuldCategory(categoryIds, basicdataPriceTemplateVO); + return basicdataPriceTemplateVO; + } + + @Override + public Long saveTemplate(BasicdataPriceTemplateEntity basicdataPriceTemplate) { + checkParam(basicdataPriceTemplate); + this.save(basicdataPriceTemplate); + return basicdataPriceTemplate.getId(); + } + + @Override + public Boolean clearDataByServiceType(Long templateId, Integer checkType) { + // 更新服务类型 + BasicdataPriceTemplateEntity templateEntity = this.getById(templateId); + if (ObjectUtil.isEmpty(templateEntity)) { + throw new ServiceException("模版不存在，请检查"); + } + String serviceType = templateEntity.getServiceType(); + if (StrUtil.isNotEmpty(serviceType)) { + List types = CollUtil.newArrayList(serviceType.split(",")); + List collect = types.stream().filter(type -> !ObjectUtil.equal(type, checkType)).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(collect)) { + templateEntity.setServiceType(StrUtil.join(",", collect)); + } + } + // 清空指定类型的数据 + ServiceTypeEnums currentDict = IDict.getByCode(ServiceTypeEnums.class, checkType); + switch (currentDict) { + case PICK_UP: + templateEntity.setPickupPricingType(null); + templateEntity.setPickupIsByCategory(null); + templateEntity.setPickupPieceCategory(null); + templateEntity.setPickupCubeCategory(null); + templateEntity.setPickupWeightCategory(null); + templateEntity.setPickupIsMinCost(null); + templateEntity.setPickupMinCostType(null); + break; + case TRUNK_LINE: + templateEntity.setTrunklinePricingType(null); + templateEntity.setTrunklineIsUnifyAreaBill(null); + templateEntity.setTrunklineIsByCategory(null); + templateEntity.setTrunklinePieceCategory(null); + templateEntity.setTrunklineCubeCategory(null); + templateEntity.setTrunklineWeightCategory(null); + templateEntity.setTrunklineIsPeculiarSetup(null); + templateEntity.setTrunklineIsMinCost(null); + templateEntity.setTrunklineMinCostType(null); + break; + case WAREHOUSE: + templateEntity.setWarehousePricingType(null); + templateEntity.setWarehousePricingMode(null); + templateEntity.setWarehouseCalculationBasis(null); + templateEntity.setWarehouseIsByCategory(null); + templateEntity.setWarehousePieceCategory(null); + templateEntity.setWarehouseSubjoinFeeUnit(null); + templateEntity.setWarehouseIsManageFee(null); + templateEntity.setWarehouseIsOperateFee(null); + templateEntity.setWarehouseIsSortFee(null); + templateEntity.setWarehouseIsCategorySubjoin(null); + templateEntity.setWarehouseSubjoinCategory(null); + break; + case DISPATCH: + templateEntity.setDispatchServiceType(null); + templateEntity.setDispatchPricingType(null); + templateEntity.setDispatchIsByCategory(null); + templateEntity.setDispatchIsLeaveBehind(null); + templateEntity.setDispatchPieceCategory(null); + templateEntity.setDispatchCubeCategory(null); + templateEntity.setDispatchWeightCategory(null); + templateEntity.setDispatchIsCategorySubjoin(null); + templateEntity.setDispatchIsSortFee(null); + templateEntity.setDispatchIsOperateFee(null); + templateEntity.setDispatchIsStairsCarryingCharge(null); + templateEntity.setDispatchIsFeeFloor(null); + templateEntity.setDispatchIsShiftingCharge(null); + templateEntity.setDispatchSubjoinCategory(null); + templateEntity.setDispatchIsMinCost(null); + templateEntity.setDispatchMinCostMode(null); + templateEntity.setDispatchMinCostType(null); + templateEntity.setDispatchIsUpwardJudgment(null); + break; + case INSTALL: + break; + default: + throw new ServiceException("当前选择的类型不存在"); + } + this.saveOrUpdate(templateEntity); + return Boolean.TRUE; + } + + private void checkParam(BasicdataPriceTemplateEntity basicdataPriceTemplate) { + checkDataHasDuplicates(basicdataPriceTemplate.getPickupCubeCategory()); + checkDataHasDuplicates(basicdataPriceTemplate.getPickupPieceCategory()); + checkDataHasDuplicates(basicdataPriceTemplate.getPickupWeightCategory()); + checkDataHasDuplicates(basicdataPriceTemplate.getTrunklineCubeCategory()); + checkDataHasDuplicates(basicdataPriceTemplate.getTrunklinePieceCategory()); + checkDataHasDuplicates(basicdataPriceTemplate.getTrunklineWeightCategory()); + checkDataHasDuplicates(basicdataPriceTemplate.getWarehousePieceCategory()); + checkDataHasDuplicates(basicdataPriceTemplate.getWarehouseSubjoinCategory()); + checkDataHasDuplicates(basicdataPriceTemplate.getDispatchCubeCategory()); + checkDataHasDuplicates(basicdataPriceTemplate.getDispatchPieceCategory()); + checkDataHasDuplicates(basicdataPriceTemplate.getDispatchWeightCategory()); + checkDataHasDuplicates(basicdataPriceTemplate.getDispatchSubjoinCategory()); + } + + private void checkDataHasDuplicates(String pickupCubeCategory) { + if (StrUtil.isNotEmpty(pickupCubeCategory)) { + if (hasDuplicates(Arrays.asList(pickupCubeCategory.split(",")))) { + throw new ServiceException("品类存在重复数据，请检查"); + } + } + } + + private boolean hasDuplicates(Collection collection) { + return collection.stream() + .collect(Collectors.toMap(Function.identity(), v -> true, (existing, replacement) -> existing, HashMap::new)) + .size() != collection.size(); + } + + private void biuldCategory(Set categoryIds, BasicdataPriceTemplateVO basicdataPriceTemplateVO) { + // 提货 + String pickupCubeCategory = basicdataPriceTemplateVO.getPickupCubeCategory(); + initCategoryIds(categoryIds, pickupCubeCategory); + String pickupPieceCategory = basicdataPriceTemplateVO.getPickupPieceCategory(); + initCategoryIds(categoryIds, pickupPieceCategory); + String pickupWeightCategory = basicdataPriceTemplateVO.getPickupWeightCategory(); + initCategoryIds(categoryIds, pickupWeightCategory); + // 干线 + String trunklineCubeCategory = basicdataPriceTemplateVO.getTrunklineCubeCategory(); + initCategoryIds(categoryIds, trunklineCubeCategory); + String trunklinePieceCategory = basicdataPriceTemplateVO.getTrunklinePieceCategory(); + initCategoryIds(categoryIds, trunklinePieceCategory); + String trunklineWeightCategory = basicdataPriceTemplateVO.getTrunklineWeightCategory(); + initCategoryIds(categoryIds, trunklineWeightCategory); + // 仓储 + String warehousePieceCategory = basicdataPriceTemplateVO.getWarehousePieceCategory(); + initCategoryIds(categoryIds, warehousePieceCategory); + String warehouseSubjoinCategory = basicdataPriceTemplateVO.getWarehouseSubjoinCategory(); + initCategoryIds(categoryIds, warehouseSubjoinCategory); + // 配送 + String dispatchCubeCategory = basicdataPriceTemplateVO.getDispatchCubeCategory(); + initCategoryIds(categoryIds, dispatchCubeCategory); + String dispatchPieceCategory = basicdataPriceTemplateVO.getDispatchPieceCategory(); + initCategoryIds(categoryIds, dispatchPieceCategory); + String dispatchWeightCategory = basicdataPriceTemplateVO.getDispatchWeightCategory(); + initCategoryIds(categoryIds, dispatchWeightCategory); + String dispatchSubjoinCategory = basicdataPriceTemplateVO.getDispatchSubjoinCategory(); + initCategoryIds(categoryIds, dispatchSubjoinCategory); + + // 查询所有category + Map categoryVOMap = new HashMap<>(); + if (CollUtil.isNotEmpty(categoryIds)) { + List vos = categoryService.findCategoryByIds(CollUtil.newArrayList(categoryIds)); + if (CollUtil.isNotEmpty(vos)) { + for (PriceCategoryVO vo : vos) { + categoryVOMap.put(vo.getId(), vo); + } + + } + } + if (StrUtil.isNotEmpty(pickupCubeCategory)) { + basicdataPriceTemplateVO.setPickupCubeCategorys(Arrays.stream(pickupCubeCategory.split(",")).map(s -> categoryVOMap.get(Long.valueOf(s))).collect(Collectors.toList())); + } + if (StrUtil.isNotEmpty(pickupPieceCategory)) { + basicdataPriceTemplateVO.setPickupPieceCategorys(Arrays.stream(pickupPieceCategory.split(",")).map(s -> categoryVOMap.get(Long.valueOf(s))).collect(Collectors.toList())); + } + if (StrUtil.isNotEmpty(pickupWeightCategory)) { + basicdataPriceTemplateVO.setPickupWeightCategorys(Arrays.stream(pickupWeightCategory.split(",")).map(s -> categoryVOMap.get(Long.valueOf(s))).collect(Collectors.toList())); + } + if (StrUtil.isNotEmpty(trunklineCubeCategory)) { + basicdataPriceTemplateVO.setTrunklineCubeCategorys(Arrays.stream(trunklineCubeCategory.split(",")).map(s -> categoryVOMap.get(Long.valueOf(s))).collect(Collectors.toList())); + } + if (StrUtil.isNotEmpty(trunklinePieceCategory)) { + basicdataPriceTemplateVO.setTrunklinePieceCategorys(Arrays.stream(trunklinePieceCategory.split(",")).map(s -> categoryVOMap.get(Long.valueOf(s))).collect(Collectors.toList())); + } + if (StrUtil.isNotEmpty(trunklineWeightCategory)) { + basicdataPriceTemplateVO.setTrunklineWeightCategorys(Arrays.stream(trunklineWeightCategory.split(",")).map(s -> categoryVOMap.get(Long.valueOf(s))).collect(Collectors.toList())); + } + if (StrUtil.isNotEmpty(warehousePieceCategory)) { + basicdataPriceTemplateVO.setWarehousePieceCategorys(Arrays.stream(warehousePieceCategory.split(",")).map(s -> categoryVOMap.get(Long.valueOf(s))).collect(Collectors.toList())); + } + if (StrUtil.isNotEmpty(warehouseSubjoinCategory)) { + basicdataPriceTemplateVO.setWarehouseSubjoinCategorys(Arrays.stream(warehouseSubjoinCategory.split(",")).map(s -> categoryVOMap.get(Long.valueOf(s))).collect(Collectors.toList())); + } + if (StrUtil.isNotEmpty(dispatchCubeCategory)) { + basicdataPriceTemplateVO.setDispatchCubeCategorys(Arrays.stream(dispatchCubeCategory.split(",")).map(s -> categoryVOMap.get(Long.valueOf(s))).collect(Collectors.toList())); + } + if (StrUtil.isNotEmpty(dispatchPieceCategory)) { + basicdataPriceTemplateVO.setDispatchPieceCategorys(Arrays.stream(dispatchPieceCategory.split(",")).map(s -> categoryVOMap.get(Long.valueOf(s))).collect(Collectors.toList())); + } + if (StrUtil.isNotEmpty(dispatchWeightCategory)) { + basicdataPriceTemplateVO.setDispatchWeightCategorys(Arrays.stream(dispatchWeightCategory.split(",")).map(s -> categoryVOMap.get(Long.valueOf(s))).collect(Collectors.toList())); + } + if (StrUtil.isNotEmpty(dispatchSubjoinCategory)) { + basicdataPriceTemplateVO.setDispatchSubjoinCategorys(Arrays.stream(dispatchSubjoinCategory.split(",")).map(s -> categoryVOMap.get(Long.valueOf(s))).collect(Collectors.toList())); + } + } + + private void initCategoryIds(Set categoryIds, String pickupCubeCategory) { + if (StrUtil.isNotEmpty(pickupCubeCategory)) { + String[] split = pickupCubeCategory.split(","); + for (String s : split) { + categoryIds.add(Long.valueOf(s)); + } + } + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/BasicdataPriceRouteWrapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/BasicdataPriceRouteWrapper.java new file mode 100644 index 000000000..c462fb77e --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/BasicdataPriceRouteWrapper.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.basicdata.entity.BasicdataPriceRouteEntity; +import com.logpm.basicdata.vo.BasicdataPriceRouteVO; +import java.util.Objects; + +/** + * 基础价格路径 包装类,返回视图层所需的字段 + * + * @author zqb + * @since 2024-04-08 + */ +public class BasicdataPriceRouteWrapper extends BaseEntityWrapper { + + public static BasicdataPriceRouteWrapper build() { + return new BasicdataPriceRouteWrapper(); + } + + @Override + public BasicdataPriceRouteVO entityVO(BasicdataPriceRouteEntity basicdataPriceRoute) { + BasicdataPriceRouteVO basicdataPriceRouteVO = Objects.requireNonNull(BeanUtil.copy(basicdataPriceRoute, BasicdataPriceRouteVO.class)); + + //User createUser = UserCache.getUser(basicdataPriceRoute.getCreateUser()); + //User updateUser = UserCache.getUser(basicdataPriceRoute.getUpdateUser()); + //basicdataPriceRouteVO.setCreateUserName(createUser.getName()); + //basicdataPriceRouteVO.setUpdateUserName(updateUser.getName()); + + return basicdataPriceRouteVO; + } + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/BasicdataPriceTemplateWrapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/BasicdataPriceTemplateWrapper.java new file mode 100644 index 000000000..1ffceba66 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/BasicdataPriceTemplateWrapper.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.basicdata.entity.BasicdataPriceTemplateEntity; +import com.logpm.basicdata.vo.BasicdataPriceTemplateVO; +import java.util.Objects; + +/** + * 基础价格模板表 包装类,返回视图层所需的字段 + * + * @author zqb + * @since 2024-04-01 + */ +public class BasicdataPriceTemplateWrapper extends BaseEntityWrapper { + + public static BasicdataPriceTemplateWrapper build() { + return new BasicdataPriceTemplateWrapper(); + } + + @Override + public BasicdataPriceTemplateVO entityVO(BasicdataPriceTemplateEntity basicdataPriceTemplate) { + BasicdataPriceTemplateVO basicdataPriceTemplateVO = Objects.requireNonNull(BeanUtil.copy(basicdataPriceTemplate, BasicdataPriceTemplateVO.class)); + + //User createUser = UserCache.getUser(basicdataPriceTemplate.getCreateUser()); + //User updateUser = UserCache.getUser(basicdataPriceTemplate.getUpdateUser()); + //basicdataPriceTemplateVO.setCreateUserName(createUser.getName()); + //basicdataPriceTemplateVO.setUpdateUserName(updateUser.getName()); + + return basicdataPriceTemplateVO; + } + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/BasicdataPriceWrapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/BasicdataPriceWrapper.java new file mode 100644 index 000000000..5e18120b7 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/BasicdataPriceWrapper.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.basicdata.entity.BasicdataPriceEntity; +import com.logpm.basicdata.vo.BasicdataPriceVO; +import java.util.Objects; + +/** + * 基础价格表 包装类,返回视图层所需的字段 + * + * @author zqb + * @since 2024-04-02 + */ +public class BasicdataPriceWrapper extends BaseEntityWrapper { + + public static BasicdataPriceWrapper build() { + return new BasicdataPriceWrapper(); + } + + @Override + public BasicdataPriceVO entityVO(BasicdataPriceEntity basicdataPrice) { + BasicdataPriceVO basicdataPriceVO = Objects.requireNonNull(BeanUtil.copy(basicdataPrice, BasicdataPriceVO.class)); + + //User createUser = UserCache.getUser(basicdataPrice.getCreateUser()); + //User updateUser = UserCache.getUser(basicdataPrice.getUpdateUser()); + //basicdataPriceVO.setCreateUserName(createUser.getName()); + //basicdataPriceVO.setUpdateUserName(updateUser.getName()); + + return basicdataPriceVO; + } + + +} diff --git a/blade-service/logpm-basicdata/src/main/resources/application.yml b/blade-service/logpm-basicdata/src/main/resources/application.yml index ab56f1cbd..fc025c74f 100644 --- a/blade-service/logpm-basicdata/src/main/resources/application.yml +++ b/blade-service/logpm-basicdata/src/main/resources/application.yml @@ -20,5 +20,15 @@ spring: main: allow-circular-references: true - +xxl: + job: + accessToken: '' + admin: + addresses: http://127.0.0.1:7009/xxl-job-admin + executor: + appname: logpm-basicdata-xxljob + ip: 127.0.0.1 + logpath: ../data/applogs/logpm-factory-data-xxljob/jobhandler + logretentiondays: -1 + port: 17018 diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java index e8a5db74d..2bdca6788 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.EnumUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.factorydata.enums.BrandEnums; -import com.logpm.factorydata.enums.NodeEnums; +import org.springblade.common.constant.WorkNodeEnums; import com.logpm.factorydata.util.FactoryDataMessageSender; import com.logpm.factorydata.vo.NodePushMsg; import com.logpm.report.query.BillDetailsQuery; @@ -47,9 +47,9 @@ public class ReportBillLoadingController { @ApiOperation(value = "发送消息测试", notes = "发送消息测试") public R tasksPage(@RequestBody Map map) { String node = (String) map.get("node"); - NodeEnums nodeEnums = EnumUtil.fromString(NodeEnums.class, node); + WorkNodeEnums workNodeEnums = EnumUtil.fromString(WorkNodeEnums.class, node); NodePushMsg build = NodePushMsg.builder() - .node(nodeEnums) + .node(workNodeEnums) .brand(BrandEnums.ZB) .operatorTime(new Date()) .operator((String) map.get("operator")) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java index 25c228aac..58864d2de 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java @@ -27,7 +27,7 @@ public interface ReportDeliverMapeer extends BaseMapper { * @param query * @return */ - List getDeliveryTrainPage(IPage page, @Param("ew") Wrapper query); + List getDeliveryTrainPage(IPage page, @Param("ew") Wrapper query); /** * 查询配送客户报表sql diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/ExportReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/ExportReader.java index 0ec73e817..118c2c662 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/ExportReader.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/ExportReader.java @@ -2,7 +2,6 @@ package com.logpm.report.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.poi.ss.formula.functions.T; import java.util.List; @@ -29,6 +28,6 @@ public interface ExportReader { * @param query 分页查询对象 * @return */ - List findList(Page page, Wrapper query); + List findList(Page page, Wrapper query); } From 68909783558e00c6c2a7e4fc53ba2cb1cb11bd91 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Fri, 12 Apr 2024 14:40:05 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix(xml):=20=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A2=9E=E5=8A=A0xxljob?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-service/logpm-basicdata/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/blade-service/logpm-basicdata/pom.xml b/blade-service/logpm-basicdata/pom.xml index 22a653072..cf63694f3 100644 --- a/blade-service/logpm-basicdata/pom.xml +++ b/blade-service/logpm-basicdata/pom.xml @@ -78,6 +78,11 @@ compile + + com.xuxueli + xxl-job-core + + From 47dbd698650bea0f807b809556a90a27c6c08f20 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Fri, 12 Apr 2024 14:44:33 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix(all):=20=E5=A2=9E=E5=8A=A0=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/basicdata/enums/CostTypeEnums.java | 21 +++++++++++++++ .../enums/DispatchPricingTypeEnums.java | 27 +++++++++++++++++++ .../basicdata/enums/DispatchTypeEnums.java | 21 +++++++++++++++ .../basicdata/enums/FullVehicleTypeEnums.java | 24 +++++++++++++++++ .../enums/GeneralServiceTypeEnums.java | 24 +++++++++++++++++ .../basicdata/enums/MinCostTypeEnums.java | 23 ++++++++++++++++ .../basicdata/enums/MinCostWayEnums.java | 21 +++++++++++++++ .../enums/PickupPricingTypeEnums.java | 23 ++++++++++++++++ .../basicdata/enums/ServiceTypeEnums.java | 24 +++++++++++++++++ .../enums/TrunkLinePricingTypeEnums.java | 23 ++++++++++++++++ .../enums/WarehouseCalculationBasisEnums.java | 21 +++++++++++++++ .../enums/WarehousePricingModeEnums.java | 21 +++++++++++++++ .../enums/WarehousePricingTypeEnums.java | 23 ++++++++++++++++ .../enums/WarehousePricingUnitEnums.java | 23 ++++++++++++++++ .../basicdata/job/BasicdataPriceJob.java | 5 ++-- 15 files changed, 322 insertions(+), 2 deletions(-) create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/CostTypeEnums.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/DispatchPricingTypeEnums.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/DispatchTypeEnums.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/FullVehicleTypeEnums.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/GeneralServiceTypeEnums.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/MinCostTypeEnums.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/MinCostWayEnums.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/PickupPricingTypeEnums.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/ServiceTypeEnums.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/TrunkLinePricingTypeEnums.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehouseCalculationBasisEnums.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehousePricingModeEnums.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehousePricingTypeEnums.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehousePricingUnitEnums.java diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/CostTypeEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/CostTypeEnums.java new file mode 100644 index 000000000..ade4e508a --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/CostTypeEnums.java @@ -0,0 +1,21 @@ +package com.logpm.basicdata.enums; + +import org.springblade.common.model.IDict; + +/** + * 最低计费类型 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum CostTypeEnums implements IDict { + + NOMAL(1, "普通费"), + ADD(2, "附加费"), + ; + + CostTypeEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/DispatchPricingTypeEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/DispatchPricingTypeEnums.java new file mode 100644 index 000000000..3af7fba8c --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/DispatchPricingTypeEnums.java @@ -0,0 +1,27 @@ +package com.logpm.basicdata.enums; + +import org.springblade.common.model.IDict; + +/** + * 配送计费方式 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum DispatchPricingTypeEnums implements IDict { + + PIECE(1, "按件计费"), + WEIGHT(2, "按重量计费"), + CUBE(3, "按方计费"), + COMPLETE_VEHICLE(4, "按整车计费"), + DESTINATIONS_NUMBER(5, "按点位计费"), + TON_PER_KILOMETER(6, "按吨公里计费"), + KILOMETER(7, "按公里计费"), + TON(8, "按吨计费"), + ; + + DispatchPricingTypeEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/DispatchTypeEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/DispatchTypeEnums.java new file mode 100644 index 000000000..87231dc0b --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/DispatchTypeEnums.java @@ -0,0 +1,21 @@ +package com.logpm.basicdata.enums; + +import org.springblade.common.model.IDict; + +/** + * 配送类型 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum DispatchTypeEnums implements IDict { + + COMMERCIAL_DISTRIBUTION(1, "商配"), + URBAN_DELIVERY(2, "市配"), + ; + + DispatchTypeEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/FullVehicleTypeEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/FullVehicleTypeEnums.java new file mode 100644 index 000000000..c09020f87 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/FullVehicleTypeEnums.java @@ -0,0 +1,24 @@ +package com.logpm.basicdata.enums; + +import org.springblade.common.model.IDict; + +/** + * 整车类型 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum FullVehicleTypeEnums implements IDict { + + PICK_UP(1, "整车提货"), + TRUNK_LINE(2, "干线整车运输"), + DISPATCH(3, "整车配送"), + TRUNK_LINE_ROUTE(4, "干线路径整车运输"), + PICK_UP_ROUTE(5, "提货路径整车运输"), + ; + + FullVehicleTypeEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/GeneralServiceTypeEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/GeneralServiceTypeEnums.java new file mode 100644 index 000000000..96763b6f9 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/GeneralServiceTypeEnums.java @@ -0,0 +1,24 @@ +package com.logpm.basicdata.enums; + +import org.springblade.common.model.IDict; + +/** + * 一般计费服务类型 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum GeneralServiceTypeEnums implements IDict { + PICK_UP(1, "提货"), + PICK_UP_ROUTE(2, "提货路径"), + TRUNK_LINE(3, "干线"), + TRUNK_LINE_ROUTE(4, "干线路径"), + DISPATCH(5, "配送"), + DISPATCH_LEAVE_BEHIND(6, "配送遗留"), + ; + + GeneralServiceTypeEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/MinCostTypeEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/MinCostTypeEnums.java new file mode 100644 index 000000000..bd0456377 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/MinCostTypeEnums.java @@ -0,0 +1,23 @@ +package com.logpm.basicdata.enums; + +import org.springblade.common.model.IDict; + +/** + * 最低计费类型 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum MinCostTypeEnums implements IDict { + + PRICE(1, "价格"), + PIECE(2, "件"), + CUBE(3, "方数（m³）"), + KILOGRAM(4, "重量（Kg）"), + ; + + MinCostTypeEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/MinCostWayEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/MinCostWayEnums.java new file mode 100644 index 000000000..a51ca8a4d --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/MinCostWayEnums.java @@ -0,0 +1,21 @@ +package com.logpm.basicdata.enums; + +import org.springblade.common.model.IDict; + +/** + * 最低计费方式 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum MinCostWayEnums implements IDict { + + PRICE(1, "订单"), + PIECE(2, "配送任务"), + ; + + MinCostWayEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/PickupPricingTypeEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/PickupPricingTypeEnums.java new file mode 100644 index 000000000..cd1ac2b0d --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/PickupPricingTypeEnums.java @@ -0,0 +1,23 @@ +package com.logpm.basicdata.enums; + +import org.springblade.common.model.IDict; + +/** + * 提货计价方式 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum PickupPricingTypeEnums implements IDict { + + PIECE(1, "按件"), + COMPLETE_VEHICLE(2, "按整车"), + CUBE(3, "按方"), + WEIGHT(4, "按重量"), + ; + + PickupPricingTypeEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/ServiceTypeEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/ServiceTypeEnums.java new file mode 100644 index 000000000..974f32495 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/ServiceTypeEnums.java @@ -0,0 +1,24 @@ +package com.logpm.basicdata.enums; + +import org.springblade.common.model.IDict; + +/** + * 服务类型 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum ServiceTypeEnums implements IDict { + + PICK_UP(1, "提货"), + TRUNK_LINE(2, "干线"), + WAREHOUSE(3, "仓储"), + DISPATCH(4, "配送"), + INSTALL(5, "安装"), + ; + + ServiceTypeEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/TrunkLinePricingTypeEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/TrunkLinePricingTypeEnums.java new file mode 100644 index 000000000..dae2d0be6 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/TrunkLinePricingTypeEnums.java @@ -0,0 +1,23 @@ +package com.logpm.basicdata.enums; + +import org.springblade.common.model.IDict; + +/** + * 干线计费方式 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum TrunkLinePricingTypeEnums implements IDict { + + PIECE(1, "按件"), + COMPLETE_VEHICLE(2, "按整车"), + CUBE(3, "按方"), + WEIGHT(4, "按重量"), + ; + + TrunkLinePricingTypeEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehouseCalculationBasisEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehouseCalculationBasisEnums.java new file mode 100644 index 000000000..54d4bada9 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehouseCalculationBasisEnums.java @@ -0,0 +1,21 @@ +package com.logpm.basicdata.enums; + +import org.springblade.common.model.IDict; + +/** + * 仓储计费基准 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum WarehouseCalculationBasisEnums implements IDict { + + PIECE_PER_DAY(1, "件/天"), + PIECE_PER_MONTH(2, "件/月"), + ; + + WarehouseCalculationBasisEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehousePricingModeEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehousePricingModeEnums.java new file mode 100644 index 000000000..cd8c34d6e --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehousePricingModeEnums.java @@ -0,0 +1,21 @@ +package com.logpm.basicdata.enums; + +import org.springblade.common.model.IDict; + +/** + * 仓储计费模式 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum WarehousePricingModeEnums implements IDict { + + SEGMENTED_CHARGING(1, "分段式计费"), + MAXIMUM_BILLING(2, "最高标准计费"), + ; + + WarehousePricingModeEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehousePricingTypeEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehousePricingTypeEnums.java new file mode 100644 index 000000000..430f075ac --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehousePricingTypeEnums.java @@ -0,0 +1,23 @@ +package com.logpm.basicdata.enums; + +import org.springblade.common.model.IDict; + +/** + * 仓储计费方式 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum WarehousePricingTypeEnums implements IDict { + + PIECE(1, "按件"), + CUBE(2, "按方"), + WEIGHT(3, "按重量（Kg）"), + TONNE(4, "按吨（t）"), + ; + + WarehousePricingTypeEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehousePricingUnitEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehousePricingUnitEnums.java new file mode 100644 index 000000000..259096754 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/WarehousePricingUnitEnums.java @@ -0,0 +1,23 @@ +package com.logpm.basicdata.enums; + +import org.springblade.common.model.IDict; + +/** + * 仓储费用计价单位 + * + * @author zhaoqiaobo + * @create 2024-04-01 + */ +public enum WarehousePricingUnitEnums implements IDict { + + PIECE(1, "按件"), + CUBE(2, "按方"), + WEIGHT(3, "按重量（Kg）"), + TONNE(4, "按吨（t）"), + ; + + WarehousePricingUnitEnums(Integer code, String text) { + init(code, text); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/job/BasicdataPriceJob.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/job/BasicdataPriceJob.java index 1a68c342e..45dc87391 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/job/BasicdataPriceJob.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/job/BasicdataPriceJob.java @@ -2,6 +2,7 @@ package com.logpm.basicdata.job; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.basicdata.entity.BasicdataPriceEntity; import com.logpm.basicdata.entity.BasicdataStoreBrandEntity; @@ -52,9 +53,9 @@ public class BasicdataPriceJob { } } for (BasicdataStoreBrandEntity basicdataStoreBrandEntity : list) { - String brandId = basicdataStoreBrandEntity.getBrandId(); + Long brandId = basicdataStoreBrandEntity.getBrandId(); Long clientId = basicdataStoreBrandEntity.getClientId(); - if (!priceMap.containsKey(brandId + clientId)) { + if (!priceMap.containsKey(StrUtil.toString(brandId) + StrUtil.toString(clientId))) { BasicdataPriceEntity basicdataPriceEntity = new BasicdataPriceEntity(); basicdataPriceEntity.setClientId(clientId); basicdataPriceEntity.setBrandId(Convert.toLong(brandId)); From bb78ec6e9574c86b4dca94226b97a8aada24b545 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Fri, 12 Apr 2024 14:59:30 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix(service):=20=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=A8=A1=E5=9D=97=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/logpm/report/mapper/ReportDeliverMapeer.java | 2 +- .../main/java/com/logpm/report/reader/DeliveryTrainReader.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java index 58864d2de..25c228aac 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java @@ -27,7 +27,7 @@ public interface ReportDeliverMapeer extends BaseMapper { * @param query * @return */ - List getDeliveryTrainPage(IPage page, @Param("ew") Wrapper query); + List getDeliveryTrainPage(IPage page, @Param("ew") Wrapper query); /** * 查询配送客户报表sql diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryTrainReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryTrainReader.java index 6c9417906..ce2ce25bc 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryTrainReader.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryTrainReader.java @@ -11,7 +11,6 @@ import javax.annotation.Resource; import java.util.List; /** - * * @author zhaoqiaobo * @create 2024-03-08 9:50 */ @@ -30,7 +29,7 @@ public class DeliveryTrainReader implements ExportReader { @Override public List findList(Page page, Wrapper query) { - return reportDeliverMapeer.getDeliveryTrainPage(page,query); + return reportDeliverMapeer.getDeliveryTrainPage(page, query); } }