From e08091da364177c662413b41b8106b51bb1dfbfd Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Mon, 17 Jul 2023 09:15:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=80=BC=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionStockArticleController.java   |  3 +--
 .../DistributionStockArticleServiceImpl.java  | 22 ++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
index dcd56a073..52fc2bb71 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
@@ -241,11 +241,10 @@ public class DistributionStockArticleController extends BladeController {
 	}
 
 	/**
-	 * 配送单 添加增值服务
+	 * 配送单（配送列表） 添加增值服务
 	 */
 	@PostMapping("/addIncrement")
 	@ApiOperationSupport(order = 7)
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R addIncrement(@ApiParam(value = "主键集合", required = true) @RequestBody Map<String,Object> addvalueInfo) {
 		R<?> result = distributionStockArticleService.addIncrement(addvalueInfo);
 		return result;
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index 41f928e2d..620d220b1 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -25,6 +25,7 @@ import com.logpm.basic.feign.IBasicTenantCodeClient;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
+import com.logpm.distribution.mapper.DistributionDeliveryListMapper;
 import com.logpm.distribution.mapper.DistributionStockArticleMapper;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
@@ -56,6 +57,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 	private final IDistributionStockListService distributionStockListService;
 
+	private final DistributionDeliveryListMapper distributionDeliveryListMapper;
+
 	private final IDistributionStockService distributionStockService;
 
 	private final IDistributionAddvalueService distributionAddvalueService;
@@ -123,9 +126,16 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		boolean result = false;
 		if (!Func.isEmpty(addvalueInfo)){
 			String id = (String) addvalueInfo.get("id");
-			DistributionStockArticleEntity distributionStockArticleEntity = baseMapper.selectById(Long.parseLong(id));
+			Integer relatedId = (Integer) addvalueInfo.get("relatedId");
+			DistributionDeliveryListEntity distributionDeliveryListEntity = null;
+			DistributionStockArticleEntity distributionStockArticleEntity =null;
+			if (relatedId==2){
+				 distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(Long.parseLong(id));
+			}else {
+				distributionStockArticleEntity = baseMapper.selectById(Long.parseLong(id));
+			}
 //			//获取配送单增值服务费用
-			if (!Func.isEmpty(distributionStockArticleEntity)){
+			if (Func.isNotEmpty(distributionStockArticleEntity) || Func.isNotEmpty(distributionDeliveryListEntity)){
 				List<Map<String,Object>> addvalueEntities = (List<Map<String, Object>>) addvalueInfo.get("addvalue");
 				if (!Func.isEmpty(addvalueEntities)){
 					BigDecimal sum = BigDecimal.ZERO;
@@ -135,8 +145,14 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 						String feeStr = (String) addvalueEntityInfo.get("fee");
 						BigDecimal fee = new BigDecimal(feeStr);
 						DistributionAddvalueEntity addvalueEntity = Func.copy(addvalueEntityInfo, DistributionAddvalueEntity.class);
-						//设置关联的配送编号
+						if (relatedId==2){
+							//设置关联的配送id
+							addvalueEntity.setDeliveryId(distributionDeliveryListEntity.getId());
+							addvalueEntity.setRelatedId(2);
+						}else {
+						//设置关联的订单编号
 						addvalueEntity.setStockArticleId(distributionStockArticleEntity.getId());
+						}
 						//完成每一项的增值服务费用累加
 						addvalueEntity.setFee(fee);
 						sum = sum.add(fee);