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

## 后台奖金明细、奖金汇总添加赠品积分；

This commit is contained in:
cabbage 2025-10-27 15:46:11 +08:00
parent 43405bd2b2
commit 3266369468
7 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java
View File

@ -62,7 +62,7 @@ public class ApiCuMemberBonusController extends BaseController {
}
/**
* 新零售日结奖金：查询会员奖金列表
* 日结奖金：查询会员奖金列表 -- 众康使用
*/
@PostMapping("/query-bonus-first")
public TableDataInfo listFirstRepurchaseBonus(@RequestBody BonusParam bonusParam) {
@ -80,7 +80,7 @@ public class ApiCuMemberBonusController extends BaseController {
}
/**
* 新零售日结奖金：查询会员昨日奖金汇总
* 日结奖金：查询会员昨日奖金汇总 -- 众康使用
*/
@PostMapping("/query-bonus-total")
public TableDataInfo lisBonusTotal(@RequestBody BonusParam bonusParam) {

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

@ -119,7 +119,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
// cuMemberBonusExt.setCoachIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setShareIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setServiceIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setBackPoints(BigDecimal.ZERO);
cuMemberBonusExt.setBackPoints(BigDecimal.ZERO);
// cuMemberBonusExt.setServiceSpend(BigDecimal.ZERO);
// cuMemberBonusExt.setPurRealSubtotal(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurPushIncome(BigDecimal.ZERO);
@ -172,7 +172,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
// cuMemberBonusExt.setCoachIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getCoachIncome(), inExchangeRate));
// cuMemberBonusExt.setShareIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getShareIncome(), inExchangeRate));
// cuMemberBonusExt.setServiceIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getServiceIncome(), inExchangeRate));
// cuMemberBonusExt.setBackPoints(ComputeUtil.computeMultiply(cuMemberBonusExt.getBackPoints(), inExchangeRate));
cuMemberBonusExt.setBackPoints(ComputeUtil.computeMultiply(cuMemberBonusExt.getBackPoints(), inExchangeRate));
// cuMemberBonusExt.setServiceSpend(ComputeUtil.computeMultiply(cuMemberBonusExt.getServiceSpend(), inExchangeRate));
// cuMemberBonusExt.setPurRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getPurRealSubtotal(), inExchangeRate));
// cuMemberBonusExt.setRepurPushIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurPushIncome(), inExchangeRate));
@ -209,7 +209,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
// cuMemberBonusExt.setExpandIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getExpandIncome(), memberBonusExt.getExpandIncome()));
// cuMemberBonusExt.setShareIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getShareIncome(), memberBonusExt.getShareIncome()));
// cuMemberBonusExt.setServiceIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getServiceIncome(), memberBonusExt.getServiceIncome()));
// cuMemberBonusExt.setBackPoints(ComputeUtil.computeAdd(cuMemberBonusExt.getBackPoints(), memberBonusExt.getBackPoints()));
cuMemberBonusExt.setBackPoints(ComputeUtil.computeAdd(cuMemberBonusExt.getBackPoints(), memberBonusExt.getBackPoints()));
// cuMemberBonusExt.setServiceSpend(ComputeUtil.computeAdd(cuMemberBonusExt.getServiceSpend(), memberBonusExt.getServiceSpend()));
// cuMemberBonusExt.setPurRealSubtotal(ComputeUtil.computeAdd(cuMemberBonusExt.getPurRealSubtotal(), memberBonusExt.getPurRealSubtotal()));
// cuMemberBonusExt.setRepurPushIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurPushIncome(), memberBonusExt.getRepurPushIncome()));
@ -252,7 +252,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
// cuMemberBonusExt.setExpandCapping(BigDecimal.ZERO);
// cuMemberBonusExt.setShareIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setServiceIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setBackPoints(BigDecimal.ZERO);
cuMemberBonusExt.setBackPoints(BigDecimal.ZERO);
// cuMemberBonusExt.setServiceSpend(BigDecimal.ZERO);
// cuMemberBonusExt.setPurRealSubtotal(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurPushIncome(BigDecimal.ZERO);

8
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalVO.java
View File

@ -69,11 +69,17 @@ public class BonusTotalVO implements Serializable {
@Excel(name = "平级奖", scale = 2)
private BigDecimal retailSameLevelIncome;
/**
* 实发收益总计
*/
@Excel(name = "实发收益总计", scale = 2)
private BigDecimal realIncomeTotal;
/**
* 赠品积分-众康
*/
@Excel(name = "赠品积分", scale = 2)
private BigDecimal backPoints;
}

16
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java
View File

@ -87,11 +87,11 @@ public class CuMemberBonusVO implements Serializable {
*/
private Integer grantStatus;
/**
* 注册直推收益-众康
*/
@Excel(name = "直推收益", scale = 2)
private BigDecimal directIncome;
// /**
// * 注册直推收益-众康
// */
// @Excel(name = "直推收益", scale = 2)
// private BigDecimal directIncome;
/**
* 阶段收益-众康
@ -123,4 +123,10 @@ public class CuMemberBonusVO implements Serializable {
@Excel(name = "实发收益总计", scale = 2)
private BigDecimal realIncomeTotal;
/**
* 赠品积分-众康
*/
@Excel(name = "赠品积分", scale = 2)
private BigDecimal backPoints;
}

8
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java
View File

@ -1,7 +1,7 @@
package com.hzs.bonus.bonus.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.hzs.common.core.annotation.BigDecimalFormat;
import com.hzs.common.core.annotation.Excel;
import lombok.*;
import java.math.BigDecimal;
@ -58,4 +58,10 @@ public class MemberBonusFirstPurchaseVO extends PubMemberBonusVO {
@BigDecimalFormat
private BigDecimal retailRealSubtotal;
/**
* 赠品积分-众康
*/
@BigDecimalFormat
private BigDecimal backPoints;
}

6
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml
View File

@ -19,6 +19,7 @@
<result column="GLOBAL_POINTS" property="globalPoints"/>
<result column="RETAIL_RANGE_INCOME" property="retailRangeIncome"/>
<result column="RETAIL_SAME_LEVEL_INCOME" property="retailSameLevelIncome"/>
<result column="BACK_POINTS" property="backPoints"/>
<result column="INCOME_STATUS" property="incomeStatus"/>
<result column="GRANT_STATUS" property="grantStatus"/>
<result column="SETTLE_DATE" property="settleDate"/>
@ -311,7 +312,8 @@
cb.global_points,
cb.retail_range_income,
cb.retail_same_level_income,
cb.real_income_total,
cb.real_income_total,
cb.back_points,
cb.pk_rate,
bc.out_exchange_rate,
cm.pk_vertex,
@ -396,6 +398,7 @@ cb.real_income_total,
nvl( sum( cb.global_points ), 0 ) global_points,
nvl( sum( cb.retail_range_income ), 0 ) retail_range_income,
nvl( sum( cb.retail_same_level_income ), 0 ) retail_same_level_income,
nvl( sum( cb.back_points ), 0 ) back_points,
sum(cb.real_income_total) real_income_total,
bc.out_exchange_rate
from cu_member_bonus cb
@ -474,6 +477,7 @@ cb.real_income_total,
sum(cb.store_income) store_income,
sum(cb.retail_range_income) retail_range_income,
sum(cb.retail_same_level_income) retail_same_level_income,
sum(cb.back_points) back_points,
sum(cb.real_income_total) real_income_total
from cu_member_bonus cb
inner join cu_member_settle_period cp

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

@ -20,7 +20,7 @@ public enum EBonusItems {
/**
* 直推收益 -- 精品专区
*/
DIRECT_INCOME(20, "直推收益", 0),
DIRECT_INCOME(20, "直推收益", 1),
/**
* 阶段收益 -- 精品专区、商城专区
*/