From 457e267654707735a90ca2ea7c5061ab4e7f8746 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Tue, 12 Sep 2023 10:11:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=80=BC=E6=9C=8D=E5=8A=A1=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E3=80=81=E5=A2=9E=E5=80=BC=E6=9C=8D=E5=8A=A1fein?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../feign/IDistributionAddvalueClient.java | 2 +-
.../IDistributionAddvalueDetailClient.java | 2 +-
.../IDistributionAddvaluePackageClient.java | 2 +-
.../vo/DistributionAddvalueDetailVO.java | 5 +++++
.../vo/DistributionAddvalueVO.java | 5 +++++
.../mapper/DistributionDeliveryInfoMapper.xml | 1 +
.../service/IDistributionAddvalueService.java | 9 +++++++++
.../impl/DistributionAddvalueServiceImpl.java | 19 +++++++++++++++++++
.../DistributionDeliveryListServiceImpl.java | 2 +-
9 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvalueClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvalueClient.java
index 5bbf1d055..3cdcd42bf 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvalueClient.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvalueClient.java
@@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RequestParam;
)
public interface IDistributionAddvalueClient {
- String API_PREFIX = "/client";
+ String API_PREFIX = "addvalue/client";
String TOP = API_PREFIX + "/top";
/**
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvalueDetailClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvalueDetailClient.java
index 21120bd56..d535f57ba 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvalueDetailClient.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvalueDetailClient.java
@@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RequestParam;
)
public interface IDistributionAddvalueDetailClient {
- String API_PREFIX = "/client";
+ String API_PREFIX = "addvalueDetail/client";
String TOP = API_PREFIX + "/top";
/**
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvaluePackageClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvaluePackageClient.java
index 4bdd03b3f..5571c0a43 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvaluePackageClient.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvaluePackageClient.java
@@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RequestParam;
)
public interface IDistributionAddvaluePackageClient {
- String API_PREFIX = "/client";
+ String API_PREFIX = "addvaluePackage/client";
String TOP = API_PREFIX + "/top";
/**
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueDetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueDetailVO.java
index 9e87c78e8..fd8bef17b 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueDetailVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueDetailVO.java
@@ -21,6 +21,8 @@ import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.util.List;
+
/**
* 配送增值服务明细 视图实体类
*
@@ -32,4 +34,7 @@ import lombok.EqualsAndHashCode;
public class DistributionAddvalueDetailVO extends DistributionAddvalueDetailEntity {
private static final long serialVersionUID = 1L;
+
+ private List<DistributionAddvaluePackageVO> addvaluePackageVOList;
+
}
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueVO.java
index 8a6357aa6..375976166 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueVO.java
@@ -21,6 +21,8 @@ import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.util.List;
+
/**
* 配送增值服务表 视图实体类
*
@@ -32,4 +34,7 @@ import lombok.EqualsAndHashCode;
public class DistributionAddvalueVO extends DistributionAddvalueEntity {
private static final long serialVersionUID = 1L;
+
+ private List<DistributionAddvalueDetailVO> addvalueDetailVOS;
+
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
index d7a1253cc..f7a5f00b5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
@@ -215,6 +215,7 @@
ldsa.order_status,
ldsa.description_goods descriptionGoods,
(
+
SELECT
GROUP_CONCAT( ldpl.material_name SEPARATOR ',' )
FROM
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAddvalueService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAddvalueService.java
index 63752325e..b8505cf3d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAddvalueService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAddvalueService.java
@@ -19,9 +19,11 @@ package com.logpm.distribution.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.logpm.distribution.dto.app.DistributionAppAddvalueDTO;
import com.logpm.distribution.entity.DistributionAddvalueEntity;
import com.logpm.distribution.excel.DistributionAddvalueExcel;
import com.logpm.distribution.vo.DistributionAddvalueVO;
+import com.logpm.distribution.vo.app.DistributionAppAddvalueVO;
import java.util.List;
@@ -50,4 +52,11 @@ public interface IDistributionAddvalueService extends IService<DistributionAddva
*/
List<DistributionAddvalueExcel> exportDistributionAddvalue(Wrapper<DistributionAddvalueEntity> queryWrapper);
+ /**
+ * 查询客户的增值服务列表
+ * @param page
+ * @param distributionAppAddvalueDTO
+ * @return
+ */
+ IPage<DistributionAppAddvalueVO> addvaluePage(IPage<DistributionAppAddvalueVO> page, DistributionAppAddvalueDTO distributionAppAddvalueDTO);
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java
index f77af3f41..3311ffc78 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java
@@ -16,11 +16,15 @@
*/
package com.logpm.distribution.service.impl;
+import com.logpm.distribution.dto.app.DistributionAppAddvalueDTO;
import com.logpm.distribution.entity.DistributionAddvalueEntity;
import com.logpm.distribution.excel.DistributionAddvalueExcel;
import com.logpm.distribution.mapper.DistributionAddvalueMapper;
import com.logpm.distribution.service.IDistributionAddvalueService;
import com.logpm.distribution.vo.DistributionAddvalueVO;
+import com.logpm.distribution.vo.app.DistributionAppAddvalueVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,8 +38,14 @@ import java.util.List;
* @since 2023-09-11
*/
@Service
+@AllArgsConstructor
+@Slf4j
public class DistributionAddvalueServiceImpl extends ServiceImpl<DistributionAddvalueMapper, DistributionAddvalueEntity> implements IDistributionAddvalueService {
+ private final DistributionAddvalueMapper distributionAddvalueMapper;
+
+
+
@Override
public IPage<DistributionAddvalueVO> selectDistributionAddvaluePage(IPage<DistributionAddvalueVO> page, DistributionAddvalueVO distributionAddvalue) {
return page.setRecords(baseMapper.selectDistributionAddvaluePage(page, distributionAddvalue));
@@ -51,4 +61,13 @@ public class DistributionAddvalueServiceImpl extends ServiceImpl<DistributionAdd
return distributionAddvalueList;
}
+ @Override
+ public IPage<DistributionAppAddvalueVO> addvaluePage(IPage<DistributionAppAddvalueVO> page, DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
+ //根据客户ID查询增值服务列表
+
+
+
+ return null;
+ }
+
}
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 c6caf6e44..b48441e09 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
@@ -163,7 +163,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
DistributionDeliveryListVO distributionDeliveryListVO = DistributionDeliveryListWrapper.build().entityVO(detail);
//查询包条数据
- //List<DistributionDeliveryInfoVO> stripList = distributionDeliveryInfoMapper.selectStripList(detail.getId());
+// List<DistributionDeliveryInfoVO> stripList = distributionDeliveryInfoMapper.selectStripList(detail.getId());
//distributionDeliveryListVO.setPackadeList(stripList);
//装车件数
//Integer sum = distributionSignforMapper.selectloadNub(distributionDeliveryListVO.getId());