From 15df5b3c9b36e8d3ee0add8c5d732d45ff84cac7 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Mon, 20 Oct 2025 16:09:45 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=90=8E=E5=8F=B0=E5=85=85=E5=80=BC?= =?UTF-8?q?=E6=8F=90=E8=B4=A7=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/AcDeclarationGiftRecordMapper.java | 2 +- .../service/IAcDeclarationGiftRecordService.java | 2 +- .../service/impl/AcDeclarationGiftRecordServiceImpl.java | 2 +- .../activity/pick/controller/api/ApiPickController.java | 3 ++- .../pick/controller/manage/AcPickController.java | 1 - .../com/hzs/activity/pick/service/IAcPickService.java | 1 + .../activity/pick/service/impl/AcPickServiceImpl.java | 2 +- .../wares/service/impl/AcGiftConfigServiceImpl.java | 9 +++++++++ 8 files changed, 16 insertions(+), 6 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java index 4b850038..f36ff32d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java @@ -25,5 +25,5 @@ public interface AcDeclarationGiftRecordMapper extends BaseMapper queryListByRuleList(@Param("pkDataId") Long pkDataId,@Param("pkCountry") Integer pkCountry); + List queryListByRuleList(@Param("pkDataId") List pkDataId,@Param("pkCountry") Integer pkCountry); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java index 42c7f891..97e3856a 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java @@ -23,5 +23,5 @@ public interface IAcDeclarationGiftRecordService extends IService queryListByRuleIdList(Long pkDataId, Integer pkCountry); + List queryListByRuleIdList(List pkDataId, Integer pkCountry); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java index 98324c72..fe5ad928 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java @@ -90,7 +90,7 @@ public class AcDeclarationGiftRecordServiceImpl extends ServiceImpl queryListByRuleIdList(Long pkDataId, Integer pkCountry) { + public List queryListByRuleIdList(List pkDataId, Integer pkCountry) { return baseMapper.queryListByRuleList(pkDataId,pkCountry); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java index d4be2678..f86193e2 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java @@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.concurrent.TimeUnit; @@ -144,7 +145,7 @@ public class ApiPickController extends BaseController { break; case DECLARATION_GIFT: // 处理报单赠送活动 - List acGiftConfigExtList = iAcDeclarationGiftRecordService.queryListByRuleIdList(acPick.getPkDataId(),pkCountry); + List acGiftConfigExtList = iAcDeclarationGiftRecordService.queryListByRuleIdList(Collections.singletonList(acPick.getPkDataId()),pkCountry); for (AcGiftConfigExt acGiftConfigExt : acGiftConfigExtList) { // 处理提货产品明细 detailList.add(ApiPickDetailVO.builder() diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java index 71cc8a54..389ede58 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java @@ -76,7 +76,6 @@ public class AcPickController extends BaseController { startPage(); List acPickExtList = iAcPickService.queryList(param, pkCountry); - if (CollectionUtil.isNotEmpty(acPickExtList)) { // 活动规则ID列表 List ruleIdList = acPickExtList.stream().filter(acPickQueryVO -> EPickType.PICK_PRODUCT.getValue() != acPickQueryVO.getPickType()).map(AcPickExt::getPkDataId).collect(Collectors.toList()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickService.java index bfadf279..3819ec77 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickService.java @@ -10,6 +10,7 @@ import com.hzs.common.domain.activity.pick.ext.AcPickExt; import com.hzs.system.sys.dto.LoginUser; import java.math.BigDecimal; +import java.util.Collection; import java.util.Date; import java.util.List; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java index 0ea01693..03c51823 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java @@ -568,7 +568,7 @@ public class AcPickServiceImpl extends ServiceImpl impleme break; case DECLARATION_GIFT: // 报单赠送列表 - List acDecList = iAcDeclarationGiftRecordService.queryListByRuleIdList(acPick.getPkDataId(), pkCountry); + List acDecList = iAcDeclarationGiftRecordService.queryListByRuleIdList(Collections.singletonList(acPick.getPkDataId()), pkCountry); for (AcGiftConfigExt acGiftConfigExt : acDecList) { productList.add(PostageProductDTO.builder() .productId(acGiftConfigExt.getPkProduct()) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcGiftConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcGiftConfigServiceImpl.java index 1b8d0e88..4234a178 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcGiftConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcGiftConfigServiceImpl.java @@ -2,10 +2,12 @@ package com.hzs.activity.wares.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hzs.activity.declaration.service.IAcDeclarationGiftRecordService; import com.hzs.activity.wares.mapper.AcGiftConfigMapper; import com.hzs.activity.wares.service.IAcGiftConfigService; import com.hzs.common.domain.activity.base.AcGiftConfig; import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; @@ -20,12 +22,19 @@ import java.util.stream.Collectors; @Service public class AcGiftConfigServiceImpl extends ServiceImpl implements IAcGiftConfigService { + @Autowired + private IAcDeclarationGiftRecordService iAcDeclarationGiftRecordService; + @Override public Map> queryListByRuleIdList(List ruleIdList, Integer pkCountry) { // 返回数据map Map> resultMap = new HashMap<>(); List acGiftConfigExtList = baseMapper.queryListByRuleIdList(ruleIdList, pkCountry); + List configExts = iAcDeclarationGiftRecordService.queryListByRuleIdList(ruleIdList, pkCountry); + if (CollectionUtil.isNotEmpty(configExts)) { + acGiftConfigExtList.addAll(configExts); + } if (CollectionUtil.isNotEmpty(acGiftConfigExtList)) { resultMap = acGiftConfigExtList.stream().collect(Collectors.groupingBy(AcGiftConfigExt::getPkRuleId)); }