angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 注册、升级送等级，兼容可以继续买（293）；

This commit is contained in:
cabbage 2025-07-18 17:52:33 +08:00
parent 9530084e3b
commit 4ae52386af
7 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java
View File

@ -16,9 +16,10 @@ public interface ICuMemberDetailServiceApi {
* *
* @param pkMember 会员ID * @param pkMember 会员ID
* @param typeList 升级类型列表 * @param typeList 升级类型列表
* @param pkOrder 订单ID（不包含的）
* @return * @return
*/ */
R<CuMemberLevel> queryLastManualUpgrade(Long pkMember, List<Integer> typeList); R<CuMemberLevel> queryLastManualUpgrade(Long pkMember, List<Integer> typeList, Long pkOrder);
/** /**
* 查询手动开通奖衔的最新一条 * 查询手动开通奖衔的最新一条

5
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java
View File

@ -26,8 +26,11 @@ public interface CuMemberLevelMapper extends BaseMapper<CuMemberLevel> {
* *
* @param pkMember 会员ID * @param pkMember 会员ID
* @param typeList 升级类型列表 * @param typeList 升级类型列表
* @param pkOrder 订单ID（不包含的）
* @return * @return
*/ */
CuMemberLevel queryLastManualUpgrade(@Param("pkMember") Long pkMember, @Param("typeList") List<Integer> typeList); CuMemberLevel queryLastManualUpgrade(@Param("pkMember") Long pkMember,
@Param("typeList") List<Integer> typeList,
@Param("pkOrder") Long pkOrder);
} }

4
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java
View File

@ -23,8 +23,8 @@ public class CuMemberDetailProvider implements ICuMemberDetailServiceApi {
private ICuMemberAwardsService iCuMemberAwardsService; private ICuMemberAwardsService iCuMemberAwardsService;
@Override @Override
public R<CuMemberLevel> queryLastManualUpgrade(Long pkMember, List<Integer> typeList) { public R<CuMemberLevel> queryLastManualUpgrade(Long pkMember, List<Integer> typeList, Long pkOrder) {
return R.ok(iCuMemberLevelService.queryLastManualUpgrade(pkMember, typeList)); return R.ok(iCuMemberLevelService.queryLastManualUpgrade(pkMember, typeList, pkOrder));
} }
@Override @Override

3
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java
View File

@ -35,8 +35,9 @@ public interface ICuMemberLevelService extends IService<CuMemberLevel> {
* *
* @param pkMember 会员ID * @param pkMember 会员ID
* @param typeList 升级类型列表 * @param typeList 升级类型列表
* @param pkOrder 订单ID（不包含的）
* @return * @return
*/ */
CuMemberLevel queryLastManualUpgrade(Long pkMember, List<Integer> typeList); CuMemberLevel queryLastManualUpgrade(Long pkMember, List<Integer> typeList, Long pkOrder);
} }

4
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java
View File

@ -35,8 +35,8 @@ public class CuMemberLevelServiceImpl extends ServiceImpl<CuMemberLevelMapper, C
} }
@Override @Override
public CuMemberLevel queryLastManualUpgrade(Long pkMember, List<Integer> typeList) { public CuMemberLevel queryLastManualUpgrade(Long pkMember, List<Integer> typeList, Long pkOrder) {
return baseMapper.queryLastManualUpgrade(pkMember, typeList); return baseMapper.queryLastManualUpgrade(pkMember, typeList, pkOrder);
} }
} }

3
bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml
View File

@ -52,6 +52,9 @@
#{items} #{items}
</foreach> </foreach>
</if> </if>
<if test="pkOrder != null">
and cml.pk_order != #{pkOrder}
</if>
order by cml.upgrade_time desc) order by cml.upgrade_time desc)
where rownum = 1 where rownum = 1
</select> </select>

16
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -1454,7 +1454,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
cuMember.setConsumeAchieve(cuMemberRegister.getConsumeAchieve()); 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) { if (null != cuMemberLevel) {
// 存在手动升级 // 存在手动升级
cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel()); cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel());
@ -1467,7 +1469,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
cuMember.setPkSettleGrade(gradeDTO.getPkId()); 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) { if (null != cuMemberLevel) {
// 存在手动升级 // 存在手动升级
cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel()); cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel());
@ -2162,7 +2166,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
cuMember.setConsumeAchieve(cuMemberRegister.getConsumeAchieve()); 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) { if (null != cuMemberLevel) {
// 存在手动升级 // 存在手动升级
cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel()); cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel());
@ -2175,7 +2181,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
cuMember.setPkSettleGrade(gradeDTO.getPkId()); 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) { if (null != cuMemberLevel) {
// 存在手动升级 // 存在手动升级
cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel()); cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel());