## 前台会员明细返回;
This commit is contained in:
parent
a4c4a7c135
commit
3c0f8cfc97
|
@ -238,6 +238,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
|
||||||
cuMemberBonusExt.setRetailSameLevelIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailSameLevelIncome(), inExchangeRate));
|
cuMemberBonusExt.setRetailSameLevelIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailSameLevelIncome(), inExchangeRate));
|
||||||
cuMemberBonusExt.setRetailAreaIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailAreaIncome(), inExchangeRate));
|
cuMemberBonusExt.setRetailAreaIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailAreaIncome(), inExchangeRate));
|
||||||
cuMemberBonusExt.setRetailBenefitRangeIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitRangeIncome(), inExchangeRate));
|
cuMemberBonusExt.setRetailBenefitRangeIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitRangeIncome(), inExchangeRate));
|
||||||
|
cuMemberBonusExt.setRetailMonthRepurchaseIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailMonthRepurchaseIncome(), inExchangeRate));
|
||||||
cuMemberBonusExt.setRetailBenefitAvgIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitAvgIncome(), inExchangeRate));
|
cuMemberBonusExt.setRetailBenefitAvgIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitAvgIncome(), inExchangeRate));
|
||||||
cuMemberBonusExt.setRetailBenefitIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitIncome(), inExchangeRate));
|
cuMemberBonusExt.setRetailBenefitIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitIncome(), inExchangeRate));
|
||||||
cuMemberBonusExt.setRetailRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailRealSubtotal(), inExchangeRate));
|
cuMemberBonusExt.setRetailRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailRealSubtotal(), inExchangeRate));
|
||||||
|
|
|
@ -17,11 +17,7 @@ import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 返回后端用户端查询奖金明细vo
|
* 返回后端用户端查询奖金明细vo
|
||||||
* @Author: sui q
|
|
||||||
* @Time: 2022/12/20 9:56
|
|
||||||
* @Classname: MemberBonusDetailVO
|
|
||||||
* @PackageName: com.hzs.member.bonus.vo
|
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@Builder
|
@Builder
|
||||||
|
|
|
@ -77,7 +77,6 @@ public class MemberBonusFirstPurchaseVO extends PubMemberBonusVO {
|
||||||
// private BigDecimal globalPoints;
|
// private BigDecimal globalPoints;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新零售直推收益
|
* 新零售直推收益
|
||||||
*/
|
*/
|
||||||
|
@ -96,6 +95,24 @@ public class MemberBonusFirstPurchaseVO extends PubMemberBonusVO {
|
||||||
@BigDecimalFormat
|
@BigDecimalFormat
|
||||||
private BigDecimal retailAreaIncome;
|
private BigDecimal retailAreaIncome;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 福利级差收益
|
||||||
|
*/
|
||||||
|
@BigDecimalFormat
|
||||||
|
private BigDecimal retailBenefitRangeIncome;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 复购级差收益
|
||||||
|
*/
|
||||||
|
@BigDecimalFormat
|
||||||
|
private BigDecimal retailMonthRepurchaseIncome;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 福利分红收益
|
||||||
|
*/
|
||||||
|
@BigDecimalFormat
|
||||||
|
private BigDecimal retailBenefitIncome;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新零售收益小计
|
* 新零售收益小计
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -61,6 +61,11 @@
|
||||||
<result column="PK_VERTEX" property="pkVertex"/>
|
<result column="PK_VERTEX" property="pkVertex"/>
|
||||||
<result column="SERVICE_CODE" property="serviceCode"/>
|
<result column="SERVICE_CODE" property="serviceCode"/>
|
||||||
<result column="NICK_NAME" property="nickName"/>
|
<result column="NICK_NAME" property="nickName"/>
|
||||||
|
|
||||||
|
<result column="RETAIL_BENEFIT_RANGE_INCOME" property="retailBenefitRangeIncome"/>
|
||||||
|
<result column="RETAIL_MONTH_REPURCHASE_INCOME" property="retailMonthRepurchaseIncome"/>
|
||||||
|
<result column="RETAIL_BENEFIT_AVG_INCOME" property="retailBenefitAvgIncome"/>
|
||||||
|
<result column="RETAIL_BENEFIT_INCOME" property="retailBenefitIncome"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<update id="updateCuMemberBonusStatus">
|
<update id="updateCuMemberBonusStatus">
|
||||||
|
@ -289,6 +294,7 @@
|
||||||
cb.retail_same_level_income,
|
cb.retail_same_level_income,
|
||||||
cb.retail_area_income,
|
cb.retail_area_income,
|
||||||
cb.retail_benefit_range_income,
|
cb.retail_benefit_range_income,
|
||||||
|
cb.retail_month_repurchase_income,
|
||||||
cb.retail_benefit_avg_income,
|
cb.retail_benefit_avg_income,
|
||||||
cb.retail_benefit_income,
|
cb.retail_benefit_income,
|
||||||
cb.retail_real_subtotal,
|
cb.retail_real_subtotal,
|
||||||
|
|
|
@ -7,13 +7,6 @@ import lombok.EqualsAndHashCode;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
|
||||||
* @Description:
|
|
||||||
* @Author: sui q
|
|
||||||
* @Time: 2023/2/1 10:27
|
|
||||||
* @Classname: CuMemberBonusExt
|
|
||||||
* @PackageName: com.hzs.common.domain.member.ext
|
|
||||||
*/
|
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@Data
|
@Data
|
||||||
public class CuMemberBonusExt extends CuMemberBonus {
|
public class CuMemberBonusExt extends CuMemberBonus {
|
||||||
|
|
Loading…
Reference in New Issue