From 87e814d8004d37e89fa8f8a7ff3dac5842669926 Mon Sep 17 00:00:00 2001 From: kilo Date: Thu, 3 Aug 2023 16:48:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E7=8A=B6=E6=80=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/DictBizConstant.java | 5 +++++ .../entity/DistributionDeliveryListEntity.java | 2 +- .../entity/DistributionReservationEntity.java | 2 +- .../vo/DistributionReservationVO.java | 6 ++++++ .../DistributionDeliveryListServiceImpl.java | 1 + .../DistributionReservationServiceImpl.java | 18 +++++++++++++----- .../DistributionReservationWrapper.java | 14 ++++++++++++++ 7 files changed, 41 insertions(+), 7 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java index f9677f2e5..a9bfb1673 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java @@ -31,5 +31,10 @@ public class DictBizConstant { //--------------2023-08-02 --------------------- public static final String PERIOD_OF_TIME = "period_of_time";//时段 + //--------------2023-08-03 --------------------- + public static final String ADD_VALUE_SERVE_TYPE = "addvalue_serve_type";//增值服务类型 + + + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java index 19eadfc9f..aaa306830 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java @@ -139,7 +139,7 @@ public class DistributionDeliveryListEntity extends TenantEntity { * 配送状态;1-配送中,2-已完成 */ @ApiModelProperty(value = "配送状态;1-配送中,2-已完成") - private String state; + private String deliveryState; /** * 配送客户数 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java index 8eb01ab71..7c55ef16d 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java @@ -143,7 +143,7 @@ public class DistributionReservationEntity extends TenantEntity { private Integer reservationNum; /** - * 预约数量 + * 库存品 预约数量 */ @ApiModelProperty(value = "预约数量") private Integer reservationStockListNum; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java index 26e1b2e78..c163ff021 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java @@ -37,6 +37,12 @@ public class DistributionReservationVO extends DistributionReservationEntity { @ApiModelProperty(value = "时段名称") private String periodOfTimeName; + private String serveTypeName; + + private String deliveryWayName; + + private String deliveryTypeName; + /** * 库存品信息列表 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index c6920685b..20c076f52 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -1297,6 +1297,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl qw = new QueryWrapper().lambda().eq(DistributionParcelListEntity::getStockArticleId, o.getId()); List parcelListEntities = distributionParcelListService.getBaseMapper().selectList(qw); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index f9243be46..53bc622dc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -218,6 +218,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl { + DistributionStockArticleEntity stockArticleEntity = Func.copy(s, DistributionStockArticleEntity.class); DistributionReservationStockarticleEntity distributionReservationStockarticleEntity = new DistributionReservationStockarticleEntity(); //预约订单数量 AtomicInteger packageNum = new AtomicInteger(); @@ -239,8 +240,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl0){ + String[] split = serveType.split(","); + for (String s : split) { + String value = DictBizCache.getValue(DictBizConstant.ADD_VALUE_SERVE_TYPE, s); + builder.append(value).append(","); + } + }else { + builder.append(DictBizCache.getValue(DictBizConstant.ADD_VALUE_SERVE_TYPE,serveType)).append(","); + } + + reservationVO.setServeTypeName(builder.deleteCharAt(builder.length()-1).toString()); +// reservationVO.setDeliveryTypeName(builder.append(DictBizCache.getValue(DictBizConstant.ADD_VALUE_SERVE_TYPE,serveType)).append(",");); return reservationVO; }