diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftDetailMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftDetailMapper.java
index 08d85971..0fcd59bb 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftDetailMapper.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftDetailMapper.java
@@ -1,7 +1,11 @@
package com.hzs.activity.declaration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hzs.activity.declaration.param.AcDeclarationProductParam;
import com.hzs.activity.declaration.vo.AcDeclarationGiftDetail;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -13,4 +17,5 @@ import com.hzs.activity.declaration.vo.AcDeclarationGiftDetail;
*/
public interface AcDeclarationGiftDetailMapper extends BaseMapper {
+ List listByPKRuleId(@Param("pkId") Long pkId);
}
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationProductParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationProductParam.java
index 61dc32a4..82c8fa04 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationProductParam.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationProductParam.java
@@ -14,6 +14,10 @@ public class AcDeclarationProductParam {
*/
private Integer pkProduct;
+ /**
+ * 产品名称
+ */
+ private String productName;
/**
* 产品规格(逗号分隔)
*/
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftDetailService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftDetailService.java
index 4d22d7fa..596476b1 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftDetailService.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftDetailService.java
@@ -1,8 +1,11 @@
package com.hzs.activity.declaration.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.hzs.activity.declaration.param.AcDeclarationProductParam;
import com.hzs.activity.declaration.vo.AcDeclarationGiftDetail;
+import java.util.List;
+
/**
*
* 服务类
@@ -13,4 +16,5 @@ import com.hzs.activity.declaration.vo.AcDeclarationGiftDetail;
*/
public interface IAcDeclarationGiftDetailService extends IService {
+ List listByPKRuleId(Long pkId);
}
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java
index 277e7df0..db4b51e2 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java
@@ -31,6 +31,7 @@ import com.hzs.common.domain.activity.base.AcBaseConfig;
import com.hzs.common.domain.activity.base.AcGoalMemberConfig;
import com.hzs.common.domain.activity.pick.AcPick;
import com.hzs.common.security.utils.SecurityUtils;
+import com.hzs.sale.product.service.IBdProductService;
import com.hzs.system.sys.dto.LoginUser;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -66,6 +67,9 @@ public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl acDeclarationConfigParams = new ArrayList<>();
list.forEach(item->{
AcDeclarationConfigParam acDeclarationConfigParam = BeanUtil.copyProperties(item, AcDeclarationConfigParam.class);
- List declarationGiftDetails = iAcDeclarationGiftDetailService.list(new LambdaQueryWrapper()
- .eq(AcDeclarationGiftDetail::getPkRuleId, item.getPkId())
- .eq(AcDeclarationGiftDetail::getDelFlag, 0));
- List declarationConfigParams = declarationGiftDetails.stream()
- .map(i -> BeanUtil.copyProperties(i, AcDeclarationProductParam.class))
- .collect(Collectors.toList());
+ List declarationConfigParams = iAcDeclarationGiftDetailService.listByPKRuleId(item.getPkId());
acDeclarationConfigParam.setAcDeclarationProductParamList(declarationConfigParams);
acDeclarationConfigParams.add(acDeclarationConfigParam);
});
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftDetailServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftDetailServiceImpl.java
index cc05eade..aed2e432 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftDetailServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftDetailServiceImpl.java
@@ -2,10 +2,14 @@ package com.hzs.activity.declaration.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.activity.declaration.mapper.AcDeclarationGiftDetailMapper;
+import com.hzs.activity.declaration.param.AcDeclarationProductParam;
import com.hzs.activity.declaration.service.IAcDeclarationGiftDetailService;
import com.hzs.activity.declaration.vo.AcDeclarationGiftDetail;
import org.springframework.stereotype.Service;
+import java.util.Collections;
+import java.util.List;
+
/**
*
* 服务实现类
@@ -17,4 +21,8 @@ import org.springframework.stereotype.Service;
@Service
public class AcDeclarationGiftDetailServiceImpl extends ServiceImpl implements IAcDeclarationGiftDetailService {
+ @Override
+ public List listByPKRuleId(Long pkId) {
+ return baseMapper.listByPKRuleId(pkId);
+ }
}
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftDetailMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftDetailMapper.xml
index 4fb54a46..4e9b08fa 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftDetailMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftDetailMapper.xml
@@ -28,5 +28,16 @@
PK_COUNTRY,
PK_ID, PK_RULE_ID, PK_PRODUCT, SPECS_NAME, SPECS_NAME_ID, QUANTITY
+