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

@@ -1,11 +1,7 @@
 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;
 
 /**
  * <p>
@@ -17,5 +13,4 @@ import java.util.List;
  */
 public interface AcDeclarationGiftDetailMapper extends BaseMapper<AcDeclarationGiftDetail> {
 
-    List<AcDeclarationProductParam> listByPKRuleId(@Param("pkId") Long pkId);
 }

bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationProductParam.java

@@ -14,10 +14,6 @@ public class AcDeclarationProductParam {
      */
     private Integer pkProduct;
 
-    /**
-     * 产品名称
-     */
-    private String productName;
     /**
      * 产品规格（逗号分隔）
      */

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

@@ -1,11 +1,8 @@
 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;
-
 /**
  * <p>
  *  服务类
@@ -16,5 +13,4 @@ import java.util.List;
  */
 public interface IAcDeclarationGiftDetailService extends IService<AcDeclarationGiftDetail> {
 
-    List<AcDeclarationProductParam> listByPKRuleId(Long pkId);
 }

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

@@ -31,7 +31,6 @@ 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;
@@ -67,9 +66,6 @@ public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl<AcDeclaratio
     @Autowired
     private IAcDeclarationGiftDetailService iAcDeclarationGiftDetailService;
 
-    @Autowired
-    private IBdProductService iBdProductService;
-
     @Override
     public AjaxResult getDetail(Integer pkId) {
         AcBaseConfig baseConfig = baseConfigService.getById(pkId);
@@ -81,7 +77,12 @@ public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl<AcDeclaratio
         ArrayList<AcDeclarationConfigParam> acDeclarationConfigParams = new ArrayList<>();
         list.forEach(item->{
             AcDeclarationConfigParam acDeclarationConfigParam = BeanUtil.copyProperties(item, AcDeclarationConfigParam.class);
-            List<AcDeclarationProductParam> declarationConfigParams = iAcDeclarationGiftDetailService.listByPKRuleId(item.getPkId());
+            List<AcDeclarationGiftDetail> declarationGiftDetails = iAcDeclarationGiftDetailService.list(new LambdaQueryWrapper<AcDeclarationGiftDetail>()
+                    .eq(AcDeclarationGiftDetail::getPkRuleId, item.getPkId())
+                    .eq(AcDeclarationGiftDetail::getDelFlag, 0));
+            List<AcDeclarationProductParam> declarationConfigParams = declarationGiftDetails.stream()
+                    .map(i -> BeanUtil.copyProperties(i, AcDeclarationProductParam.class))
+                    .collect(Collectors.toList());
             acDeclarationConfigParam.setAcDeclarationProductParamList(declarationConfigParams);
             acDeclarationConfigParams.add(acDeclarationConfigParam);
         });

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

@@ -2,14 +2,10 @@ 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;
-
 /**
  * <p>
  *  服务实现类
@@ -21,8 +17,4 @@ import java.util.List;
 @Service
 public class AcDeclarationGiftDetailServiceImpl extends ServiceImpl<AcDeclarationGiftDetailMapper, AcDeclarationGiftDetail> implements IAcDeclarationGiftDetailService {
 
-    @Override
-    public List<AcDeclarationProductParam> listByPKRuleId(Long pkId) {
-        return baseMapper.listByPKRuleId(pkId);
-    }
 }

bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java

@@ -499,7 +499,6 @@ public class BdProductController extends BaseController {
         productParams.setIsOceanTrans(productExtend.getIsOceanTrans());
         productParams.setSort(productExtend.getSort());
         productParams.setIsPutOn(productExtend.getIsPutOn());
-        productParams.setDeliveryQuantity(productExtend.getDeliveryQuantity());
         LambdaQueryWrapper<BdProductSpecs> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BdProductSpecs::getPkProduct, productId);
         List<Integer> pkSpecsType = new ArrayList<>();

bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftDetailMapper.xml

@@ -28,16 +28,5 @@
         PK_COUNTRY,
         PK_ID, PK_RULE_ID, PK_PRODUCT, SPECS_NAME, SPECS_NAME_ID, QUANTITY
     </sql>
-    <select id="listByPKRuleId" resultType="com.hzs.activity.declaration.param.AcDeclarationProductParam">
-        SELECT
-            adgd.*,
-            bp.PRODUCT_NAME
-        FROM
-            AC_DECLARATION_GIFT_DETAIL adgd
-                LEFT JOIN BD_PRODUCT bp ON adgd.PK_PRODUCT = bp.PK_ID
-        WHERE
-            adgd.PK_RULE_ID = #{ pkId }
-          AND adgd.DEL_FLAG = 0
-    </select>
 
 </mapper>