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

## 去掉启动卡直推；

This commit is contained in:
cabbage 2025-04-08 09:39:13 +08:00
parent 39b0591712
commit eaee52ffbd
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java
View File

@ -405,9 +405,9 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
memberBonusDetailVO.setSourceMemberName(CommonUtil.getMemberName(cuMemberBonusDetail.getPkVertex(), cuMemberBonusDetail.getSourceMemberName(), cuMemberBonusDetail.getNickName())); memberBonusDetailVO.setSourceMemberName(CommonUtil.getMemberName(cuMemberBonusDetail.getPkVertex(), cuMemberBonusDetail.getSourceMemberName(), cuMemberBonusDetail.getNickName()));
memberBonusDetailVOList.add(memberBonusDetailVO); memberBonusDetailVOList.add(memberBonusDetailVO);
}); });
} else if (EBonusItems.BOOT_CARD.getValue() == bonusItemsValue || EBonusItems.DIRECT_INCOME.getValue() == bonusItemsValue || } else if (EBonusItems.DIRECT_INCOME.getValue() == bonusItemsValue
EBonusItems.HELP_EACH_INCOME.getValue() == bonusItemsValue) { || EBonusItems.HELP_EACH_INCOME.getValue() == bonusItemsValue) {
// 启动卡直推 推荐收益 // 直推 推荐收益
List<CuMemberBonusPushExt> cuMemberBonusPushList = cuMemberBonusPushMapper.queryMemberBonusPushByBonusItems(bonusParam); List<CuMemberBonusPushExt> cuMemberBonusPushList = cuMemberBonusPushMapper.queryMemberBonusPushByBonusItems(bonusParam);
dataTable = getDataTable(cuMemberBonusPushList); dataTable = getDataTable(cuMemberBonusPushList);
cuMemberBonusPushList.forEach(cuMemberBonusPush -> { cuMemberBonusPushList.forEach(cuMemberBonusPush -> {
@ -524,9 +524,9 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
MemberBonusDetailSerVO memberBonusDetailVO = BeanUtil.copyProperties(cuMemberBonusDetail, MemberBonusDetailSerVO.class); MemberBonusDetailSerVO memberBonusDetailVO = BeanUtil.copyProperties(cuMemberBonusDetail, MemberBonusDetailSerVO.class);
memberBonusDetailSerVoS.add(memberBonusDetailVO); memberBonusDetailSerVoS.add(memberBonusDetailVO);
}); });
} else if (EBonusItems.BOOT_CARD.getValue() == bonusItemsValue || EBonusItems.DIRECT_INCOME.getValue() == bonusItemsValue || } else if (EBonusItems.DIRECT_INCOME.getValue() == bonusItemsValue
EBonusItems.HELP_EACH_INCOME.getValue() == bonusItemsValue) { || EBonusItems.HELP_EACH_INCOME.getValue() == bonusItemsValue) {
// 启动卡直推 推荐收益 // 直推 推荐收益
List<CuMemberBonusPushExt> cuMemberBonusPushList = cuMemberBonusPushMapper.queryMemberBonusPushByBonusItemsFoServer(bonusParam); List<CuMemberBonusPushExt> cuMemberBonusPushList = cuMemberBonusPushMapper.queryMemberBonusPushByBonusItemsFoServer(bonusParam);
dataTable = getDataTable(cuMemberBonusPushList); dataTable = getDataTable(cuMemberBonusPushList);
cuMemberBonusPushList.forEach(cuMemberBonusPush -> { cuMemberBonusPushList.forEach(cuMemberBonusPush -> {

1
hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java
View File

@ -3,7 +3,6 @@ package com.hzs.bonus.bonus.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.hzs.common.core.annotation.BigDecimalFormat;
import com.hzs.common.core.annotation.Excel; import com.hzs.common.core.annotation.Excel;
import com.hzs.common.core.annotation.Transaction; import com.hzs.common.core.annotation.Transaction;
import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.constant.EnumsPrefixConstants;

8
hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java
View File

@ -20,10 +20,10 @@ public enum EBonusItems {
*/ */
HI_PINK(1, "嗨粉直推", 1, EnumsPrefixConstants.BONUS_ITEMS + 1), HI_PINK(1, "嗨粉直推", 1, EnumsPrefixConstants.BONUS_ITEMS + 1),
/** // /**
* 启动卡直推 // * 启动卡直推
*/ // */
BOOT_CARD(2, "启动卡直推", 0, EnumsPrefixConstants.BONUS_ITEMS + 2), // BOOT_CARD(2, "启动卡直推", 0, EnumsPrefixConstants.BONUS_ITEMS + 2),
/** /**
* 直推收益 * 直推收益