From a07f915c02081b7222430a1aefc6971e96277707 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 12 May 2025 15:29:12 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96=EF=BC=9B=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=B3=A8=E9=87=8A=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/manage/BdWaresController.java | 14 +-- .../wares/mapper/BdWaresSpecsSkuMapper.java | 21 ---- .../sale/wares/param/WaresDetailParams.java | 24 +--- .../com/hzs/sale/wares/param/WaresParams.java | 7 -- .../sale/wares/param/WaresSpecsSkuParams.java | 2 - .../wares/service/IBdWaresDetailService.java | 3 - .../service/IBdWaresSpecsSkuService.java | 41 +------ .../impl/BdWaresDetailServiceImpl.java | 25 ----- .../impl/BdWaresSpecsSkuServiceImpl.java | 105 +++++++----------- .../java/com/hzs/sale/wares/vo/WaresVo.java | 6 +- .../mapper/sale/wares/BdWaresDetailMapper.xml | 9 +- .../sale/wares/BdWaresSpecsSkuMapper.xml | 45 -------- .../hzs/common/domain/sale/wares/BdUnit.java | 5 - .../hzs/common/domain/sale/wares/BdWares.java | 3 - .../domain/sale/wares/BdWaresAuthority.java | 5 - .../domain/sale/wares/BdWaresAuthorize.java | 5 - .../domain/sale/wares/BdWaresAwards.java | 5 - .../domain/sale/wares/BdWaresDetail.java | 5 - .../domain/sale/wares/BdWaresExtend.java | 3 - .../domain/sale/wares/BdWaresGrade.java | 5 - .../domain/sale/wares/BdWaresLabel.java | 5 - .../domain/sale/wares/BdWaresRange.java | 5 - .../sale/wares/BdWaresSpecialPostage.java | 5 - .../domain/sale/wares/BdWaresSpecs.java | 5 - .../domain/sale/wares/BdWaresSpecsPack.java | 5 - .../sale/wares/BdWaresSpecsRelation.java | 7 +- .../domain/sale/wares/BdWaresSpecsSku.java | 9 +- 27 files changed, 61 insertions(+), 318 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java index 26193ce6..22ebd0c1 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java +++ b/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 resultList = waresService.selectByWaresInfo(waresParams); if (CollectionUtil.isNotEmpty(resultList)) { - R 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 resultList = waresService.selectByWaresInfo(waresParams); if (CollectionUtil.isNotEmpty(resultList)) { - R currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); // 获取需要翻译的枚举翻译 Map 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 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()); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecsSkuMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecsSkuMapper.java index e7e09cbd..2dd2441c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecsSkuMapper.java +++ b/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 { @@ -25,9 +22,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { * * @param specialArea 专区 * @param waresCode 商品编号 - * @return: List - * @Author: sui q - * @Date: 2022/9/19 11:21 */ List queryWaresSpecsSku(@Param("specialArea") Integer specialArea, @Param("waresCode") String waresCode); @@ -37,8 +31,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { * * @param pkSkuId sku主键 * @return: List - * @Author: sui q - * @Date: 2023/1/13 15:25 */ List queryWaresSpecsNameSku(@Param("pkSkuIdList") Set pkSkuId); @@ -47,8 +39,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { * * @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 { /* * @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); @@ -118,14 +105,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { */ List queryWaresSpecsRangeSku(@Param("specialArea") Integer specialArea, @Param("waresCode") String waresCode, @Param("pkRange") Integer pkRange); - /** - * 查询SKU价格等信息 - * - * @param skuIdList skuID列表 - * @return - */ - List queryWaresSpecsSkuList(@Param("skuIdList") List skuIdList); - /** * 根据商品id查询规格价格最小值 排除赠品 * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresDetailParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresDetailParams.java index 44c295f3..5d839a92 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresDetailParams.java +++ b/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; - -/** - * @Description: - * @Author: yuhui - * @Time: 2022/9/19 13:57 - * @Classname: WaresDetailParams - * @PackageName: com.hzs.sale.wares.controller.manage.params - */ +@EqualsAndHashCode(callSuper = true) @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; - - - - } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java index 5f13fffa..ec564a55 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java +++ b/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 { /** diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresSpecsSkuParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresSpecsSkuParams.java index 28b0ba67..f0e4677d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresSpecsSkuParams.java +++ b/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 waresSpecsList; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresDetailService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresDetailService.java index 771413cb..c849c3e4 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresDetailService.java +++ b/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; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresSpecsSkuService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresSpecsSkuService.java index 0daaadbd..7edff7b7 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresSpecsSkuService.java +++ b/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 { @@ -29,27 +26,16 @@ public interface IBdWaresSpecsSkuService extends IService { * @param waresCode 商品编号 * @param loginMemberId 登录用户主键 * @param pkCountry 前端传递结算国（） - * @return: List - * @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信息购物车专用 - * @author: zhang jing - * @date: 2024/3/28 14:35 - * @param: [specialArea, waresCode, loginMemberId, pkCountry] - * @return: com.hzs.sale.wares.param.CuWaresParams + * 查询商品sku信息购物车专用 **/ CuWaresParams queryWaresSpecsSkuShopping(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry); @@ -59,8 +45,6 @@ public interface IBdWaresSpecsSkuService extends IService { * * @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 { /* * @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, Integer quantity); @@ -127,22 +108,4 @@ public interface IBdWaresSpecsSkuService extends IService { */ BdWaresSpecsSkuExt selectByPkWaresSpecsSku(Integer pkWaresSpecsSku); - /** - * 查询SKU价格等信息 - * - * @param skuIdList skuID列表 - * @return - */ - Map queryWaresSpecsSkuList(List skuIdList); - - /** - * 根据sku主键查询规格名称 - * - * @param pkSkuId sku主键 - * @return: List - * @Author: sui q - * @Date: 2023/1/13 15:25 - */ - List queryWaresSpecsNameSku(Set pkSkuId); - } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java index c72a39de..e9b88e5c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java +++ b/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 implements IBdWaresDetailService { - /** - * 根据条件查询商品信息 - * - * @param specialArea 专区 - * @param transType 运输方式 - * @return: List - */ @Override public List queryWaresDetailByCondition(Integer specialArea, Integer transType, List orderItemsParams) { List bdWaresDetailExtList = new ArrayList<>(); @@ -66,34 +59,16 @@ public class BdWaresDetailServiceImpl extends ServiceImpl selectByWaresCode(String waresCode, Integer specialArea, Integer isGift) { return baseMapper.selectByWaresCode(waresCode, specialArea, isGift); } - /** - * 根据商品主键查询 - * - * @param pkWares - * @return - */ @Override public List selectByPkWares(Integer pkWares) { return baseMapper.selectByPkWares(pkWares); } - /** - * 商品下产品查询 - * - * @param pkWares - * @return - */ @Override public List selectByList(Integer pkWares) { return baseMapper.selectByList(pkWares); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java index 994b180b..d4dd6231 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java +++ b/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 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 bdWaresSpecsSkuExtList; - R memberDate = memberServiceApi.getMember(loginMemberId); + R 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(); -// 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(); } @@ -98,8 +91,9 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl 0) { - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); Set pkSkuIdList = new HashSet<>(); bdWaresSpecsSkuExtList.forEach(bdWaresSpecsSkuExt -> @@ -120,7 +114,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl labelList = waresLabelService.selectByList(waresLabel); + List labelList = iBdWaresLabelService.selectByList(waresLabel); // 保证标签 List ensureLabelList = new ArrayList<>(); // 卖点标签 @@ -149,12 +143,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl cuWaresItemsParamsList = setUpWaresItemsParams(bdWaresSpecsSkuExtList, specsNameMap, currency.getData().getInExchangeRate()); // 前台传递结算国 跨国报单计算价格使用 - R kgCurrency = null; if (pkCountry != null) { - kgCurrency = currencyServiceApi.getCurrency(pkCountry); + kgCurrency = iCurrencyServiceApi.getCurrency(pkCountry); } - List productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null); + List productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null); List productParamsResultList = new ArrayList<>(); for (CuProductParams cuProductParams : productParams) { List list = new ArrayList<>(); @@ -189,7 +182,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl> gradeDTO = gradeServiceApi.queryGradeList(pkCountry); + R> gradeDTO = iGradeServiceApi.queryGradeList(pkCountry); List gradeList = gradeDTO.getData(); Map gradeMap = gradeList.stream().collect(Collectors.toMap(GradeDTO::getGradeValue, Function.identity())); @@ -233,12 +226,12 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl memberDate = memberServiceApi.getMember(loginMemberId); + R 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 specsNameMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdWaresSpecsSkuExtList.size())); CuWaresParams cuWaresParams = BeanUtil.copyProperties(bdWaresSpecsSkuExtList.get(0), CuWaresParams.class); - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); List cuWaresItemsParamsList = setUpWaresItemsParams(bdWaresSpecsSkuExtList, specsNameMap, currency.getData().getInExchangeRate()); // 前台传递结算国 跨国报单计算价格使用 - List productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null); + List productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null); List productParamsResultList = new ArrayList<>(); for (CuProductParams cuProductParams : productParams) { List list = new ArrayList<>(); @@ -291,22 +284,22 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); List 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 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 productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null); + List productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null); List productParamsResultList = productParams.stream() .peek(param -> { List list = cuWaresItemsParamsList.stream() @@ -361,7 +354,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl gradeMap = gradeServiceApi.queryGradeList(pkCountry).getData().stream() + Map 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 - * @Author: sui q - * @Date: 2022/9/27 10:51 */ private List setUpWaresItemsParams(List bdWaresSpecsSkuExtList, Map specsNameMap, BigDecimal inExchangeRate) { List cuWaresItemsParamsList = new ArrayList<>(); @@ -524,22 +512,22 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl { waresDetailExtMap.put(waresItemWaresInfo.getPkWaresDetail().toString() + waresItemWaresInfo.getPkWaresSpecsSku(), waresItemWaresInfo); // 设置规格值 名称拼接 - List waresSpecsRelationExts = waresSpecsRelationService.selectByWaresSpecsSku(waresItemWaresInfo.getPkWaresSpecsSku()); + List waresSpecsRelationExts = iBdWaresSpecsRelationService.selectByWaresSpecsSku(waresItemWaresInfo.getPkWaresSpecsSku()); Set 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 pkWaresSpecsSku = productGroup.stream().map(ProductGroup::getPkSkuId).collect(Collectors.toList()); - List bdWaresRangeList = bdWaresRangeService.querySkuWaresRangeByCondition(cuMember.getPkSettleCountry(), rangeType, level, pkWaresSpecsSku); + List 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> gradeDTO = gradeServiceApi.queryGradeList(pkCountry); + R> gradeDTO = iGradeServiceApi.queryGradeList(pkCountry); List gradeList = gradeDTO.getData(); Map gradeMap = gradeList.stream().collect(Collectors.toMap(GradeDTO::getGradeValue, Function.identity())); // 查询会员信息 - R memberDate = memberServiceApi.getMember(pkMember); + R memberDate = iMemberServiceApi.getMember(pkMember); CuMember cuMemberDate = memberDate.getData(); // 价格 @@ -582,11 +570,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); if (pkCountry != null) { // 当登陆人的结算国和前端结算国不一致 即为跨国报单 if (!pkCountry.equals(SecurityUtils.getPkCountry())) { - R kgCurrency = currencyServiceApi.getCurrency(pkCountry); + R 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 queryWaresSpecsSkuList(List skuIdList) { - Map resultMap = new HashMap<>(); - - List list = baseMapper.queryWaresSpecsSkuList(skuIdList); - for (BdWaresSpecsSkuExt waresSpecsSku : list) { - resultMap.put(waresSpecsSku.getPkId().longValue(), waresSpecsSku); - } - return resultMap; - } - - @Override - public List queryWaresSpecsNameSku(Set pkSkuId) { - return baseMapper.queryWaresSpecsNameSku(pkSkuId); - } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresVo.java index fa7ca710..bc4b8634 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresVo.java +++ b/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; diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml index 04f627f0..8bc72f24 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml @@ -108,8 +108,13 @@ - - - diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdUnit.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdUnit.java index d9c0bce4..5f85dded 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdUnit.java +++ b/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; /** - *

* 单位配置表 - *

- * - * @author hzs - * @since 2023-03-11 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java index 2949a27a..79b56819 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java +++ b/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) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAuthority.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAuthority.java index 597c98f9..c3a5db5e 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAuthority.java +++ b/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; /** - *

* - *

- * - * @author hzs - * @since 2022-09-09 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAuthorize.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAuthorize.java index 0efb4164..7db7cb83 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAuthorize.java +++ b/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; /** - *

* 商品用户权限配置 - *

- * - * @author hzs - * @since 2023-09-06 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAwards.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAwards.java index ce1a0e5c..2f643263 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresAwards.java +++ b/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; /** - *

* 商品奖衔配置 - *

- * - * @author hzs - * @since 2023-08-24 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresDetail.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresDetail.java index f957c976..5e6d7b6c 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresDetail.java +++ b/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; /** - *

* 商品发布明细表 - *

- * - * @author hzs - * @since 2022-09-09 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java index 1481ec7e..2b00c3b8 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java +++ b/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) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresGrade.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresGrade.java index e7cb9898..fda60551 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresGrade.java +++ b/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; /** - *

* 等级配置 - *

- * - * @author hzs - * @since 2023-03-13 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresLabel.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresLabel.java index 0c9030e9..f3b84c82 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresLabel.java +++ b/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; /** - *

* 商品标签表 - *

- * - * @author hzs - * @since 2022-10-21 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresRange.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresRange.java index 24aa33a4..d41f560d 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresRange.java +++ b/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; /** - *

* 极差明细表 - *

- * - * @author hzs - * @since 2022-09-09 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecialPostage.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecialPostage.java index f3b75db8..a64c55a1 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecialPostage.java +++ b/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; /** - *

* 商品特殊邮费配置 - *

- * - * @author hzs - * @since 2023-10-27 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecs.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecs.java index b33a039f..d5ebae8d 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecs.java +++ b/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; /** - *

* 规格明细表 - *

- * - * @author hzs - * @since 2022-09-09 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsPack.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsPack.java index eb2632c5..7dcc8943 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsPack.java +++ b/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; /** - *

* 规格和包装 - *

- * - * @author hzs - * @since 2022-10-21 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsRelation.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsRelation.java index 422a2e04..124191c5 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsRelation.java +++ b/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; /** - *

* 规格明细值 - *

- * - * @author hzs - * @since 2022-09-09 */ @Data @EqualsAndHashCode(callSuper = true) @@ -45,7 +40,7 @@ public class BdWaresSpecsRelation extends BaseEntity { private Integer pkWaresSpecsSku; /** - *商品明细主键 + * 商品明细主键 */ @TableField("PK_WARES_DETAIL") private Integer pkWaresDetail; diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsSku.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsSku.java index 2bb5bb83..5e96688a 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsSku.java +++ b/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; + }