## 后台充值提货卡

bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java

@@ -25,5 +25,5 @@ public interface AcDeclarationGiftRecordMapper extends BaseMapper<AcDeclarationG
 
     AcDeclarationGiftRecord selectLastRecord();
 
-    List<AcGiftConfigExt> queryListByRuleList(@Param("pkDataId") Long pkDataId,@Param("pkCountry") Integer pkCountry);
+    List<AcGiftConfigExt> queryListByRuleList(@Param("pkDataId") List<Long> pkDataId,@Param("pkCountry") Integer pkCountry);
 }

bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java

@@ -23,5 +23,5 @@ public interface IAcDeclarationGiftRecordService extends IService<AcDeclarationG
 
     AcDeclarationGiftRecord selectLastRecord();
 
-    List<AcGiftConfigExt> queryListByRuleIdList(Long pkDataId, Integer pkCountry);
+    List<AcGiftConfigExt> queryListByRuleIdList(List<Long> pkDataId, Integer pkCountry);
 }

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<AcDeclaratio
     }
 
     @Override
-    public List<AcGiftConfigExt> queryListByRuleIdList(Long pkDataId, Integer pkCountry) {
+    public List<AcGiftConfigExt> queryListByRuleIdList(List<Long> pkDataId, Integer pkCountry) {
         return baseMapper.queryListByRuleList(pkDataId,pkCountry);
     }
 

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<AcGiftConfigExt> acGiftConfigExtList = iAcDeclarationGiftRecordService.queryListByRuleIdList(acPick.getPkDataId(),pkCountry);
+                List<AcGiftConfigExt> acGiftConfigExtList = iAcDeclarationGiftRecordService.queryListByRuleIdList(Collections.singletonList(acPick.getPkDataId()),pkCountry);
                 for (AcGiftConfigExt acGiftConfigExt : acGiftConfigExtList) {
                     // 处理提货产品明细
                     detailList.add(ApiPickDetailVO.builder()

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<AcPickExt> acPickExtList = iAcPickService.queryList(param, pkCountry);
-
         if (CollectionUtil.isNotEmpty(acPickExtList)) {
             // 活动规则ID列表
             List<Long> ruleIdList = acPickExtList.stream().filter(acPickQueryVO -> EPickType.PICK_PRODUCT.getValue() != acPickQueryVO.getPickType()).map(AcPickExt::getPkDataId).collect(Collectors.toList());

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;
 

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<AcPickMapper, AcPick> impleme
                 break;
             case DECLARATION_GIFT:
                 // 报单赠送列表
-                List<AcGiftConfigExt> acDecList = iAcDeclarationGiftRecordService.queryListByRuleIdList(acPick.getPkDataId(), pkCountry);
+                List<AcGiftConfigExt> acDecList = iAcDeclarationGiftRecordService.queryListByRuleIdList(Collections.singletonList(acPick.getPkDataId()), pkCountry);
                 for (AcGiftConfigExt acGiftConfigExt : acDecList) {
                     productList.add(PostageProductDTO.builder()
                             .productId(acGiftConfigExt.getPkProduct())

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<AcGiftConfigMapper, AcGiftConfig> implements IAcGiftConfigService {
 
+    @Autowired
+    private IAcDeclarationGiftRecordService iAcDeclarationGiftRecordService;
+
     @Override
     public Map<Long, List<AcGiftConfigExt>> queryListByRuleIdList(List<Long> ruleIdList, Integer pkCountry) {
         // 返回数据map
         Map<Long, List<AcGiftConfigExt>> resultMap = new HashMap<>();
 
         List<AcGiftConfigExt> acGiftConfigExtList = baseMapper.queryListByRuleIdList(ruleIdList, pkCountry);
+        List<AcGiftConfigExt> configExts = iAcDeclarationGiftRecordService.queryListByRuleIdList(ruleIdList, pkCountry);
+        if (CollectionUtil.isNotEmpty(configExts)) {
+            acGiftConfigExtList.addAll(configExts);
+        }
         if (CollectionUtil.isNotEmpty(acGiftConfigExtList)) {
             resultMap = acGiftConfigExtList.stream().collect(Collectors.groupingBy(AcGiftConfigExt::getPkRuleId));
         }