diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java index d7a7b25b..81d8a032 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java @@ -8,11 +8,7 @@ import com.hzs.common.domain.member.detail.ext.CuMemberAwardsExt; import java.util.List; /** - * @Description: 会员升级记录dubbo服务 - * @Author: jiang chao - * @Time: 2024/1/30 17:24 - * @Classname: ICuMemberLevelServiceApi - * @PackageName: com.hzs.member.detail + * 会员升级记录dubbo服务 */ public interface ICuMemberDetailServiceApi { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java index 27d0d54b..1bcb3274 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java @@ -863,7 +863,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { for (int i = memberList.size() - 1; i >= 0; i--) { Long pkMember = memberList.get(i); SaOrderExt saOrder = saOrderMap.get(pkMember); - CuMember cuMember = cuMemberService.getMemberById(pkMember); // 删除等级 cuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime); // 回退奖衔,根据订单从 cu_member_awards查询 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java index 61c220a2..39503912 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java @@ -10,9 +10,6 @@ import java.util.List; /** * 会员信息-等级升级记录 Mapper 接口 - * - * @author hzs - * @since 2022-10-11 */ public interface CuMemberLevelMapper extends BaseMapper { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java index ac97121f..e60f1eae 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java @@ -14,11 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; /** - * @Description: 会员升级记录dubbo服务 - * @Author: jiang chao - * @Time: 2024/1/30 17:25 - * @Classname: CuMemberLevelProvider - * @PackageName: com.hzs.member.detail.provider + * 会员升级记录dubbo服务 */ @DubboService public class CuMemberDetailProvider implements ICuMemberDetailServiceApi { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java index 9b053255..db92ef4b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java @@ -9,9 +9,6 @@ import java.util.List; /** * 会员信息-等级升级记录 服务类 - * - * @author hzs - * @since 2022-10-11 */ public interface ICuMemberLevelService extends IService { @@ -21,9 +18,6 @@ public interface ICuMemberLevelService extends IService { * @param pkOrder 订单 * @param pkApprove 审核人 * @param currentDateTime 当前时间 - * @return: void - * @Author: sui q - * @Date: 2023/3/30 9:15 */ void deleteCuMemberLevelRecord(Long pkOrder, Long pkApprove, Date currentDateTime); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java index 3beba667..86477026 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java @@ -15,9 +15,6 @@ import java.util.List; /** * 会员信息-等级升级记录 服务实现类 - * - * @author hzs - * @since 2022-10-11 */ @Service public class CuMemberLevelServiceImpl extends ServiceImpl implements ICuMemberLevelService { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java index 791c8d4b..576f317d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java @@ -22,7 +22,6 @@ import com.hzs.common.domain.sale.wares.BdWaresLabel; import com.hzs.common.domain.sale.wares.BdWaresRange; import com.hzs.common.domain.sale.wares.BdWaresSpecsSku; import com.hzs.common.domain.system.config.BdLabel; -import com.hzs.common.domain.system.config.BdRetailRange; import com.hzs.common.domain.system.ext.BdLabelExt; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.member.base.IMemberServiceApi; @@ -37,7 +36,6 @@ import com.hzs.sale.wares.service.IBdWaresSpecsSkuService; import com.hzs.system.base.ICurrencyServiceApi; import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.config.IAreaCurrencyServiceApi; -import com.hzs.system.config.IRetailRangeServiceApi; import com.hzs.system.config.dto.AreaCurrencyDTO; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -201,17 +199,11 @@ public class ApiRetailWaresController extends BaseController { List waresRangeList = new ArrayList<>(); if (ESpecialArea.RETAIL_REPURCHASE.getValue() == specialArea || ESpecialArea.RETAIL_RESCISSION.getValue() == specialArea) { - // 新零售复购专区，需要处理级差 - // 2024.12.30 添加需求，复消也需要处理级差 + // 复购、复消需要处理级差 if (waresIdList.size() > 0) { waresRangeList = iBdWaresRangeService.listRetailWaresRange(pkGrade, waresIdList); } } - // 专区级差 - BdRetailRange retailRange = new BdRetailRange(); - if (ESpecialArea.RETAIL_SHOP_ORDER.getValue() == specialArea) { - - } for (BdWaresExt bdWaresExt : bdWaresExtList) { if (null != list) { @@ -255,8 +247,7 @@ public class ApiRetailWaresController extends BaseController { if (ESpecialArea.RETAIL_REPURCHASE.getValue() == specialArea || ESpecialArea.RETAIL_RESCISSION.getValue() == specialArea) { - // 新零售复购需要处理极差 - // 2024.12.30 添加需求，复消也需要处理级差 + // 复购、复消需要处理级差 for (BdWaresRange waresRange : waresRangeList) { if (bdWaresExt.getPkId().equals(waresRange.getPkWares())) { waresPrice = waresPrice.add(waresRange.getPrice()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java index dff29833..401f32db 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java @@ -66,11 +66,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 订单业务办理 - * @Author: jiang chao - * @Time: 2023/1/31 10:31 - * @Classname: OrderBusinessController - * @PackageName: com.hzs.sale.order.controller.manager + * 订单业务办理 */ @Slf4j @RestController diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java index bb70f68e..ce3f48ec 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java @@ -76,13 +76,6 @@ public class SaOrderItemsServiceImpl extends ServiceImpl - **/ @Override public List waresListByOrderId(List orderIdList) { return baseMapper.waresListByOrderId(orderIdList); @@ -98,12 +91,6 @@ public class SaOrderItemsServiceImpl extends ServiceImpl selectByInvestmentList(WaresOrderParam waresOrderParam) { return baseMapper.selectByInvestmentList(waresOrderParam); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 968b39b2..9f36458e 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -2537,11 +2537,12 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 存在手动升级 cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel()); } - } else { - // 累计升级制，传的订单是当前撤的订单 - GradeDTO gradeDTO = calculateRetailCancelGrade(cuMember, saOrderExt); - cuMember.setPkSettleGrade(gradeDTO.getPkId()); } +// else { +// // 累计升级制，传的订单是当前撤的订单 +// GradeDTO gradeDTO = calculateRetailCancelGrade(cuMember, saOrderExt); +// cuMember.setPkSettleGrade(gradeDTO.getPkId()); +// } Date firstDate = baseMapper.getFirstPayTime(cuMember.getPkId()); if (null == firstDate) { @@ -2563,33 +2564,34 @@ public class SaOrderServiceImpl extends ServiceImpl impl saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue()); } - // 如果复购订单后面还有升级订单，不需要处理等级问题； 复购订单后面没有升级订单，走新逻辑校验 - if (this.count(Wrappers.lambdaQuery() - .eq(SaOrder::getPkMember, saOrderExt.getPkMember()) - .eq(SaOrder::getOrderType, EOrderType.RETAIL_UPGRADE.getValue()) - .ge(SaOrder::getPayTime, saOrderExt.getPayTime()) - .eq(SaOrder::getOrderStatus, EPayStatus.PAID.getValue()) - ) == 0) { - // 带有盒数商品的订单，需要校验等级 - List gradeList = iGradeServiceApi.getRetailGradeList().getData(); - // 当前会员等级 - BdGrade memberGrade = this.getGrade(cuMember.getPkSettleGrade(), gradeList); - - // 需要添加的升级记录列表 - List createLevelList = new ArrayList<>(); - // 需要删除的升级记录列表 - List deleteLevelList = new ArrayList<>(); - // 新等级计算 - BdGrade newGrade = this.handleNewGrade(cuMember, memberGrade, gradeList, saOrderExt, createLevelList, deleteLevelList); - - if (memberGrade.getGradeValue() < EGrade.VIP.getValue() && newGrade.getGradeValue() < memberGrade.getGradeValue()) { - // 当前会员等级不是V4或者V5 并且 新等级小于当前等级需要进行处理 - saOrderExt.setNewGrade(newGrade); - saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue()); - } - saOrderExt.setCreateLevelList(createLevelList); - saOrderExt.setDeleteLevelList(deleteLevelList); - } + // TODO new 恢复升级专区，复购专区不需要处理等级问题 +// // 如果复购订单后面还有升级订单，不需要处理等级问题； 复购订单后面没有升级订单，走新逻辑校验 +// if (this.count(Wrappers.lambdaQuery() +// .eq(SaOrder::getPkMember, saOrderExt.getPkMember()) +// .eq(SaOrder::getOrderType, EOrderType.RETAIL_UPGRADE.getValue()) +// .ge(SaOrder::getPayTime, saOrderExt.getPayTime()) +// .eq(SaOrder::getOrderStatus, EPayStatus.PAID.getValue()) +// ) == 0) { +// // 带有盒数商品的订单，需要校验等级 +// List gradeList = iGradeServiceApi.getRetailGradeList().getData(); +// // 当前会员等级 +// BdGrade memberGrade = this.getGrade(cuMember.getPkSettleGrade(), gradeList); +// +// // 需要添加的升级记录列表 +// List createLevelList = new ArrayList<>(); +// // 需要删除的升级记录列表 +// List deleteLevelList = new ArrayList<>(); +// // 新等级计算 +// BdGrade newGrade = this.handleNewGrade(cuMember, memberGrade, gradeList, saOrderExt, createLevelList, deleteLevelList); +// +// if (memberGrade.getGradeValue() < EGrade.VIP.getValue() && newGrade.getGradeValue() < memberGrade.getGradeValue()) { +// // 当前会员等级不是V4或者V5 并且 新等级小于当前等级需要进行处理 +// saOrderExt.setNewGrade(newGrade); +// saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue()); +// } +// saOrderExt.setCreateLevelList(createLevelList); +// saOrderExt.setDeleteLevelList(deleteLevelList); +// } } } else if (EOrderType.RETAIL_PICK.getValue() == saOrderExt.getOrderType()) { // 新提货订单 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 6bedebdf..beaf1ad5 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 { @@ -26,9 +23,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { * @param specialArea 专区 * @param systemType 系统类型 * @param waresCode 商品编号 - * @return: List - * @Author: sui q - * @Date: 2022/9/19 11:21 */ List queryWaresSpecsSku(@Param("specialArea") Integer specialArea, @Param("systemType") Integer systemType, @@ -38,9 +32,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { * 根据sku主键查询规格名称 * * @param pkSkuId sku主键 - * @return: List - * @Author: sui q - * @Date: 2023/1/13 15:25 */ List queryWaresSpecsNameSku(@Param("pkSkuIdList") Set pkSkuId); @@ -48,9 +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,12 +73,9 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { */ List selectByPkIds(@Param("pkWaresSpecsSku") List pkWaresSpecsSku); - /* - * @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); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java index 9f006d3f..c09a2d95 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java @@ -48,9 +48,6 @@ import java.util.stream.Collectors; /** * 商品 服务实现类 - * - * @author hzs - * @since 2022-09-08 */ @Service public class BdWaresServiceImpl extends ServiceImpl implements IBdWaresService { @@ -1220,21 +1217,14 @@ public class BdWaresServiceImpl extends ServiceImpl impl rangePriceVoList.add(rangePriceVo); } } - // 对结果值进行排序 rangePriceVoList.sort(Comparator.comparing(RangePriceVo::getPkRange)); computeWaresPrice.setRangePriceVoList(rangePriceVoList); } } return computeWaresPriceList; - } - /** - * 查询商品团队信息 - * - * @return - */ @Override public Map> getWaresAuthority(List pkWaresList) { Map> map = new HashMap<>(); @@ -1247,34 +1237,16 @@ public class BdWaresServiceImpl extends ServiceImpl impl return map; } - /** - * 扣减预售数量库存 - * - * @param waresCode - * @param quantity - */ @Override public void updatePreSaleQuantityByWaresCode(String waresCode, Integer quantity) { baseMapper.updatePreSaleQuantityByWaresCode(waresCode, quantity); } - /** - * 查询商品可见类型 - * - * @param pkWares - * @return - */ @Override public WaresAuthorityVo getWaresAuthorityFirst(Integer pkWares) { return baseMapper.getWaresAuthorityFirst(pkWares); } - /** - * 置底 - * - * @param waresId - * @param loginUser - */ @Override public void bottomUp(Integer waresId, LoginUser loginUser) { BdWares bdWares = new BdWares(); 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 3371dd83..5565f0ae 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 @@ -49,42 +49,42 @@ import java.util.stream.Collectors; 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; @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.MALL_ORDER.getValue() == specialArea || EOrderType.COOPERATE_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(); } @@ -94,7 +94,7 @@ 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 -> @@ -115,7 +115,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl labelList = waresLabelService.selectByList(waresLabel); + List labelList = iBdWaresLabelService.selectByList(waresLabel); // 保证标签 List ensureLabelList = new ArrayList<>(); // 卖点标签 @@ -147,9 +147,9 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl 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<>(); @@ -168,7 +168,6 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl 0) { @@ -194,12 +193,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(); } @@ -212,10 +211,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<>(); @@ -243,28 +242,20 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); List bdWaresSpecsSkuExtList; - if (EOrderType.RETAIL_REPURCHASE.getValue() == specialArea || EOrderType.RETAIL_CONSUME.getValue() == specialArea) { - // 2024.12.30 添加需求，复消也需要处理级差 + // 复消也需要处理级差 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(); } @@ -295,7 +286,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 -> { @@ -305,7 +296,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() @@ -321,14 +312,10 @@ 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<>(); @@ -377,46 +364,6 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl specsTypeParamsMap) { - SpecsTypeParams bdWaresSpecs = SpecsTypeParams.builder() - .pkSpecsType(bdWaresSpecsSkuExt.getPkSpecsType()) - .typeName(bdWaresSpecsSkuExt.getSpecsTypeName()) - .build(); - // 规格 - Set specsParamsSet = new HashSet<>(); - setSpecsParams(bdWaresSpecsSkuExt, specsParamsSet); - bdWaresSpecs.setSpecsParamsSet(specsParamsSet); - specsTypeParamsMap.put(bdWaresSpecs.getPkSpecsType(), bdWaresSpecs); - } - - /** - * 设置规格明细 - * - * @param bdWaresSpecsSkuExt sku - * @param specsParamsList 规格明细 - */ - private void setSpecsParams(BdWaresSpecsSkuExt bdWaresSpecsSkuExt, Set specsParamsList) { - SpecsParams specsParams = SpecsParams.builder() - .pkSpecs(bdWaresSpecsSkuExt.getPkSpecs()) - .specsName(bdWaresSpecsSkuExt.getSpecsName()) - .build(); - specsParamsList.add(specsParams); - } - - /** - * 通过规格列表查询商品最小库存单位， - * - * @param cuWaresItemsParams 明细参数 - * @return: SpecsSkuParam - * @Author: sui q - * @Date: 2022/9/19 16:26 - */ @Override public SpecsSkuParam queryWaresDetailSkuBySpecs(CuWaresItemsParams cuWaresItemsParams) { BdWaresSpecsSkuExt bdWaresSpecsSkuExt = baseMapper.queryWaresDetailSkuBySpecs(cuWaresItemsParams); @@ -427,44 +374,21 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl selectByWaresSpecsSku(List waresIds) { return baseMapper.selectByWaresSpecsSku(waresIds); } - /** - * 根据id 批量查询sku 信息 - * - * @param pkWaresSpecsSku - * @return - */ @Override public List selectByPkIds(List pkWaresSpecsSku) { return baseMapper.selectByPkIds(pkWaresSpecsSku); @@ -489,7 +413,7 @@ 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, ",")); }); @@ -497,11 +421,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl 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)) { @@ -519,11 +443,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)); @@ -539,23 +463,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl selectByMinWaresSpecsSkuByPkWaresList(List pkWaresIds) { return baseMapper.selectByMinWaresSpecsSkuByPkWaresList(pkWaresIds); } - /** - * 根据id 查询 - * - * @param pkWaresSpecsSku - * @return - */ @Override public BdWaresSpecsSkuExt selectByPkWaresSpecsSku(Integer pkWaresSpecsSku) { return baseMapper.selectByPkWaresSpecsSku(pkWaresSpecsSku); @@ -573,7 +485,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); // 商品关联产品规格ID Set pkSkuIdList = waresSpecsSkuExtList.stream().map(BdWaresSpecsSkuExt::getPkId).collect(Collectors.toSet()); @@ -609,7 +521,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl labelList = waresLabelService.selectByList(waresLabel); + List labelList = iBdWaresLabelService.selectByList(waresLabel); // 保证标签 List ensureLabelList = new ArrayList<>(); @@ -640,7 +552,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl cuWaresItemsParamsList = setUpWaresItemsParams(waresSpecsSkuExtList, specsNameMap, currency.getData().getInExchangeRate()); // 商品编号查询产品详情 - List productList = waresDetailService.selectByWaresCode(waresCode, specialArea, null); + List productList = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null); List productResultList = new ArrayList<>(); for (CuProductParams productVO : productList) { List list = new ArrayList<>(); diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml index b6766159..da3e9700 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml @@ -373,6 +373,7 @@ bw.WARES_CODE, bw.WARES_NAME, PK_AREA_CLASSIFY, + COVER, COVER1, bw.WARES_PRICE, bw.WARES_ACHIEVE, diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java index 5c82dad3..8f6550f7 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java @@ -15,4 +15,11 @@ public class RetailProductConstants { "CP20250001", "CP20250002", "CP20250003", "CP20250004", "CP20250005", "CP20250006" ); + /** + * 盒数产品列表 + */ + public static final List ALL_BOX_WARES_LIST = Arrays.asList( + "CP20250001", "CP20250002", "CP20250003", "CP20250004", "CP20250005", "CP20250006" + ); + } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java index a1bec3fc..f45c9e4e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java @@ -59,7 +59,7 @@ public enum ESpecialArea { /** * 新零售会员专区（注册） */ - RETAIL_REGISTER(41, "新零售会员专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 41, 41, -1), + RETAIL_REGISTER(41, "新零售注册专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 41, 41, -1), /** * 新零售会员专区（升级） */ @@ -75,8 +75,6 @@ public enum ESpecialArea { RETAIL_TICKET(45, "自助购票", 0, EnumsPrefixConstants.SPECIAL_AREA + 45, 45, -1), - RETAIL_SHOP_ORDER(47, "店铺专供", 0, EnumsPrefixConstants.SPECIAL_AREA + 47, 47, -1), - ; /** diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java index 35279ee1..722db93a 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java @@ -2,23 +2,20 @@ package com.hzs.common.domain.member.detail; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; + import java.util.Date; + import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; import com.hzs.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.Accessors; - /** - *

* 会员信息-等级升级记录 - *

- * - * @author hzs - * @since 2022-10-11 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java index cb3d9e85..adb7205b 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java @@ -11,11 +11,7 @@ import java.util.Date; import java.util.List; /** - * @Description: 商品扩展表 - * @Author: sui q - * @Time: 2022/9/16 11:11 - * @Classname: BdWaresExt - * @PackageName: com.hzs.common.domain.sale.ext + * 商品扩展表 */ @EqualsAndHashCode(callSuper = true) @Data @@ -52,7 +48,7 @@ public class BdWaresExt extends BdWares { private Integer isOceanTrans; /** - * 是否创客礼包 + * 是否创客礼包 */ private Integer isMakerGift; @@ -174,11 +170,6 @@ public class BdWaresExt extends BdWares { */ private BigDecimal retailPrice; - /** - * 发起人收益（目前复购使用）保存为美金 - */ - private BigDecimal makerIncome; - /** * 消费配置主键 */ 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 65cf0b46..c7882dd9 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/BdWaresSpecsSku.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsSku.java index 6f6f56aa..1abc620c 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 @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 规格sku表 - *

- * - * @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/system/config/BdRetailRange.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRetailRange.java index 7051895f..471a531b 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRetailRange.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRetailRange.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 新零售极差等级配置表 - *

- * - * @author hzs - * @since 2025-02-13 */ @Data @EqualsAndHashCode(callSuper = true)