From 47bd35fa6fe386a452082fe612935c1ca0ee40da Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Fri, 18 Jul 2025 17:52:33 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=B3=A8=E5=86=8C=E3=80=81=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E9=80=81=E7=AD=89=E7=BA=A7=EF=BC=8C=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=BB=A7=E7=BB=AD=E4=B9=B0=EF=BC=88293?= =?UTF-8?q?=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/detail/ICuMemberDetailServiceApi.java | 3 ++- .../detail/mapper/CuMemberLevelMapper.java | 5 ++++- .../detail/provider/CuMemberDetailProvider.java | 4 ++-- .../detail/service/ICuMemberLevelService.java | 3 ++- .../service/impl/CuMemberLevelServiceImpl.java | 4 ++-- .../mapper/member/detail/CuMemberLevelMapper.xml | 3 +++ .../order/service/impl/SaOrderServiceImpl.java | 16 ++++++++++++---- 7 files changed, 27 insertions(+), 11 deletions(-) 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 b1117993..6343cca5 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 @@ -16,9 +16,10 @@ public interface ICuMemberDetailServiceApi { * * @param pkMember 会员ID * @param typeList 升级类型列表 + * @param pkOrder 订单ID（不包含的） * @return */ - R queryLastManualUpgrade(Long pkMember, List typeList); + R queryLastManualUpgrade(Long pkMember, List typeList, Long pkOrder); /** * 查询手动开通奖衔的最新一条 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 cb0771eb..4eb46094 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 @@ -26,8 +26,11 @@ public interface CuMemberLevelMapper extends BaseMapper { * * @param pkMember 会员ID * @param typeList 升级类型列表 + * @param pkOrder 订单ID（不包含的） * @return */ - CuMemberLevel queryLastManualUpgrade(@Param("pkMember") Long pkMember, @Param("typeList") List typeList); + CuMemberLevel queryLastManualUpgrade(@Param("pkMember") Long pkMember, + @Param("typeList") List typeList, + @Param("pkOrder") Long pkOrder); } 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 30303c9a..0cb98c6c 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 @@ -23,8 +23,8 @@ public class CuMemberDetailProvider implements ICuMemberDetailServiceApi { private ICuMemberAwardsService iCuMemberAwardsService; @Override - public R queryLastManualUpgrade(Long pkMember, List typeList) { - return R.ok(iCuMemberLevelService.queryLastManualUpgrade(pkMember, typeList)); + public R queryLastManualUpgrade(Long pkMember, List typeList, Long pkOrder) { + return R.ok(iCuMemberLevelService.queryLastManualUpgrade(pkMember, typeList, pkOrder)); } @Override 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 004cf196..18bb0cf6 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 @@ -35,8 +35,9 @@ public interface ICuMemberLevelService extends IService { * * @param pkMember 会员ID * @param typeList 升级类型列表 + * @param pkOrder 订单ID（不包含的） * @return */ - CuMemberLevel queryLastManualUpgrade(Long pkMember, List typeList); + CuMemberLevel queryLastManualUpgrade(Long pkMember, List typeList, Long pkOrder); } 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 537f9fb1..a57020a4 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 @@ -35,8 +35,8 @@ public class CuMemberLevelServiceImpl extends ServiceImpl typeList) { - return baseMapper.queryLastManualUpgrade(pkMember, typeList); + public CuMemberLevel queryLastManualUpgrade(Long pkMember, List typeList, Long pkOrder) { + return baseMapper.queryLastManualUpgrade(pkMember, typeList, pkOrder); } } diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml index e7497a09..9fd840c9 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml @@ -52,6 +52,9 @@ #{items} + + and cml.pk_order != #{pkOrder} + order by cml.upgrade_time desc) where rownum = 1 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 8593c482..246e6819 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 @@ -1454,7 +1454,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl cuMember.setConsumeAchieve(cuMemberRegister.getConsumeAchieve()); // 查询最新一条升级记录 - CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId(), Arrays.asList(EUpgradeType.AUTO_UPGRADE.getValue(), EUpgradeType.MANUAL_UPGRADE.getValue())).getData(); + CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId(), + Arrays.asList(EUpgradeType.AUTO_UPGRADE.getValue(), EUpgradeType.MANUAL_UPGRADE.getValue()), + saOrderExt.getPkId()).getData(); if (null != cuMemberLevel) { // 存在手动升级 cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel()); @@ -1467,7 +1469,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl cuMember.setPkSettleGrade(gradeDTO.getPkId()); // 查询最新一条升级记录 - CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId(), Arrays.asList(EUpgradeType.BUY_UPGRADE.getValue(), EUpgradeType.MANUAL_UPGRADE.getValue())).getData(); + CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId(), + Arrays.asList(EUpgradeType.BUY_UPGRADE.getValue(), EUpgradeType.MANUAL_UPGRADE.getValue()), + saOrderExt.getPkId()).getData(); if (null != cuMemberLevel) { // 存在手动升级 cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel()); @@ -2162,7 +2166,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl cuMember.setConsumeAchieve(cuMemberRegister.getConsumeAchieve()); // 查询最新一条升级记录 - CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId(), Arrays.asList(EUpgradeType.AUTO_UPGRADE.getValue(), EUpgradeType.MANUAL_UPGRADE.getValue())).getData(); + CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId(), + Arrays.asList(EUpgradeType.AUTO_UPGRADE.getValue(), EUpgradeType.MANUAL_UPGRADE.getValue()), + saOrderExt.getPkId()).getData(); if (null != cuMemberLevel) { // 存在手动升级 cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel()); @@ -2175,7 +2181,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl cuMember.setPkSettleGrade(gradeDTO.getPkId()); // 查询最新一条升级记录 - CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId(), Arrays.asList(EUpgradeType.BUY_UPGRADE.getValue(), EUpgradeType.MANUAL_UPGRADE.getValue())).getData(); + CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId(), + Arrays.asList(EUpgradeType.BUY_UPGRADE.getValue(), EUpgradeType.MANUAL_UPGRADE.getValue()), + saOrderExt.getPkId()).getData(); if (null != cuMemberLevel) { // 存在手动升级 cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel());