## 商品列表导出优化；调整部分注释；

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java

@@ -115,8 +115,6 @@ public class BdWaresController extends BaseController {
         waresParams.setPkCountry(SecurityUtils.getPkCountry());
         List<WaresVo> resultList = waresService.selectByWaresInfo(waresParams);
         if (CollectionUtil.isNotEmpty(resultList)) {
-            R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
-
             resultList.parallelStream().forEach(waresVo -> {
                 WaresAuthorityVo waresAuthorityVo = waresService.getWaresAuthorityFirst(waresVo.getPkWares());
                 if (waresAuthorityVo != null) {
@@ -130,10 +128,6 @@ public class BdWaresController extends BaseController {
                 if (waresVo.getIsMakerGift() != null) {
                     waresVo.setIsMakerGiftVal(EWaresType.getEnumByValue(waresVo.getIsMakerGift()).getLabel());
                 }
-                if (null != waresVo.getMakerIncome()) {
-                    // 处理发起人收益
-                    waresVo.setMakerIncome(waresVo.getMakerIncome().multiply(currencyDto.getData().getInExchangeRate()));
-                }
             });
         }
         return getDataTable(resultList);
@@ -149,7 +143,6 @@ public class BdWaresController extends BaseController {
         List<WaresVo> resultList = waresService.selectByWaresInfo(waresParams);
 
         if (CollectionUtil.isNotEmpty(resultList)) {
-            R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
             // 获取需要翻译的枚举翻译
             Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(ESpecialArea.values(), EYesNo.values(), ESupplyWay.values(), EPresaleStatus.values());
 
@@ -186,10 +179,6 @@ public class BdWaresController extends BaseController {
                         waresVo.setIsMakerGiftVal(EWaresType.getEnumByValue(waresVo.getIsMakerGift()).getLabel());
                     }
                 }
-                if (null != waresVo.getMakerIncome()) {
-                    // 处理发起人收益
-                    waresVo.setMakerIncome(waresVo.getMakerIncome().multiply(currencyDto.getData().getInExchangeRate()));
-                }
             });
         }
         ExcelUtil<WaresVo> util = new ExcelUtil<>(WaresVo.class);
@@ -653,7 +642,7 @@ public class BdWaresController extends BaseController {
         }
         if (wares.getSpecialArea() == ESpecialArea.REPURCHASE_AREA.getValue()) {
             if (wares.getWaresRangeList() == null || wares.getWaresRangeList().size() == 0) {
-                return AjaxResult.error("极差明细不能为空");
+                return AjaxResult.error("级差明细不能为空");
             }
         }
 
@@ -677,7 +666,6 @@ public class BdWaresController extends BaseController {
         }
         wares.setSort(0);
         waresService.saveWares(wares, userTokenService.getLoginUser());
-        //   waresService.saveWaresModifyRecord(wares, userTokenService.getLoginUser(),EModifyRecordType.WARES_ADD.getValue());
         return AjaxResult.success(wares.getWaresCode());
     }
 

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecsSkuMapper.java

@@ -14,9 +14,6 @@ import java.util.Set;
 
 /**
  * 规格sku表 Mapper 接口
- *
- * @author hzs
- * @since 2022-09-09
  */
 public interface BdWaresSpecsSkuMapper extends BaseMapper<BdWaresSpecsSku> {
 
@@ -25,9 +22,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper<BdWaresSpecsSku> {
      *
      * @param specialArea 专区
      * @param waresCode   商品编号
-     * @return: List<BdWaresSpecsSkuExt>
-     * @Author: sui q
-     * @Date: 2022/9/19 11:21
      */
     List<BdWaresSpecsSkuExt> queryWaresSpecsSku(@Param("specialArea") Integer specialArea,
                                                 @Param("waresCode") String waresCode);
@@ -37,8 +31,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper<BdWaresSpecsSku> {
      *
      * @param pkSkuId sku主键
      * @return: List<BdWaresSpecsSku>
-     * @Author: sui q
-     * @Date: 2023/1/13 15:25
      */
     List<BdWaresSpecsSkuExt> queryWaresSpecsNameSku(@Param("pkSkuIdList") Set<Integer> pkSkuId);
 
@@ -47,8 +39,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper<BdWaresSpecsSku> {
      *
      * @param cuWaresItemsParams 专区
      * @return: SpecsSkuParam
-     * @Author: sui q
-     * @Date: 2022/9/19 16:26
      */
     BdWaresSpecsSkuExt queryWaresDetailSkuBySpecs(@Param("cuWaresItemsParams") CuWaresItemsParams cuWaresItemsParams);
 
@@ -85,9 +75,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper<BdWaresSpecsSku> {
 
     /*
      * @description: 查询商品封装为返回到会员端商品信息
-     * @author: sui q
-     * @date: 2023/5/10 19:57
-     * @param: null null
      **/
     WaresItemVo selectWaresItemsVO(@Param("specialArea") Integer specialArea, @Param("waresCode") String waresCode,
                                    @Param("productGroup") List<ProductGroup> productGroup);
@@ -118,14 +105,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper<BdWaresSpecsSku> {
      */
     List<BdWaresSpecsSkuExt> queryWaresSpecsRangeSku(@Param("specialArea") Integer specialArea, @Param("waresCode") String waresCode, @Param("pkRange") Integer pkRange);
 
-    /**
-     * 查询SKU价格等信息
-     *
-     * @param skuIdList skuID列表
-     * @return
-     */
-    List<BdWaresSpecsSkuExt> queryWaresSpecsSkuList(@Param("skuIdList") List<Long> skuIdList);
-
     /**
      * 根据商品id查询规格价格最小值 排除赠品
      *

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresDetailParams.java

@@ -1,51 +1,36 @@
 package com.hzs.sale.wares.param;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.hzs.common.core.web.domain.BaseEntity;
-import com.hzs.common.domain.sale.wares.BdWaresSpecs;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-import java.util.List;
+@EqualsAndHashCode(callSuper = true)
-
-/**
- * @Description:
- * @Author: yuhui
- * @Time: 2022/9/19 13:57
- * @Classname: WaresDetailParams
- * @PackageName: com.hzs.sale.wares.controller.manage.params
- */
 @Data
 public class WaresDetailParams extends BaseEntity {
 
     /**
      * 主键
      */
-
     private Integer pkId;
 
     /**
      * 主表主键
      */
-
     private Integer pkWares;
 
     /**
      * 产品主键
      */
-
     private Integer pkProduct;
 
     /**
      * 数量 文档为number 但是number为关键字
      */
-
     private Integer quantity;
 
     /**
      * 是否赠品（销售状态 ）
      */
-
     private Integer isGift;
 
     /**
@@ -60,11 +45,6 @@ public class WaresDetailParams extends BaseEntity {
     /**
      * 封面主图
      */
-
     private String cover;
 
-
-
-
-
 }

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java

@@ -9,13 +9,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-/**
- * @Description:
- * @Author: yuhui
- * @Time: 2022/9/9 14:14
- * @Classname: WaresParams
- * @PackageName: com.hzs.sale.wares.controller.manage.params
- */
 @Data
 public class WaresParams implements Serializable {
     /**

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresSpecsSkuParams.java

@@ -19,7 +19,6 @@ public class WaresSpecsSkuParams {
 
     private Integer pkProduct;
 
-
     /**
      * 产品价格
      */
@@ -46,7 +45,6 @@ public class WaresSpecsSkuParams {
     private BigDecimal assAchieve;
 
     /**
-     * /**
      * 规格明细表
      */
     private List<BdWaresSpecs> waresSpecsList;

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresDetailService.java

@@ -1,12 +1,9 @@
 package com.hzs.sale.wares.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hzs.common.domain.member.base.CuMember;
 import com.hzs.common.domain.sale.ext.BdWaresDetailExt;
 import com.hzs.common.domain.sale.wares.BdWaresDetail;
-import com.hzs.common.domain.scm.ic.IcAvailableNum;
 import com.hzs.sale.order.param.OrderItemsParam;
-import com.hzs.sale.product.vo.WaresDetailVo;
 import com.hzs.sale.wares.param.CuProductParams;
 import com.hzs.sale.wares.vo.WaresProductDetailVo;
 

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresSpecsSkuService.java

@@ -16,9 +16,6 @@ import java.util.Set;
 
 /**
  * 规格sku表 服务类
- *
- * @author hzs
- * @since 2022-09-09
  */
 public interface IBdWaresSpecsSkuService extends IService<BdWaresSpecsSku> {
 
@@ -29,27 +26,16 @@ public interface IBdWaresSpecsSkuService extends IService<BdWaresSpecsSku> {
      * @param waresCode     商品编号
      * @param loginMemberId 登录用户主键
      * @param pkCountry     前端传递结算国（）
-     * @return: List<BdWaresSpecsSkuExt>
-     * @Author: sui q
-     * @Date: 2022/9/19 11:21
      */
     CuWaresParams queryWaresSpecsSku(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry);
 
     /**
-     * @description: 购物车查询数量专用
+     * 购物车查询数量专用
-     * @author: zhang jing
-     * @date: 2024/3/28 10:41
-     * @param: [specialArea, waresCode, loginMemberId, pkCountry]
-     * @return: com.hzs.sale.wares.param.CuWaresParams
      **/
     CuWaresParams queryWaresSpecsSkuCount(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry);
 
     /**
-     * @description: 查询商品sku信息购物车专用
+     * 查询商品sku信息购物车专用
-     * @author: zhang jing
-     * @date: 2024/3/28 14:35
-     * @param: [specialArea, waresCode, loginMemberId, pkCountry]
-     * @return: com.hzs.sale.wares.param.CuWaresParams
      **/
     CuWaresParams queryWaresSpecsSkuShopping(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry);
 
@@ -59,8 +45,6 @@ public interface IBdWaresSpecsSkuService extends IService<BdWaresSpecsSku> {
      *
      * @param cuWaresItemsParams 明细参数，产品明细，
      * @return: SpecsSkuParam
-     * @Author: sui q
-     * @Date: 2022/9/19 16:26
      */
     SpecsSkuParam queryWaresDetailSkuBySpecs(CuWaresItemsParams cuWaresItemsParams);
 
@@ -97,9 +81,6 @@ public interface IBdWaresSpecsSkuService extends IService<BdWaresSpecsSku> {
 
     /*
      * @description: 查询商品封装为返回到会员端商品信息
-     * @author: sui q
-     * @date: 2023/5/10 19:57
-     * @param: null null
      **/
     WaresItemVo selectWaresItemsVO(Long pkMember, Integer pkCountry, Integer specialArea, String waresCode, List<ProductGroup> productGroup, Integer quantity);
 
@@ -127,22 +108,4 @@ public interface IBdWaresSpecsSkuService extends IService<BdWaresSpecsSku> {
      */
     BdWaresSpecsSkuExt selectByPkWaresSpecsSku(Integer pkWaresSpecsSku);
 
-    /**
-     * 查询SKU价格等信息
-     *
-     * @param skuIdList skuID列表
-     * @return
-     */
-    Map<Long, BdWaresSpecsSkuExt> queryWaresSpecsSkuList(List<Long> skuIdList);
-
-    /**
-     * 根据sku主键查询规格名称
-     *
-     * @param pkSkuId sku主键
-     * @return: List<BdWaresSpecsSku>
-     * @Author: sui q
-     * @Date: 2023/1/13 15:25
-     */
-    List<BdWaresSpecsSkuExt> queryWaresSpecsNameSku(Set<Integer> pkSkuId);
-
 }

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java

@@ -25,13 +25,6 @@ import java.util.Map;
 @Service
 public class BdWaresDetailServiceImpl extends ServiceImpl<BdWaresDetailMapper, BdWaresDetail> implements IBdWaresDetailService {
 
-    /**
-     * 根据条件查询商品信息
-     *
-     * @param specialArea 专区
-     * @param transType   运输方式
-     * @return: List<BdWaresExt>
-     */
     @Override
     public List<BdWaresDetailExt> queryWaresDetailByCondition(Integer specialArea, Integer transType, List<OrderItemsParam> orderItemsParams) {
         List<BdWaresDetailExt> bdWaresDetailExtList = new ArrayList<>();
@@ -66,34 +59,16 @@ public class BdWaresDetailServiceImpl extends ServiceImpl<BdWaresDetailMapper, B
         return bdWaresDetailExtList;
     }
 
-    /**
-     * 查询商品编号
-     *
-     * @param waresCode
-     * @return
-     */
     @Override
     public List<CuProductParams> selectByWaresCode(String waresCode, Integer specialArea, Integer isGift) {
         return baseMapper.selectByWaresCode(waresCode, specialArea, isGift);
     }
 
-    /**
-     * 根据商品主键查询
-     *
-     * @param pkWares
-     * @return
-     */
     @Override
     public List<BdWaresDetailExt> selectByPkWares(Integer pkWares) {
         return baseMapper.selectByPkWares(pkWares);
     }
 
-    /**
-     * 商品下产品查询
-     *
-     * @param pkWares
-     * @return
-     */
     @Override
     public List<WaresProductDetailVo> selectByList(Integer pkWares) {
         return baseMapper.selectByList(pkWares);

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java

@@ -46,50 +46,43 @@ import java.util.stream.Collectors;
 
 /**
  * 规格sku表 服务实现类
- *
- * @author hzs
- * @since 2022-09-09
  */
 @Service
 public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMapper, BdWaresSpecsSku> implements IBdWaresSpecsSkuService {
 
     @Autowired
-    private IBdWaresSpecsRelationService waresSpecsRelationService;
+    private IBdWaresSpecsRelationService iBdWaresSpecsRelationService;
     @Autowired
-    private IBdWaresLabelService waresLabelService;
+    private IBdWaresLabelService iBdWaresLabelService;
     @Autowired
-    private IBdWaresDetailService waresDetailService;
+    private IBdWaresDetailService iBdWaresDetailService;
     @Autowired
-    private IBdWaresRangeService bdWaresRangeService;
+    private IBdWaresRangeService iBdWaresRangeService;
     @Autowired
-    private ISaOrderService saOrderService;
+    private ISaOrderService iSaOrderService;
 
     @DubboReference
-    ICurrencyServiceApi currencyServiceApi;
+    ICurrencyServiceApi iCurrencyServiceApi;
     @DubboReference
-    IRangeServiceApi rangeServiceApi;
+    IRangeServiceApi iRangeServiceApi;
     @DubboReference
-    IMemberServiceApi memberServiceApi;
+    IMemberServiceApi iMemberServiceApi;
     @DubboReference
-    IAwardsServiceApi awardsServiceApi;
+    IAwardsServiceApi iAwardsServiceApi;
     @DubboReference
-    IGradeServiceApi gradeServiceApi;
+    IGradeServiceApi iGradeServiceApi;
 
     @Override
     public CuWaresParams queryWaresSpecsSku(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry) {
         List<BdWaresSpecsSkuExt> bdWaresSpecsSkuExtList;
 
-        R<CuMember> memberDate = memberServiceApi.getMember(loginMemberId);
+        R<CuMember> memberDate = iMemberServiceApi.getMember(loginMemberId);
         CuMember cuMember = memberDate.getData();
-        if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
+        if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea
+                || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
             int level = cuMember.getPkSettleGrade();
             int rangeType = ERangeType.GRADE.getValue();
-//            BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
+            RangeDTO rangeDTO = iRangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData();
-//            if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) {
-//                level = cuMember.getPkAwards();
-//                rangeType = ERangeType.AWARDS.getValue();
-//            }
-            RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData();
             if (rangeDTO == null) {
                 return new CuWaresParams();
             }
@@ -98,8 +91,9 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
         } else {
             bdWaresSpecsSkuExtList = baseMapper.queryWaresSpecsSku(specialArea, waresCode);
         }
+
         if (bdWaresSpecsSkuExtList.size() > 0) {
-            R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+            R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
 
             Set<Integer> pkSkuIdList = new HashSet<>();
             bdWaresSpecsSkuExtList.forEach(bdWaresSpecsSkuExt ->
@@ -120,7 +114,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
             //查询标签合集
             BdWaresLabel waresLabel = new BdWaresLabel();
             waresLabel.setPkWares(bdWaresSpecsSkuExtList.get(0).getPkWares());
-            List<BdLabelExt> labelList = waresLabelService.selectByList(waresLabel);
+            List<BdLabelExt> labelList = iBdWaresLabelService.selectByList(waresLabel);
             // 保证标签
             List<BdLabel> ensureLabelList = new ArrayList<>();
             // 卖点标签
@@ -149,12 +143,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
 
             List<CuWaresItemsParams> cuWaresItemsParamsList = setUpWaresItemsParams(bdWaresSpecsSkuExtList, specsNameMap, currency.getData().getInExchangeRate());
             // 前台传递结算国 跨国报单计算价格使用
-
             R<CurrencyDTO> kgCurrency = null;
             if (pkCountry != null) {
-                kgCurrency = currencyServiceApi.getCurrency(pkCountry);
+                kgCurrency = iCurrencyServiceApi.getCurrency(pkCountry);
             }
-            List<CuProductParams> productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null);
+            List<CuProductParams> productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null);
             List<CuProductParams> productParamsResultList = new ArrayList<>();
             for (CuProductParams cuProductParams : productParams) {
                 List<CuWaresItemsParams> list = new ArrayList<>();
@@ -189,7 +182,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
             if (EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
                 // 乐学复购，价格根据等级固定
                 // 等级
-                R<List<GradeDTO>> gradeDTO = gradeServiceApi.queryGradeList(pkCountry);
+                R<List<GradeDTO>> gradeDTO = iGradeServiceApi.queryGradeList(pkCountry);
                 List<GradeDTO> gradeList = gradeDTO.getData();
                 Map<Integer, GradeDTO> gradeMap = gradeList.stream().collect(Collectors.toMap(GradeDTO::getGradeValue, Function.identity()));
 
@@ -233,12 +226,12 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
 
         if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea
                 || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
-            R<CuMember> memberDate = memberServiceApi.getMember(loginMemberId);
+            R<CuMember> memberDate = iMemberServiceApi.getMember(loginMemberId);
             CuMember cuMember = memberDate.getData();
 
             int level = cuMember.getPkSettleGrade();
             int rangeType = ERangeType.GRADE.getValue();
-            RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData();
+            RangeDTO rangeDTO = iRangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData();
             if (rangeDTO == null) {
                 return new CuWaresParams();
             }
@@ -251,10 +244,10 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
             Map<Integer, String> specsNameMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdWaresSpecsSkuExtList.size()));
             CuWaresParams cuWaresParams = BeanUtil.copyProperties(bdWaresSpecsSkuExtList.get(0), CuWaresParams.class);
 
-            R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+            R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
             List<CuWaresItemsParams> cuWaresItemsParamsList = setUpWaresItemsParams(bdWaresSpecsSkuExtList, specsNameMap, currency.getData().getInExchangeRate());
             // 前台传递结算国 跨国报单计算价格使用
-            List<CuProductParams> productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null);
+            List<CuProductParams> productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null);
             List<CuProductParams> productParamsResultList = new ArrayList<>();
             for (CuProductParams cuProductParams : productParams) {
                 List<CuWaresItemsParams> list = new ArrayList<>();
@@ -291,22 +284,22 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
      **/
     @Override
     public CuWaresParams queryWaresSpecsSkuShopping(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry) {
-        CuMember cuMember = memberServiceApi.getMember(loginMemberId).getData();
+        CuMember cuMember = iMemberServiceApi.getMember(loginMemberId).getData();
 
         // 获取货币信息
-        R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+        R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
 
         List<BdWaresSpecsSkuExt> bdWaresSpecsSkuExtList;
 
         if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
             int level = cuMember.getPkSettleGrade();
             int rangeType = ERangeType.GRADE.getValue();
-//            BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
+//            BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
 //            if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) {
 //                level = cuMember.getPkAwards();
 //                rangeType = ERangeType.AWARDS.getValue();
 //            }
-            RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData();
+            RangeDTO rangeDTO = iRangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData();
             if (rangeDTO == null) {
                 return new CuWaresParams();
             }
@@ -337,7 +330,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
         // 处理跨国报单价格
         R<CurrencyDTO> kgCurrency;
         if (pkCountry != null && !pkCountry.equals(SecurityUtils.getPkCountry())) {
-            kgCurrency = currencyServiceApi.getCurrency(pkCountry);
+            kgCurrency = iCurrencyServiceApi.getCurrency(pkCountry);
             BigDecimal inExchangeRate = cuWaresParams.getInExchangeRate();
             BigDecimal kgInExchangeRate = kgCurrency.getData().getInExchangeRate();
             cuWaresItemsParamsList.forEach(item -> {
@@ -347,7 +340,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
         }
 
         // 获取商品详情
-        List<CuProductParams> productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null);
+        List<CuProductParams> productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null);
         List<CuProductParams> productParamsResultList = productParams.stream()
                 .peek(param -> {
                     List<CuWaresItemsParams> list = cuWaresItemsParamsList.stream()
@@ -361,7 +354,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
         // 处理特殊情况下的价格修改
         if (EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
             // 获取等级信息
-            Map<Integer, GradeDTO> gradeMap = gradeServiceApi.queryGradeList(pkCountry).getData().stream()
+            Map<Integer, GradeDTO> gradeMap = iGradeServiceApi.queryGradeList(pkCountry).getData().stream()
                     .collect(Collectors.toMap(GradeDTO::getGradeValue, Function.identity()));
             BigDecimal price;
             if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.S_VIP.getValue()).getPkId())) {
@@ -391,11 +384,6 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
 
     /**
      * 设置返回到前台的商品明细表
-     *
-     * @param bdWaresSpecsSkuExtList 商品待sku
-     * @return: List<CuWaresItemsParams>
-     * @Author: sui q
-     * @Date: 2022/9/27 10:51
      */
     private List<CuWaresItemsParams> setUpWaresItemsParams(List<BdWaresSpecsSkuExt> bdWaresSpecsSkuExtList, Map<Integer, String> specsNameMap, BigDecimal inExchangeRate) {
         List<CuWaresItemsParams> cuWaresItemsParamsList = new ArrayList<>();
@@ -524,22 +512,22 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
             waresItemVo.getWaresItemsParamList().forEach(waresItemWaresInfo -> {
                 waresDetailExtMap.put(waresItemWaresInfo.getPkWaresDetail().toString() + waresItemWaresInfo.getPkWaresSpecsSku(), waresItemWaresInfo);
                 // 设置规格值 名称拼接
-                List<BdWaresSpecsRelationExt> waresSpecsRelationExts = waresSpecsRelationService.selectByWaresSpecsSku(waresItemWaresInfo.getPkWaresSpecsSku());
+                List<BdWaresSpecsRelationExt> waresSpecsRelationExts = iBdWaresSpecsRelationService.selectByWaresSpecsSku(waresItemWaresInfo.getPkWaresSpecsSku());
                 Set<String> specsNames = waresSpecsRelationExts.stream().map(BdWaresSpecsRelationExt::getSpecsName).collect(Collectors.toSet());
                 waresItemWaresInfo.setSkuInfo(StringUtils.join(specsNames, ","));
             });
 
             if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
-                CuMember cuMember = saOrderService.getCuMemberByKey(pkMember);
+                CuMember cuMember = iSaOrderService.getCuMemberByKey(pkMember);
                 int level = cuMember.getPkSettleGrade();
                 int rangeType = ERangeType.GRADE.getValue();
-//                BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
+//                BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
 //                if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) {
 //                    level = cuMember.getPkAwards();
 //                    rangeType = ERangeType.AWARDS.getValue();
 //                }
                 List<Integer> pkWaresSpecsSku = productGroup.stream().map(ProductGroup::getPkSkuId).collect(Collectors.toList());
-                List<BdWaresRange> bdWaresRangeList = bdWaresRangeService.querySkuWaresRangeByCondition(cuMember.getPkSettleCountry(), rangeType, level, pkWaresSpecsSku);
+                List<BdWaresRange> bdWaresRangeList = iBdWaresRangeService.querySkuWaresRangeByCondition(cuMember.getPkSettleCountry(), rangeType, level, pkWaresSpecsSku);
                 bdWaresRangeList.forEach(bdWaresRange -> {
                     String key = bdWaresRange.getPkWaresDetail().toString() + bdWaresRange.getPkWaresSpecsSku();
                     if (waresDetailExtMap.containsKey(key)) {
@@ -559,12 +547,12 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
             // 复购乐学专区 无奖衔 或者 是 vip 或者是 svip 价格改为2680
             if (EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
                 // 等级
-                R<List<GradeDTO>> gradeDTO = gradeServiceApi.queryGradeList(pkCountry);
+                R<List<GradeDTO>> gradeDTO = iGradeServiceApi.queryGradeList(pkCountry);
                 List<GradeDTO> gradeList = gradeDTO.getData();
                 Map<Integer, GradeDTO> gradeMap = gradeList.stream().collect(Collectors.toMap(GradeDTO::getGradeValue, Function.identity()));
 
                 // 查询会员信息
-                R<CuMember> memberDate = memberServiceApi.getMember(pkMember);
+                R<CuMember> memberDate = iMemberServiceApi.getMember(pkMember);
                 CuMember cuMemberDate = memberDate.getData();
 
                 // 价格
@@ -582,11 +570,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
             }
 
             // 前台传递结算国 跨国报单计算价格使用
-            R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+            R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
             if (pkCountry != null) {
                 // 当登陆人的结算国和前端结算国不一致 即为跨国报单
                 if (!pkCountry.equals(SecurityUtils.getPkCountry())) {
-                    R<CurrencyDTO> kgCurrency = currencyServiceApi.getCurrency(pkCountry);
+                    R<CurrencyDTO> kgCurrency = iCurrencyServiceApi.getCurrency(pkCountry);
 
                     BigDecimal price = waresItemVo.getPrice();
                     waresItemVo.setPrice(price.multiply(currency.getData().getInExchangeRate()).divide(kgCurrency.getData().getInExchangeRate(), 2, BigDecimal.ROUND_HALF_UP));
@@ -638,19 +626,4 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
         return baseMapper.selectByPkWaresSpecsSku(pkWaresSpecsSku);
     }
 
-    @Override
-    public Map<Long, BdWaresSpecsSkuExt> queryWaresSpecsSkuList(List<Long> skuIdList) {
-        Map<Long, BdWaresSpecsSkuExt> resultMap = new HashMap<>();
-
-        List<BdWaresSpecsSkuExt> list = baseMapper.queryWaresSpecsSkuList(skuIdList);
-        for (BdWaresSpecsSkuExt waresSpecsSku : list) {
-            resultMap.put(waresSpecsSku.getPkId().longValue(), waresSpecsSku);
-        }
-        return resultMap;
-    }
-
-    @Override
-    public List<BdWaresSpecsSkuExt> queryWaresSpecsNameSku(Set<Integer> pkSkuId) {
-        return baseMapper.queryWaresSpecsNameSku(pkSkuId);
-    }
 }

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresVo.java

@@ -83,19 +83,19 @@ public class WaresVo {
      * 商品权限类型
      */
     private Integer authorityType;
-    @Excel(name = "可见类型")
+//    @Excel(name = "可见类型")
     private String authorityTypeVal;
 
     /**
      * 团队编号
      */
-    @Excel(name = "团队编号")
+//    @Excel(name = "团队编号")
     private String memberCode;
 
     /**
      * 团队姓名
      */
-    @Excel(name = "团队姓名")
+//    @Excel(name = "团队姓名")
     private String memberName;
 
 

bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml

@@ -108,8 +108,13 @@
 
     <select id="selectByWaresCode" resultType="com.hzs.sale.wares.param.CuProductParams">
         select
-        p.cover,p.PK_ID productId ,p.PRODUCT_CODE productCode ,p.PRODUCT_NAME productName,wd.QUANTITY quantity,
+        p.cover,
-        be.is_maker_gift isMakerGift,wd.IS_GIFT isGift
+        p.PK_ID productId ,
+        p.PRODUCT_CODE productCode ,
+        p.PRODUCT_NAME productName,
+        be.is_maker_gift isMakerGift,
+        wd.QUANTITY quantity,
+        wd.IS_GIFT isGift
         from BD_WARES_DETAIL wd
         left join BD_PRODUCT p on p.PK_ID = wd.PK_PRODUCT
         inner join BD_WARES w on w.PK_ID = wd.PK_WARES

bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsSkuMapper.xml

@@ -95,19 +95,6 @@
         bw.VIDEO_URL,
         bw.AFTER_GUARANTEE,
         bk.ASS_ACHIEVE
-        <!-- 2024.05.24 查询会有问题，先注释掉，后续有问题再放开处理
-                       (
-                           select listagg(bp.PRODUCT_NAME, ',') within
-                group (order by bp.pk_id)
-                from BD_WARES_DETAIL wd
-                    left join BD_PRODUCT bp
-                on bp.PK_ID = wd.PK_PRODUCT
-                where wd.PK_WARES = bw.PK_ID
-                  and wd.DEL_FLAG = '0'
-                  and wd.IS_GIFT = '0'
-                  and bp.DEL_FLAG=0
-                    ) giftNames
-                    -->
         , be.ARRIVAL_TIME
         , be.CREATION_TIME
         , be.PRE_SALE_STATUS
@@ -305,19 +292,6 @@
         bw.VIDEO_URL,
         bw.AFTER_GUARANTEE,
         bk.ASS_ACHIEVE
-        <!-- 2024.05.24 查询会有问题，先注释掉，后续有问题再放开处理
-        (
-            select listagg(bp.PRODUCT_NAME, ',') within
- group (order by bp.pk_id)
- from BD_WARES_DETAIL wd
-     left join BD_PRODUCT bp
- on bp.PK_ID = wd.PK_PRODUCT
- where wd.PK_WARES = bw.PK_ID
-   and wd.DEL_FLAG = '0'
-   and wd.IS_GIFT = '0'
-   and bp.DEL_FLAG=0
-     ) giftNames
-     -->
         , be.ARRIVAL_TIME
         , be.CREATION_TIME
         , be.PRE_SALE_STATUS
@@ -369,23 +343,4 @@
         </foreach>
     </select>
 
-    <!-- 查询SKU价格等信息 -->
-    <select id="queryWaresSpecsSkuList" resultType="com.hzs.common.domain.sale.ext.BdWaresSpecsSkuExt">
-        select bwss.pk_id,
-        bwd.pk_product,
-        bwss.pk_wares_detail,
-        bwss.price,
-        bwss.achieve,
-        bwss.ass_achieve
-        from bd_wares_specs_sku bwss
-        left join BD_WARES_DETAIL bwd
-        on bwd.del_flag = 0
-        and bwd.pk_id = bwss.pk_wares_detail
-        where bwss.del_flag = 0
-        and bwss.pk_id in
-        <foreach collection="skuIdList" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
-    </select>
-
 </mapper>

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdUnit.java

@@ -11,12 +11,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * <p>
  * 单位配置表
- * </p>
- *
- * @author hzs
- * @since 2023-03-11
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java

@@ -14,9 +14,6 @@ import lombok.experimental.Accessors;
 
 /**
  * 商品发布
- *
- * @author hzs
- * @since 2022-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAuthority.java

@@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * <p>
  *
- * </p>
- *
- * @author hzs
- * @since 2022-09-09
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAuthorize.java

@@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * <p>
  * 商品用户权限配置
- * </p>
- *
- * @author hzs
- * @since 2023-09-06
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAwards.java

@@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * <p>
  * 商品奖衔配置
- * </p>
- *
- * @author hzs
- * @since 2023-08-24
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresDetail.java

@@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * <p>
  * 商品发布明细表
- * </p>
- *
- * @author hzs
- * @since 2022-09-09
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java

@@ -13,9 +13,6 @@ import org.apache.ibatis.type.JdbcType;
 
 /**
  * 商品发布扩展表
- *
- * @author hzs
- * @since 2022-09-09
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresGrade.java

@@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * <p>
  * 等级配置
- * </p>
- *
- * @author hzs
- * @since 2023-03-13
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresLabel.java

@@ -12,12 +12,7 @@ import lombok.experimental.Accessors;
 import java.util.List;
 
 /**
- * <p>
  * 商品标签表
- * </p>
- *
- * @author hzs
- * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresRange.java

@@ -12,12 +12,7 @@ import lombok.experimental.Accessors;
 import java.math.BigDecimal;
 
 /**
- * <p>
  * 极差明细表
- * </p>
- *
- * @author hzs
- * @since 2022-09-09
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecialPostage.java

@@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * <p>
  * 商品特殊邮费配置
- * </p>
- *
- * @author hzs
- * @since 2023-10-27
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecs.java

@@ -9,12 +9,7 @@ import lombok.*;
 import lombok.experimental.Accessors;
 
 /**
- * <p>
  * 规格明细表
- * </p>
- *
- * @author hzs
- * @since 2022-09-09
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsPack.java

@@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * <p>
  * 规格和包装
- * </p>
- *
- * @author hzs
- * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsRelation.java

@@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * <p>
  * 规格明细值
- * </p>
- *
- * @author hzs
- * @since 2022-09-09
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsSku.java

@@ -13,9 +13,6 @@ import lombok.experimental.Accessors;
 
 /**
  * 规格sku表
- *
- * @author hzs
- * @since 2022-09-09
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -86,4 +83,10 @@ public class BdWaresSpecsSku extends BaseEntity {
     @TableField("RETAIL_PRICE")
     private BigDecimal retailPrice;
 
+    /**
+     * 新直销sku
+     */
+    @TableField("SKU_CODE")
+    private String skuCode;
+
 }