1.福达商品批量修改分管员

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -226,14 +226,14 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 				.in(GoodsFiles::getPid, idList)
 				.eq(GoodsFiles::getIsDeleted, 0));
 			for (GoodsDesc item : goodsDescList) {
-				if (!goodsTypeList.isEmpty()){
+				if (!goodsTypeList.isEmpty()) {
 					GoodsType goodsType = goodsTypeList.stream().filter(e -> (e.getId() + "").equals(item.getGoodsTypeId())).findFirst().orElse(null);
 					if (goodsType != null) {
 						item.setGoodsTypeId(goodsType.getId() + "");
 						item.setGoodsTypeName(goodsType.getCname());
 					}
 				}
-				if (!filesList.isEmpty()){
+				if (!filesList.isEmpty()) {
 					List<GoodsFiles> files = filesList.stream().filter(e -> e.getPid().equals(item.getId()))
 						.collect(Collectors.toList());
 					if (!files.isEmpty()) {
@@ -1029,7 +1029,32 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 		if (ObjectUtils.isNotNull(userIds)) {
 			userList = userClient.selectUserList(userIds);
 		}
-		for (GoodsImportExcel item : excelList) {
+		List<String> codeList = excelList.stream().map(GoodsImportExcel::getCode).filter(Objects::nonNull)
+			.distinct().collect(Collectors.toList());
+		List<GoodsDesc> goodsDescs = new ArrayList<>();
+		if (!codeList.isEmpty()){
+			goodsDescs = baseMapper.selectList(new LambdaQueryWrapper<GoodsDesc>()
+				.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId())
+				.eq(GoodsDesc::getIsDeleted, 0)
+				.in(GoodsDesc::getCode, codeList));
+		}
+		 for (GoodsDesc goodsDesc : goodsDescs){
+			 GoodsImportExcel item = excelList.stream().filter(e-> e.getCode().equals(goodsDesc.getCode())).findFirst().orElse(null);
+			 if (!userList.isEmpty() && item != null) {
+				 goodsDesc.setSupervisorUserNameGroup(userList.stream().map(User::getRealName)
+					 .filter(realName -> item.getSupervisorUserNameGroup().contains(realName)).collect(Collectors.joining(",")));
+				 List<Long> ids = userList.stream().map(User::getId).distinct().collect(Collectors.toList());
+				 StringBuilder supervisorUserIdGroup = new StringBuilder();
+				 for (Long e : ids) {
+					 supervisorUserIdGroup.append(e).append(",");
+				 }
+				 if (ObjectUtils.isNotNull(supervisorUserIdGroup.toString())) {
+					 goodsDesc.setSupervisorUserIdGroup(supervisorUserIdGroup.substring(0, supervisorUserIdGroup.length() - 1));
+				 }
+			 }
+			 goodsDescList.add(goodsDesc);
+		 }
+		/*for (GoodsImportExcel item : excelList) {
 			GoodsDesc goodsDesc = baseMapper.selectOne(new LambdaQueryWrapper<GoodsDesc>()
 				.eq(GoodsDesc::getCode, item.getCode())
 				.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId())
@@ -1050,7 +1075,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 				}
 			}
 			goodsDescList.add(goodsDesc);
-		}
+		}*/
 		this.updateBatchById(goodsDescList);
 		return R.success("修改成功");
 	}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -8448,6 +8448,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					} else {
 						item.setPrice(salesPolicyItem.getSpecialOffer());
 						item.setRealSpecialOffer(salesPolicyItem.getRealSpecialOffer());
+						item.setInputMold(1);
+						item.setIsSpecial(1);
 					}
 					orderItems.add(item);
 				}