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

## Opt - 奖金来源调整来源ID的逻辑&奖金明细

This commit is contained in:
sangelxiu1 2025-09-25 10:34:43 +08:00
parent 5d19bb24c5
commit 4030dbe39a
10 changed files with 225 additions and 530 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,10 +50,11 @@ public class ApiCuMemberBonusController extends BaseController {
MemberBonusVO memberBonusVO = BeanUtil.copyProperties(cuMemberBonus, MemberBonusVO.class, "settleDate");
memberBonusVO.setServiceSpend(BigDecimal.ZERO);
memberBonusVO.setSettleDate(DateUtils.currentDate());
BigDecimal serviceSpend = ComputeUtil.computeSubtract(
ComputeUtil.computeAddNum(cuMemberBonus.getRetailRangeIncome(), cuMemberBonus.getRetailSameLevelIncome(), cuMemberBonus.getRetailAreaIncome(), cuMemberBonus.getRepurRangeIncome()),
cuMemberBonus.getRetailRealSubtotal()
);
// BigDecimal serviceSpend = ComputeUtil.computeSubtract(
// ComputeUtil.computeAddNum(cuMemberBonus.getRetailRangeIncome(), cuMemberBonus.getRetailSameLevelIncome(), cuMemberBonus.getRetailAreaIncome(), cuMemberBonus.getRepurRangeIncome()),
// cuMemberBonus.getRetailRealSubtotal()
// );
BigDecimal serviceSpend = BigDecimal.ZERO;
memberBonusVO.setBackPoints(serviceSpend);
memberBonusVOList.add(memberBonusVO);
}

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

@ -179,9 +179,9 @@ public class BonusGrantServiceImpl implements IBonusGrantService {
// 奖金币（首购+复购+云代+海粉+嗨粉+店铺）
packAccountTrade(cuMemberTradeList, bdAccountValueMap, EAccount.BONUS.getValue(), currentDateTime, cuMemberBonus, ComputeUtil.computeMultiply(cuMemberBonus.getRealIncomeTotal(), currencyDTO.getOutExchangeRate()), settleDate);
// 重销币（商城重消+平台服务费）
packAccountTrade(cuMemberTradeList, bdAccountValueMap, EAccount.REPEAT.getValue(), currentDateTime, cuMemberBonus, ComputeUtil.computeMultiply(cuMemberBonus.getBackPoints(), currencyDTO.getOutExchangeRate()), settleDate);
// packAccountTrade(cuMemberTradeList, bdAccountValueMap, EAccount.REPEAT.getValue(), currentDateTime, cuMemberBonus, ComputeUtil.computeMultiply(cuMemberBonus.getBackPoints(), currencyDTO.getOutExchangeRate()), settleDate);
// 复购券
packAccountTrade(cuMemberTradeList, bdAccountValueMap, EAccount.REPURCHASE.getValue(), currentDateTime, cuMemberBonus, ComputeUtil.computeMultiply(cuMemberBonus.getRepurCouponSubtotal(), currencyDTO.getOutExchangeRate()), settleDate);
// packAccountTrade(cuMemberTradeList, bdAccountValueMap, EAccount.REPURCHASE.getValue(), currentDateTime, cuMemberBonus, ComputeUtil.computeMultiply(cuMemberBonus.getRepurCouponSubtotal(), currencyDTO.getOutExchangeRate()), settleDate);
});
List<Long> seqList = iCuMemberTradeService.batchQueryCuMemberTradeSeq(cuMemberTradeList.size());
// 新增流水明细,记录奖金明细的发放状态、消费明细
@ -236,9 +236,9 @@ public class BonusGrantServiceImpl implements IBonusGrantService {
// 奖金币（首购+复购+云代+海粉+嗨粉+店铺）
packAccountTrade(cuMemberTradeList, bdAccountValueMap, EAccount.BONUS.getValue(), currentDateTime, cuMemberBonus, ComputeUtil.computeMultiply(cuMemberBonus.getRealIncomeTotal(), currencyDTO.getOutExchangeRate()), settleDate);
// 重销币（商城重消+平台服务费）
packAccountTrade(cuMemberTradeList, bdAccountValueMap, EAccount.REPEAT.getValue(), currentDateTime, cuMemberBonus, ComputeUtil.computeMultiply(cuMemberBonus.getBackPoints(), currencyDTO.getOutExchangeRate()), settleDate);
// packAccountTrade(cuMemberTradeList, bdAccountValueMap, EAccount.REPEAT.getValue(), currentDateTime, cuMemberBonus, ComputeUtil.computeMultiply(cuMemberBonus.getBackPoints(), currencyDTO.getOutExchangeRate()), settleDate);
// 复购券
packAccountTrade(cuMemberTradeList, bdAccountValueMap, EAccount.REPURCHASE.getValue(), currentDateTime, cuMemberBonus, ComputeUtil.computeMultiply(cuMemberBonus.getRepurCouponSubtotal(), currencyDTO.getOutExchangeRate()), settleDate);
// packAccountTrade(cuMemberTradeList, bdAccountValueMap, EAccount.REPURCHASE.getValue(), currentDateTime, cuMemberBonus, ComputeUtil.computeMultiply(cuMemberBonus.getRepurCouponSubtotal(), currencyDTO.getOutExchangeRate()), settleDate);
});
List<Long> seqList = iCuMemberTradeService.batchQueryCuMemberTradeSeq(cuMemberTradeList.size());
// 新增流水明细,记录奖金明细的发放状态、消费明细

74
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java
View File

@ -163,43 +163,43 @@ public abstract class BonusSettleHandle {
.pkRate(pkRate)
.incomeStatus(incomeStatus)
.directIncome(BigDecimal.ZERO)
.expandIncome(BigDecimal.ZERO)
.expandNoCapping(BigDecimal.ZERO)
.expandCapping(BigDecimal.ZERO)
.coachIncome(BigDecimal.ZERO)
.shareIncome(BigDecimal.ZERO)
.serviceIncome(BigDecimal.ZERO)
.backPoints(BigDecimal.ZERO)
.serviceSpend(BigDecimal.ZERO)
.purRealSubtotal(BigDecimal.ZERO)
.repurPushIncome(BigDecimal.ZERO)
.repurRangeIncome(BigDecimal.ZERO)
.repurExpandIncome(BigDecimal.ZERO)
.repurRealSubtotal(BigDecimal.ZERO)
.cloudDirectIncome(BigDecimal.ZERO)
.cloudPurIncome(BigDecimal.ZERO)
.cloudRepurIncome(BigDecimal.ZERO)
.cloudRealSubtotal(BigDecimal.ZERO)
.repurCoupon(BigDecimal.ZERO)
.repurCouponShare(BigDecimal.ZERO)
.repurCouponSubtotal(BigDecimal.ZERO)
// .expandIncome(BigDecimal.ZERO)
// .expandNoCapping(BigDecimal.ZERO)
// .expandCapping(BigDecimal.ZERO)
// .coachIncome(BigDecimal.ZERO)
// .shareIncome(BigDecimal.ZERO)
// .serviceIncome(BigDecimal.ZERO)
// .backPoints(BigDecimal.ZERO)
// .serviceSpend(BigDecimal.ZERO)
// .purRealSubtotal(BigDecimal.ZERO)
// .repurPushIncome(BigDecimal.ZERO)
// .repurRangeIncome(BigDecimal.ZERO)
// .repurExpandIncome(BigDecimal.ZERO)
// .repurRealSubtotal(BigDecimal.ZERO)
// .cloudDirectIncome(BigDecimal.ZERO)
// .cloudPurIncome(BigDecimal.ZERO)
// .cloudRepurIncome(BigDecimal.ZERO)
// .cloudRealSubtotal(BigDecimal.ZERO)
// .repurCoupon(BigDecimal.ZERO)
// .repurCouponShare(BigDecimal.ZERO)
// .repurCouponSubtotal(BigDecimal.ZERO)
.globalPoints(BigDecimal.ZERO)
.carAwardPoints(BigDecimal.ZERO)
.hiFunIncome(BigDecimal.ZERO)
.haiFunIncome(BigDecimal.ZERO)
// .carAwardPoints(BigDecimal.ZERO)
// .hiFunIncome(BigDecimal.ZERO)
// .haiFunIncome(BigDecimal.ZERO)
.storeIncome(BigDecimal.ZERO)
.makerDirectIncome(BigDecimal.ZERO)
.makerShareIncome(BigDecimal.ZERO)
.makerRealSubtotal(BigDecimal.ZERO)
// .makerDirectIncome(BigDecimal.ZERO)
// .makerShareIncome(BigDecimal.ZERO)
// .makerRealSubtotal(BigDecimal.ZERO)
.realIncomeTotal(BigDecimal.ZERO)
.retailRangeIncome(BigDecimal.ZERO)
.retailSameLevelIncome(BigDecimal.ZERO)
.retailAreaIncome(BigDecimal.ZERO)
.retailBenefitRangeIncome(BigDecimal.ZERO)
.retailMonthRepurchaseIncome(BigDecimal.ZERO)
.retailBenefitAvgIncome(BigDecimal.ZERO)
.retailBenefitIncome(BigDecimal.ZERO)
.retailRealSubtotal(BigDecimal.ZERO)
// .retailRangeIncome(BigDecimal.ZERO)
// .retailSameLevelIncome(BigDecimal.ZERO)
// .retailAreaIncome(BigDecimal.ZERO)
// .retailBenefitRangeIncome(BigDecimal.ZERO)
// .retailMonthRepurchaseIncome(BigDecimal.ZERO)
// .retailBenefitAvgIncome(BigDecimal.ZERO)
// .retailBenefitIncome(BigDecimal.ZERO)
// .retailRealSubtotal(BigDecimal.ZERO)
.build();
cuMemberBonus.setPkCreator(MagicNumberConstants.PK_ADMIN);
cuMemberBonus.setPkCountry(pkCountry);
@ -223,8 +223,8 @@ public abstract class BonusSettleHandle {
backRatio = bdBonusDeduct.getBackRatio();
platformRatio = bdBonusDeduct.getPlatformRatio();
}
cuMemberBonus.setBackPoints(ComputeUtil.computeAdd(cuMemberBonus.getBackPoints(), ComputeUtil.computeBonusMultiply(pretaxIncome, backRatio)));
cuMemberBonus.setServiceSpend(ComputeUtil.computeAdd(cuMemberBonus.getServiceSpend(), ComputeUtil.computeBonusMultiply(pretaxIncome, platformRatio)));
// cuMemberBonus.setBackPoints(ComputeUtil.computeAdd(cuMemberBonus.getBackPoints(), ComputeUtil.computeBonusMultiply(pretaxIncome, backRatio)));
// cuMemberBonus.setServiceSpend(ComputeUtil.computeAdd(cuMemberBonus.getServiceSpend(), ComputeUtil.computeBonusMultiply(pretaxIncome, platformRatio)));
}
/**
@ -233,7 +233,7 @@ public abstract class BonusSettleHandle {
protected void setRetailTotal(BdBonusDeduct bdBonusDeduct, CuMemberBonus cuMemberBonus, Object bonusDetail) {
setBonusDeduct(bdBonusDeduct, cuMemberBonus, bonusDetail);
BigDecimal realIncome = ReflectUtils.invokeGetter(bonusDetail, BonusFieldConstants.REAL_INCOME);
cuMemberBonus.setRetailRealSubtotal(ComputeUtil.computeAdd(cuMemberBonus.getRetailRealSubtotal(), realIncome));
// cuMemberBonus.setRetailRealSubtotal(ComputeUtil.computeAdd(cuMemberBonus.getRetailRealSubtotal(), realIncome));
cuMemberBonus.setRealIncomeTotal(ComputeUtil.computeAdd(cuMemberBonus.getRealIncomeTotal(), realIncome));
}

4
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
View File

@ -742,7 +742,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
rangeRetailRemark(saOrderExt, cuMemberBonusRange, sourceMemberRangeExt, targetMemberRangeExt);
BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusRange, saOrderExt.getOrderAmount(), saOrderExt.getInExchangeRate());
if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusRange.getIncomeStatus()) {
cuMemberBonus.setRetailRangeIncome(ComputeUtil.computeAdd(cuMemberBonus.getRetailRangeIncome(), cuMemberBonusRange.getPretaxIncome()));
// cuMemberBonus.setRetailRangeIncome(ComputeUtil.computeAdd(cuMemberBonus.getRetailRangeIncome(), cuMemberBonusRange.getPretaxIncome()));
setRetailTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusRange);
}
memberBonusRangeList.add(cuMemberBonusRange);
@ -762,7 +762,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
oriRetailRangeRemark(saOrderExt, oriMemberBonusRange, sourceMemberRangeExt, targetMemberRangeExt);
BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, oriMemberBonusRange, saOrderExt.getOrderAmount(), saOrderExt.getInExchangeRate());
if (EBonusIncomeStatus.NORMAL.getValue() == oriMemberBonusRange.getIncomeStatus()) {
cuMemberBonus.setRetailSameLevelIncome(ComputeUtil.computeAdd(cuMemberBonus.getRetailSameLevelIncome(), oriMemberBonusRange.getPretaxIncome()));
// cuMemberBonus.setRetailSameLevelIncome(ComputeUtil.computeAdd(cuMemberBonus.getRetailSameLevelIncome(), oriMemberBonusRange.getPretaxIncome()));
setRetailTotal(bdBonusDeduct, cuMemberBonus, oriMemberBonusRange);
}
memberBonusRangeList.add(oriMemberBonusRange);

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

@ -113,36 +113,36 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
|| DateUtils.compareDateTimeAfter(DateUtils.currentDateTime(), compareDate)) {
CuMemberBonusExt cuMemberBonusExt = new CuMemberBonusExt();
cuMemberBonusExt.setSettleDate(endDate);
cuMemberBonusExt.setServiceSpend(BigDecimal.ZERO);
cuMemberBonusExt.setBackPoints(BigDecimal.ZERO);
// cuMemberBonusExt.setServiceSpend(BigDecimal.ZERO);
// cuMemberBonusExt.setBackPoints(BigDecimal.ZERO);
cuMemberBonusExt.setDirectIncome(BigDecimal.ZERO);
cuMemberBonusExt.setExpandIncome(BigDecimal.ZERO);
cuMemberBonusExt.setCoachIncome(BigDecimal.ZERO);
cuMemberBonusExt.setShareIncome(BigDecimal.ZERO);
cuMemberBonusExt.setServiceIncome(BigDecimal.ZERO);
cuMemberBonusExt.setBackPoints(BigDecimal.ZERO);
cuMemberBonusExt.setServiceSpend(BigDecimal.ZERO);
cuMemberBonusExt.setPurRealSubtotal(BigDecimal.ZERO);
cuMemberBonusExt.setRepurPushIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRepurExpandIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRepurRealSubtotal(BigDecimal.ZERO);
cuMemberBonusExt.setRepurCoupon(BigDecimal.ZERO);
cuMemberBonusExt.setRepurCouponShare(BigDecimal.ZERO);
cuMemberBonusExt.setRepurCouponSubtotal(BigDecimal.ZERO);
// cuMemberBonusExt.setExpandIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setCoachIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setShareIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setServiceIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setBackPoints(BigDecimal.ZERO);
// cuMemberBonusExt.setServiceSpend(BigDecimal.ZERO);
// cuMemberBonusExt.setPurRealSubtotal(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurPushIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurExpandIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurRealSubtotal(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurCoupon(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurCouponShare(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurCouponSubtotal(BigDecimal.ZERO);
cuMemberBonusExt.setGlobalPoints(BigDecimal.ZERO);
cuMemberBonusExt.setCarAwardPoints(BigDecimal.ZERO);
// cuMemberBonusExt.setCarAwardPoints(BigDecimal.ZERO);
cuMemberBonusExt.setRealIncomeTotal(BigDecimal.ZERO);
cuMemberBonusExt.setStoreIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRepurRangeIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailRangeIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailSameLevelIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailAreaIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailBenefitRangeIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailMonthRepurchaseIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailBenefitAvgIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailBenefitIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailRealSubtotal(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurRangeIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailRangeIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailSameLevelIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailAreaIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailBenefitRangeIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailMonthRepurchaseIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailBenefitAvgIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailBenefitIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailRealSubtotal(BigDecimal.ZERO);
cuMemberBonusExt.setRetailBenefitIncomeTotal(BigDecimal.ZERO);
memberBonusExtList.add(cuMemberBonusExt);
}
@ -167,35 +167,35 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
BigDecimal inExchangeRate = currency.getData().getInExchangeRate();
for (CuMemberBonusExt cuMemberBonusExt : cuMemberBonusExtList) {
cuMemberBonusExt.setDirectIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getDirectIncome(), inExchangeRate));
cuMemberBonusExt.setExpandIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getExpandIncome(), inExchangeRate));
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.setServiceSpend(ComputeUtil.computeMultiply(cuMemberBonusExt.getServiceSpend(), inExchangeRate));
cuMemberBonusExt.setPurRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getPurRealSubtotal(), inExchangeRate));
cuMemberBonusExt.setRepurPushIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurPushIncome(), inExchangeRate));
cuMemberBonusExt.setRepurExpandIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurExpandIncome(), inExchangeRate));
cuMemberBonusExt.setRepurRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurRealSubtotal(), inExchangeRate));
cuMemberBonusExt.setRepurCoupon(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurCoupon(), inExchangeRate));
cuMemberBonusExt.setRepurCouponShare(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurCouponShare(), inExchangeRate));
cuMemberBonusExt.setRepurCouponSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurCouponSubtotal(), inExchangeRate));
// cuMemberBonusExt.setExpandIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getExpandIncome(), inExchangeRate));
// 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.setServiceSpend(ComputeUtil.computeMultiply(cuMemberBonusExt.getServiceSpend(), inExchangeRate));
// cuMemberBonusExt.setPurRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getPurRealSubtotal(), inExchangeRate));
// cuMemberBonusExt.setRepurPushIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurPushIncome(), inExchangeRate));
// cuMemberBonusExt.setRepurExpandIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurExpandIncome(), inExchangeRate));
// cuMemberBonusExt.setRepurRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurRealSubtotal(), inExchangeRate));
// cuMemberBonusExt.setRepurCoupon(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurCoupon(), inExchangeRate));
// cuMemberBonusExt.setRepurCouponShare(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurCouponShare(), inExchangeRate));
// cuMemberBonusExt.setRepurCouponSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurCouponSubtotal(), inExchangeRate));
cuMemberBonusExt.setGlobalPoints(ComputeUtil.computeMultiply(cuMemberBonusExt.getGlobalPoints(), inExchangeRate));
cuMemberBonusExt.setCarAwardPoints(ComputeUtil.computeMultiply(cuMemberBonusExt.getCarAwardPoints(), inExchangeRate));
// cuMemberBonusExt.setCarAwardPoints(ComputeUtil.computeMultiply(cuMemberBonusExt.getCarAwardPoints(), inExchangeRate));
cuMemberBonusExt.setRealIncomeTotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRealIncomeTotal(), inExchangeRate));
cuMemberBonusExt.setStoreIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getStoreIncome(), inExchangeRate));
cuMemberBonusExt.setRepurRangeIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurRangeIncome(), inExchangeRate));
cuMemberBonusExt.setRetailRangeIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailRangeIncome(), inExchangeRate));
cuMemberBonusExt.setRetailSameLevelIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailSameLevelIncome(), inExchangeRate));
cuMemberBonusExt.setRetailAreaIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailAreaIncome(), inExchangeRate));
cuMemberBonusExt.setRetailBenefitRangeIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitRangeIncome(), inExchangeRate));
cuMemberBonusExt.setRetailMonthRepurchaseIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailMonthRepurchaseIncome(), inExchangeRate));
cuMemberBonusExt.setRetailBenefitAvgIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitAvgIncome(), inExchangeRate));
cuMemberBonusExt.setRetailBenefitIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitIncome(), inExchangeRate));
cuMemberBonusExt.setRetailRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailRealSubtotal(), inExchangeRate));
// cuMemberBonusExt.setRepurRangeIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurRangeIncome(), inExchangeRate));
// cuMemberBonusExt.setRetailRangeIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailRangeIncome(), inExchangeRate));
// cuMemberBonusExt.setRetailSameLevelIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailSameLevelIncome(), inExchangeRate));
// cuMemberBonusExt.setRetailAreaIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailAreaIncome(), inExchangeRate));
// cuMemberBonusExt.setRetailBenefitRangeIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitRangeIncome(), inExchangeRate));
// cuMemberBonusExt.setRetailMonthRepurchaseIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailMonthRepurchaseIncome(), inExchangeRate));
// cuMemberBonusExt.setRetailBenefitAvgIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitAvgIncome(), inExchangeRate));
// cuMemberBonusExt.setRetailBenefitIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitIncome(), inExchangeRate));
// cuMemberBonusExt.setRetailRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailRealSubtotal(), inExchangeRate));
// 福利分红总计
cuMemberBonusExt.setRetailBenefitIncomeTotal(cuMemberBonusExt.getRetailBenefitAvgIncome().add(cuMemberBonusExt.getRetailBenefitIncome()));
// cuMemberBonusExt.setRetailBenefitIncomeTotal(cuMemberBonusExt.getRetailBenefitAvgIncome().add(cuMemberBonusExt.getRetailBenefitIncome()));
}
return cuMemberBonusExtList;
}
@ -203,33 +203,33 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
@Override
public void calculateBonusTotal(CuMemberBonusExt cuMemberBonusExt, CuMemberBonusExt memberBonusExt) {
cuMemberBonusExt.setDirectIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getDirectIncome(), memberBonusExt.getDirectIncome()));
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.setServiceSpend(ComputeUtil.computeAdd(cuMemberBonusExt.getServiceSpend(), memberBonusExt.getServiceSpend()));
cuMemberBonusExt.setPurRealSubtotal(ComputeUtil.computeAdd(cuMemberBonusExt.getPurRealSubtotal(), memberBonusExt.getPurRealSubtotal()));
cuMemberBonusExt.setRepurPushIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurPushIncome(), memberBonusExt.getRepurPushIncome()));
cuMemberBonusExt.setRepurExpandIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurExpandIncome(), memberBonusExt.getRepurExpandIncome()));
cuMemberBonusExt.setRepurRealSubtotal(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurRealSubtotal(), memberBonusExt.getRepurRealSubtotal()));
cuMemberBonusExt.setRepurCoupon(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurCoupon(), memberBonusExt.getRepurCoupon()));
cuMemberBonusExt.setRepurCouponShare(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurCouponShare(), memberBonusExt.getRepurCouponShare()));
cuMemberBonusExt.setRepurCouponSubtotal(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurCouponSubtotal(), memberBonusExt.getRepurCouponSubtotal()));
// 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.setServiceSpend(ComputeUtil.computeAdd(cuMemberBonusExt.getServiceSpend(), memberBonusExt.getServiceSpend()));
// cuMemberBonusExt.setPurRealSubtotal(ComputeUtil.computeAdd(cuMemberBonusExt.getPurRealSubtotal(), memberBonusExt.getPurRealSubtotal()));
// cuMemberBonusExt.setRepurPushIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurPushIncome(), memberBonusExt.getRepurPushIncome()));
// cuMemberBonusExt.setRepurExpandIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurExpandIncome(), memberBonusExt.getRepurExpandIncome()));
// cuMemberBonusExt.setRepurRealSubtotal(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurRealSubtotal(), memberBonusExt.getRepurRealSubtotal()));
// cuMemberBonusExt.setRepurCoupon(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurCoupon(), memberBonusExt.getRepurCoupon()));
// cuMemberBonusExt.setRepurCouponShare(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurCouponShare(), memberBonusExt.getRepurCouponShare()));
// cuMemberBonusExt.setRepurCouponSubtotal(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurCouponSubtotal(), memberBonusExt.getRepurCouponSubtotal()));
cuMemberBonusExt.setGlobalPoints(ComputeUtil.computeAdd(cuMemberBonusExt.getGlobalPoints(), memberBonusExt.getGlobalPoints()));
cuMemberBonusExt.setCarAwardPoints(ComputeUtil.computeAdd(cuMemberBonusExt.getCarAwardPoints(), memberBonusExt.getCarAwardPoints()));
// cuMemberBonusExt.setCarAwardPoints(ComputeUtil.computeAdd(cuMemberBonusExt.getCarAwardPoints(), memberBonusExt.getCarAwardPoints()));
cuMemberBonusExt.setRealIncomeTotal(ComputeUtil.computeAdd(cuMemberBonusExt.getRealIncomeTotal(), memberBonusExt.getRealIncomeTotal()));
cuMemberBonusExt.setStoreIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getStoreIncome(), memberBonusExt.getStoreIncome()));
cuMemberBonusExt.setRepurRangeIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurRangeIncome(), memberBonusExt.getRepurRangeIncome()));
cuMemberBonusExt.setRetailRangeIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailRangeIncome(), memberBonusExt.getRetailRangeIncome()));
cuMemberBonusExt.setRetailSameLevelIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailSameLevelIncome(), memberBonusExt.getRetailSameLevelIncome()));
cuMemberBonusExt.setRetailAreaIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailAreaIncome(), memberBonusExt.getRetailAreaIncome()));
cuMemberBonusExt.setRetailBenefitRangeIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailBenefitRangeIncome(), memberBonusExt.getRetailBenefitRangeIncome()));
cuMemberBonusExt.setRetailMonthRepurchaseIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailMonthRepurchaseIncome(), memberBonusExt.getRetailMonthRepurchaseIncome()));
cuMemberBonusExt.setCoachIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getCoachIncome(), memberBonusExt.getCoachIncome()));
cuMemberBonusExt.setRetailBenefitAvgIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailBenefitAvgIncome(), memberBonusExt.getRetailBenefitAvgIncome()));
cuMemberBonusExt.setRetailBenefitIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailBenefitIncome(), memberBonusExt.getRetailBenefitIncome()));
cuMemberBonusExt.setRetailRealSubtotal(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailRealSubtotal(), memberBonusExt.getRetailRealSubtotal()));
// cuMemberBonusExt.setRepurRangeIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurRangeIncome(), memberBonusExt.getRepurRangeIncome()));
// cuMemberBonusExt.setRetailRangeIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailRangeIncome(), memberBonusExt.getRetailRangeIncome()));
// cuMemberBonusExt.setRetailSameLevelIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailSameLevelIncome(), memberBonusExt.getRetailSameLevelIncome()));
// cuMemberBonusExt.setRetailAreaIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailAreaIncome(), memberBonusExt.getRetailAreaIncome()));
// cuMemberBonusExt.setRetailBenefitRangeIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailBenefitRangeIncome(), memberBonusExt.getRetailBenefitRangeIncome()));
// cuMemberBonusExt.setRetailMonthRepurchaseIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailMonthRepurchaseIncome(), memberBonusExt.getRetailMonthRepurchaseIncome()));
// cuMemberBonusExt.setCoachIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getCoachIncome(), memberBonusExt.getCoachIncome()));
// cuMemberBonusExt.setRetailBenefitAvgIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailBenefitAvgIncome(), memberBonusExt.getRetailBenefitAvgIncome()));
// cuMemberBonusExt.setRetailBenefitIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailBenefitIncome(), memberBonusExt.getRetailBenefitIncome()));
// cuMemberBonusExt.setRetailRealSubtotal(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailRealSubtotal(), memberBonusExt.getRetailRealSubtotal()));
}
@Override
@ -241,35 +241,35 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
public CuMemberBonusExt initCuMemberBonus() {
CuMemberBonusExt cuMemberBonusExt = new CuMemberBonusExt();
cuMemberBonusExt.setDirectIncome(BigDecimal.ZERO);
cuMemberBonusExt.setExpandIncome(BigDecimal.ZERO);
cuMemberBonusExt.setExpandNoCapping(BigDecimal.ZERO);
cuMemberBonusExt.setExpandCapping(BigDecimal.ZERO);
cuMemberBonusExt.setShareIncome(BigDecimal.ZERO);
cuMemberBonusExt.setServiceIncome(BigDecimal.ZERO);
cuMemberBonusExt.setBackPoints(BigDecimal.ZERO);
cuMemberBonusExt.setServiceSpend(BigDecimal.ZERO);
cuMemberBonusExt.setPurRealSubtotal(BigDecimal.ZERO);
cuMemberBonusExt.setRepurPushIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRepurExpandIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRepurRealSubtotal(BigDecimal.ZERO);
cuMemberBonusExt.setRepurCoupon(BigDecimal.ZERO);
cuMemberBonusExt.setRepurCouponShare(BigDecimal.ZERO);
cuMemberBonusExt.setRepurCouponSubtotal(BigDecimal.ZERO);
// cuMemberBonusExt.setExpandIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setExpandNoCapping(BigDecimal.ZERO);
// cuMemberBonusExt.setExpandCapping(BigDecimal.ZERO);
// cuMemberBonusExt.setShareIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setServiceIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setBackPoints(BigDecimal.ZERO);
// cuMemberBonusExt.setServiceSpend(BigDecimal.ZERO);
// cuMemberBonusExt.setPurRealSubtotal(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurPushIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurExpandIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurRealSubtotal(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurCoupon(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurCouponShare(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurCouponSubtotal(BigDecimal.ZERO);
cuMemberBonusExt.setStoreIncome(BigDecimal.ZERO);
cuMemberBonusExt.setGlobalPoints(BigDecimal.ZERO);
cuMemberBonusExt.setCarAwardPoints(BigDecimal.ZERO);
// cuMemberBonusExt.setCarAwardPoints(BigDecimal.ZERO);
cuMemberBonusExt.setRealIncomeTotal(BigDecimal.ZERO);
cuMemberBonusExt.setRepurRangeIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailRangeIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailSameLevelIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailAreaIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailBenefitRangeIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailMonthRepurchaseIncome(BigDecimal.ZERO);
cuMemberBonusExt.setCoachIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailBenefitAvgIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailBenefitIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailRealSubtotal(BigDecimal.ZERO);
// cuMemberBonusExt.setRepurRangeIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailRangeIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailSameLevelIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailAreaIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailBenefitRangeIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailMonthRepurchaseIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setCoachIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailBenefitAvgIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailBenefitIncome(BigDecimal.ZERO);
// cuMemberBonusExt.setRetailRealSubtotal(BigDecimal.ZERO);
return cuMemberBonusExt;
}

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

@ -1,5 +1,6 @@
package com.hzs.bonus.bonus.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.hzs.common.core.annotation.Excel;
import lombok.Data;
@ -90,99 +91,34 @@ public class CuMemberBonusVO implements Serializable {
* 需要转换人民币的
*/
public static final String[] INCOME_ARRAY = new String[]{
"backPoints", "retailRangeIncome", "retailSameLevelIncome", "retailAreaIncome",
"retailBenefitRangeIncome", "retailMonthRepurchaseIncome", "coachIncome", "retailBenefitAvgIncome",
"retailBenefitIncome", "retailRealSubtotal", "realIncomeTotal", "repurRangeIncome"};
"directIncome", "storeIncome", "globalPoints", "realIncomeTotal", "realIncomeTotalOri"};
private BigDecimal retailRangeIncome;
/**
* 直推收益
* 注册直推收益-众康
*/
@Excel(name = "直推收益", scale = 2)
private BigDecimal retailRangeIncomeOri;
private BigDecimal retailSameLevelIncome;
/**
* 平级收益
*/
@Excel(name = "平级收益", scale = 2)
private BigDecimal retailSameLevelIncomeOri;
private BigDecimal retailAreaIncome;
/**
* 区域分红
*/
@Excel(name = "区域分红", scale = 2)
private BigDecimal retailAreaIncomeOri;
private BigDecimal directIncome;
/**
* 新零售福利级差收益
* 阶段收益-众康
*/
private BigDecimal retailBenefitRangeIncome;
@Excel(name = "月度福利级差收益", scale = 2)
private BigDecimal retailBenefitRangeIncomeOri;
@Excel(name = "阶段收益", scale = 2)
private BigDecimal storeIncome;
/**
* 新零售复购级差收益
* 复购见点收益-众康
*/
private BigDecimal retailMonthRepurchaseIncome;
@Excel(name = "月度复购级差收益", scale = 2)
private BigDecimal retailMonthRepurchaseIncomeOri;
/**
* 培育津贴
*/
private BigDecimal coachIncome;
@Excel(name = "培育津贴", scale = 2)
private BigDecimal coachIncomeOri;
/**
* 新零售福利平均收益
*/
private BigDecimal retailBenefitAvgIncome;
@Excel(name = " 福利平均收益", scale = 2)
private BigDecimal retailBenefitAvgIncomeOri;
/**
* 新零售福利加权收益
*/
private BigDecimal retailBenefitIncome;
@Excel(name = " 福利加权收益", scale = 2)
private BigDecimal retailBenefitIncomeOri;
/**
* 复购级差收益
*/
private BigDecimal repurRangeIncome;
@Excel(name = "复购级差收益", scale = 2)
private BigDecimal repurRangeIncomeOri;
/**
* 商城重消
*/
@Excel(name = "商城重消", scale = 2)
private BigDecimal backPointsOri;
/**
* 商城重消
*/
private BigDecimal backPoints;
/**
* 新零售收益小计
*/
private BigDecimal retailRealSubtotal;
// @Excel(name = "收益小计", scale = 2)
private BigDecimal retailRealSubtotalOri;
@Excel(name = "见点收益", scale = 2)
private BigDecimal globalPoints;
/**
* 实发收益总计
*/
@Excel(name = "实发收益总计", scale = 2)
private BigDecimal realIncomeTotalOri;
/**
* 实发收益总计
*/

52
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusDetailMapper.xml
View File

@ -241,17 +241,39 @@
</select>
<select id="queryMemberBonusDetailByConditionForServer" resultMap="CuMemberBonusDetail">
select b.period,cp.settle_date,so.order_code,so.order_type,bt.short_name source_country_name,
cu.member_code source_member_code,cu.member_name
source_member_name,so.pk_rate,bc.out_exchange_rate,so.order_amount,
so.order_achieve,b.pk_country,b.pk_bonus_items,b.pretax_income,b.income_tax,b.real_income,b.income_status,
tar.member_code,tar.member_name,
bg.pk_transaction pk_settle_grade,ba.pk_transaction
pk_awards,bv.vertex_name,ct.team_name,
b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,bct.short_name settle_country
select
b.period,
cp.settle_date,
so.order_code,
so.order_type,
bt.short_name source_country_name,
cu.member_code source_member_code,
cu.member_name source_member_name,
so.pk_rate,
bc.out_exchange_rate,
so.order_amount,
so.order_achieve,
b.pk_country,
b.pk_bonus_items,
b.pretax_income,
b.income_tax,
b.real_income,
b.income_status,
tar.member_code,
tar.member_name,
bg.pk_transaction pk_settle_grade,
ba.pk_transaction pk_awards,
bv.vertex_name,
ct.team_name,
b.remark,
b.income_ratio,
b.income_dial_ratio,
b.order_dial_ratio,
bct.short_name settle_country
from (
select * from (
select
cb.pk_member PK_SOURCE_MEMBER,
cb.pk_member,cd.pk_order,cb.period,cb.pk_country,cd.pk_bonus_items,cd.income_status,cd.CAL_ACHIEVE,cd.pretax_income,cd.income_tax,cd.real_income,
cd.remark,cd.income_ratio,cd.income_dial_ratio,cd.order_dial_ratio
from cu_member_bonus cb
@ -266,6 +288,7 @@
</if>
union all
select
cb.pk_member PK_SOURCE_MEMBER,
cb.pk_member,cp.pk_order,cb.period,cb.pk_country,cp.pk_bonus_items,cp.income_status,cp.CAL_ACHIEVE,cp.pretax_income,cp.income_tax,cp.real_income,
cp.remark,cp.income_ratio,cp.income_dial_ratio,cp.order_dial_ratio
from cu_member_bonus cb
@ -280,6 +303,7 @@
</if>
union all
select
cb.pk_member PK_SOURCE_MEMBER,
cb.pk_member,ce.pk_order,cb.period,cb.pk_country,ce.pk_bonus_items,ce.income_status,ce.CAL_ACHIEVE,ce.pretax_income,ce.income_tax,ce.real_income,
ce.remark,ce.income_ratio,ce.income_dial_ratio,ce.order_dial_ratio
from cu_member_bonus cb
@ -294,6 +318,7 @@
</if>
union all
select
cb.pk_member PK_SOURCE_MEMBER,
cb.pk_member,cc.pk_order,cb.period,cb.pk_country,cc.pk_bonus_items,cc.income_status,cc.CAL_ACHIEVE,cc.pretax_income,cc.income_tax,cc.real_income,
cc.remark,cc.income_ratio,cc.income_dial_ratio,cc.order_dial_ratio
from cu_member_bonus cb
@ -308,6 +333,7 @@
</if>
union all
select
cb.pk_member PK_SOURCE_MEMBER,
cb.pk_member,cr.pk_order,cb.period,cb.pk_country,cr.pk_bonus_items,cr.income_status,cr.CAL_ACHIEVE,cr.pretax_income,cr.income_tax,cr.real_income,
cr.remark,cr.income_ratio,cr.income_dial_ratio,cr.order_dial_ratio
from cu_member_bonus cb
@ -328,6 +354,7 @@
</if>
union all
select
cs.PK_SOURCE_MEMBER,
cb.pk_member,cs.pk_order,cb.period,cb.pk_country,cs.pk_bonus_items,cs.income_status,cs.CAL_ACHIEVE,cs.pretax_income,cs.income_tax,cs.real_income,
cs.remark,cs.income_ratio,cs.income_dial_ratio,cs.order_dial_ratio
from cu_member_bonus cb
@ -373,10 +400,8 @@
) b
left join sa_order so
on so.pk_id = b.pk_order
left join cu_member tar
on b.pk_member = tar.pk_id
left join cu_member cu
on so.pk_member = cu.pk_id
LEFT JOIN cu_member tar ON b.PK_SOURCE_MEMBER = tar.pk_id
LEFT JOIN cu_member cu ON b.PK_SOURCE_MEMBER = cu.pk_id
left join cu_member_settle_period cp
on b.period = cp.pk_id
left join bd_vertex bv
@ -389,8 +414,7 @@
on bg.pk_id=tar.pk_settle_grade
left join bd_awards ba
on ba.pk_id=tar.pk_awards
left join bd_country bt
on bt.pk_id=so.pk_country
LEFT JOIN bd_country bt ON bt.pk_id = cu.pk_country
left join bd_country bct
on bct.pk_id=tar.pk_settle_country
<where>

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

@ -16,33 +16,7 @@
<result column="PK_RATE" property="pkRate"/>
<result column="out_exchange_rate" property="outExchangeRate"/>
<result column="DIRECT_INCOME" property="directIncome"/>
<result column="EXPAND_INCOME" property="expandIncome"/>
<result column="EXPAND_NO_CAPPING" property="expandNoCapping"/>
<result column="EXPAND_CAPPING" property="expandCapping"/>
<result column="COACH_INCOME" property="coachIncome"/>
<result column="SHARE_INCOME" property="shareIncome"/>
<result column="SERVICE_INCOME" property="serviceIncome"/>
<result column="BACK_POINTS" property="backPoints"/>
<result column="SERVICE_SPEND" property="serviceSpend"/>
<result column="PUR_REAL_SUBTOTAL" property="purRealSubtotal"/>
<result column="REPUR_PUSH_INCOME" property="repurPushIncome"/>
<result column="REPUR_RANGE_INCOME" property="repurRangeIncome"/>
<result column="REPUR_EXPAND_INCOME" property="repurExpandIncome"/>
<result column="REPUR_REAL_SUBTOTAL" property="repurRealSubtotal"/>
<result column="CLOUD_DIRECT_INCOME" property="cloudDirectIncome"/>
<result column="CLOUD_PUR_INCOME" property="cloudPurIncome"/>
<result column="CLOUD_REPUR_INCOME" property="cloudRepurIncome"/>
<result column="CLOUD_REAL_SUBTOTAL" property="cloudRealSubtotal"/>
<result column="REPUR_COUPON" property="repurCoupon"/>
<result column="REPUR_COUPON_SHARE" property="repurCouponShare"/>
<result column="REPUR_COUPON_SUBTOTAL" property="repurCouponSubtotal"/>
<result column="GLOBAL_POINTS" property="globalPoints"/>
<result column="CAR_AWARD_POINTS" property="carAwardPoints"/>
<result column="HI_FUN_INCOME" property="hiFunIncome"/>
<result column="MAKER_DIRECT_INCOME" property="makerDirectIncome"/>
<result column="MAKER_SHARE_INCOME" property="makerShareIncome"/>
<result column="MAKER_REAL_SUBTOTAL" property="makerRealSubtotal"/>
<result column="REAL_INCOME_TOTAL" property="realIncomeTotal"/>
<result column="INCOME_STATUS" property="incomeStatus"/>
<result column="GRANT_STATUS" property="grantStatus"/>
<result column="SETTLE_DATE" property="settleDate"/>
@ -53,22 +27,10 @@
<result column="VERTEX_NAME" property="vertexName"/>
<result column="TEAM_NAME" property="teamName"/>
<result column="STORE_INCOME" property="storeIncome"/>
<result column="HAI_FUN_INCOME" property="haiFunIncome"/>
<result column="PUR_REAL_SUBTOTAL" property="purRealSubtotal"/>
<result column="REPUR_REAL_SUBTOTAL" property="repurRealSubtotal"/>
<result column="CLOUD_REAL_SUBTOTAL" property="cloudRealSubtotal"/>
<result column="MAKER_REAL_SUBTOTAL" property="makerRealSubtotal"/>
<result column="PK_VERTEX" property="pkVertex"/>
<result column="SERVICE_CODE" property="serviceCode"/>
<result column="NICK_NAME" property="nickName"/>
<result column="RETAIL_RANGE_INCOME" property="retailRangeIncome"/>
<result column="RETAIL_SAME_LEVEL_INCOME" property="retailSameLevelIncome"/>
<result column="RETAIL_AREA_INCOME" property="retailAreaIncome"/>
<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>
<update id="updateCuMemberBonusStatus">
@ -319,21 +281,23 @@
</select>
<select id="queryMemberBonusByConditionForServer" resultMap="CuMemberBonus">
select cm.member_code, cm.member_name,
cm.pk_settle_grade, cm.pk_awards,
bv.vertex_name, ct.team_name,
cb.period,cp.settle_date,cb.direct_income,cb.expand_income,cb.expand_no_capping,
cb.expand_capping,cb.share_income,cb.service_income,cb.back_points,cb.service_spend,
cb.pur_real_subtotal,cb.repur_push_income,cb.repur_expand_income,cb.repur_real_subtotal,
cb.repur_coupon,cb.repur_coupon_share,cb.repur_coupon_subtotal,cb.store_income,
cb.global_points,cb.car_award_points,cb.pk_rate,bc.out_exchange_rate,
cb.coach_income,
cb.repur_range_income,
cb.retail_range_income, cb.retail_same_level_income, cb.retail_area_income,
cb.retail_benefit_range_income, cb.retail_month_repurchase_income,
cb.retail_benefit_avg_income, cb.retail_benefit_income,cb.retail_real_subtotal,
cb.real_income_total,
cm.pk_vertex, cm.service_code, cm.nick_name
select
cm.member_code,
cm.member_name,
cm.pk_settle_grade,
cm.pk_awards,
bv.vertex_name,
ct.team_name,
cb.period,
cp.settle_date,
cb.direct_income,
cb.store_income,
cb.global_points,
cb.pk_rate,
bc.out_exchange_rate,
cm.pk_vertex,
cm.service_code,
cm.nick_name
from cu_member_bonus cb
inner join cu_member cm
on cb.pk_member = cm.pk_id
@ -408,36 +372,10 @@
<select id="queryMemberBonusByConditionForServerSum" resultMap="CuMemberBonus">
select
nvl(sum(cb.direct_income),0) direct_income,
nvl(sum(cb.expand_income),0) expand_income,
nvl(sum(cb.expand_no_capping),0) expand_no_capping,
nvl(sum(cb.expand_capping),0) expand_capping,
nvl(sum(cb.coach_income),0) coach_income,
nvl(sum(cb.share_income),0) share_income,
nvl(sum(cb.service_income),0) service_income,
nvl(sum(cb.back_points),0) back_points,
nvl(sum(cb.service_spend),0) service_spend,
nvl(sum(cb.pur_real_subtotal),0) pur_real_subtotal,
nvl(sum(cb.repur_push_income),0) repur_push_income,
nvl(sum(cb.repur_expand_income),0) repur_expand_income,
nvl(sum(cb.repur_real_subtotal),0) repur_real_subtotal,
nvl(sum(cb.repur_coupon),0) repur_coupon,
nvl(sum(cb.repur_coupon_share),0) repur_coupon_share,
nvl(sum(cb.repur_coupon_subtotal),0) repur_coupon_subtotal,
nvl(sum(cb.store_income),0) store_income,
nvl(sum(cb.global_points),0) global_points,
nvl(sum(cb.car_award_points),0) car_award_points,
bc.out_exchange_rate,
nvl(sum(cb.repur_range_income),0) repur_range_income,
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.retail_area_income),0) retail_area_income,
nvl(sum(cb.retail_benefit_range_income),0) retail_benefit_range_income,
nvl(sum(cb.retail_month_repurchase_income),0) retail_month_repurchase_income,
nvl(sum(cb.retail_benefit_avg_income),0) retail_benefit_avg_income,
nvl(sum(cb.retail_benefit_income),0) retail_benefit_income,
nvl(sum(cb.retail_real_subtotal),0) retail_real_subtotal,
nvl(sum(cb.real_income_total),0) real_income_total
nvl( sum( cb.direct_income ), 0 ) direct_income,
nvl( sum( cb.store_income ), 0 ) store_income,
nvl( sum( cb.global_points ), 0 ) global_points,
bc.out_exchange_rate
from cu_member_bonus cb
inner join cu_member cm
on cb.pk_member = cm.pk_id

16
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml
View File

@ -36,18 +36,19 @@
<select id="queryMemberBonusStageByBonusItemsFoServer"
resultType="com.hzs.common.domain.member.ext.CuMemberBonusDetailExt"
parameterType="com.hzs.bonus.bonus.param.BonusParam">
select b.period,cp.settle_date,so.order_code,so.order_type,bt.short_name source_country_name,
cu.member_code source_member_code,cu.member_name source_member_name,nvl(so.pk_rate,b.pk_rate) pk_rate,
nvl(bc.out_exchange_rate,0) out_exchange_rate,
nvl(so.order_amount,0) order_amount, nvl(so.order_achieve,0) order_achieve,
so.order_amount order_amount, so.order_achieve order_achieve,
b.pk_country,b.pk_bonus_items,b.pretax_income,b.income_tax,b.real_income,b.income_status,
tar.member_code,tar.member_name,
bg.pk_transaction pk_settle_grade, ba.pk_transaction pk_awards,
bv.vertex_name,ct.team_name,
b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,bct.short_name settle_country
from (
select cb.pk_member,cd.pk_order,cb.period,cb.pk_country,cd.pk_bonus_items,cd.income_status,
select
cd.PK_SOURCE_MEMBER,
cb.pk_member,cd.pk_order,cb.period,cb.pk_country,cd.pk_bonus_items,cd.income_status,
cd.CAL_ACHIEVE,cd.pretax_income,cd.income_tax,cd.real_income,
cd.remark,cd.income_ratio,cd.income_dial_ratio,cd.order_dial_ratio,cb.pk_rate
from cu_member_bonus cb
@ -88,10 +89,8 @@
<if test="bonusParam.orderType != null">
and so.order_type = #{bonusParam.orderType}
</if>
left join cu_member tar
on b.pk_member = tar.pk_id
left join cu_member cu
on so.pk_member = cu.pk_id
LEFT JOIN cu_member tar ON b.PK_SOURCE_MEMBER = tar.pk_id
LEFT JOIN cu_member cu ON b.PK_SOURCE_MEMBER = cu.pk_id
left join cu_member_settle_period cp
on b.period = cp.pk_id
left join bd_vertex bv
@ -104,8 +103,7 @@
on bg.pk_id=tar.pk_settle_grade
left join bd_awards ba
on ba.pk_id=tar.pk_awards
left join bd_country bt
on bt.pk_id=so.pk_country
LEFT JOIN bd_country bt ON bt.pk_id = cu.pk_country
left join bd_country bct
on bct.pk_id=tar.pk_settle_country
<where>

208
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonus.java
View File

@ -56,124 +56,10 @@ public class CuMemberBonus extends BaseEntity {
private BigDecimal directIncome;
/**
* 拓展收益
* 阶段收益-众康
*/
@TableField("EXPAND_INCOME")
private BigDecimal expandIncome;
/**
* 拓展无封 (拓展收益按等级正常比例结算，并 拓展收益按等级正常比例结算 无封顶)
*/
@TableField("EXPAND_NO_CAPPING")
private BigDecimal expandNoCapping;
/**
* 拓展封顶 (拓展收益按等级正常比例结算，不按4-N结算，根据配置的封顶值限制最大收益)
*/
@TableField("EXPAND_CAPPING")
private BigDecimal expandCapping;
/**
* 培育津贴
*/
@TableField("COACH_INCOME")
private BigDecimal coachIncome;
/**
* 分红收益
*/
@TableField("SHARE_INCOME")
private BigDecimal shareIncome;
/**
* 报单收益
*/
@TableField("SERVICE_INCOME")
private BigDecimal serviceIncome;
/**
* 商城重消
*/
@TableField("BACK_POINTS")
private BigDecimal backPoints;
/**
* 平台服务费
*/
@TableField("SERVICE_SPEND")
private BigDecimal serviceSpend;
/**
* 首购实发小计
*/
@TableField("PUR_REAL_SUBTOTAL")
private BigDecimal purRealSubtotal;
/**
* 复购推荐收益 修改为互助收益 cu_member_bonus_push
*/
@TableField("REPUR_PUSH_INCOME")
private BigDecimal repurPushIncome;
/**
* 复购级差收益
*/
@TableField("REPUR_RANGE_INCOME")
private BigDecimal repurRangeIncome;
/**
* 复购拓展收益
*/
@TableField("REPUR_EXPAND_INCOME")
private BigDecimal repurExpandIncome;
/**
* 复购实发小计
*/
@TableField("REPUR_REAL_SUBTOTAL")
private BigDecimal repurRealSubtotal;
/**
* 云代直推收益 修改为幸运收益 cu_member_bonus_coach
*/
@TableField("CLOUD_DIRECT_INCOME")
private BigDecimal cloudDirectIncome;
/**
* 云代首购收益 修改为极差收益 cu_member_bonus_range
*/
@TableField("CLOUD_PUR_INCOME")
private BigDecimal cloudPurIncome;
/**
* 云代复购收益 修改为平级收益 cu_member_bonus_range
*/
@TableField("CLOUD_REPUR_INCOME")
private BigDecimal cloudRepurIncome;
/**
* 云代实发小计 修改为 极差小计
*/
@TableField("CLOUD_REAL_SUBTOTAL")
private BigDecimal cloudRealSubtotal;
/**
* 复购券
*/
@TableField("REPUR_COUPON")
private BigDecimal repurCoupon;
/**
* 复购券均分收益
*/
@TableField("REPUR_COUPON_SHARE")
private BigDecimal repurCouponShare;
/**
* 复购券小计
*/
@TableField("REPUR_COUPON_SUBTOTAL")
private BigDecimal repurCouponSubtotal;
@TableField("STORE_INCOME")
private BigDecimal storeIncome;
/**
* 复购见点收益-众康
@ -181,95 +67,7 @@ public class CuMemberBonus extends BaseEntity {
@TableField("GLOBAL_POINTS")
private BigDecimal globalPoints;
/**
* 车奖积分
*/
@TableField("CAR_AWARD_POINTS")
private BigDecimal carAwardPoints;
/**
* 阶段收益-众康
*/
@TableField("STORE_INCOME")
private BigDecimal storeIncome;
/**
* 嗨粉推荐收益
*/
@TableField("HI_FUN_INCOME")
private BigDecimal hiFunIncome;
/**
* 海粉推荐收益
*/
@TableField("HAI_FUN_INCOME")
private BigDecimal haiFunIncome;
/**
* 创客空间直推收益
*/
@TableField("MAKER_DIRECT_INCOME")
private BigDecimal makerDirectIncome;
/**
* 创客共享收益
*/
@TableField("MAKER_SHARE_INCOME")
private BigDecimal makerShareIncome;
/**
* 创客空间收益小计
*/
@TableField("MAKER_REAL_SUBTOTAL")
private BigDecimal makerRealSubtotal;
/**
* 新零售直推收益
*/
@TableField("RETAIL_RANGE_INCOME")
private BigDecimal retailRangeIncome;
/**
* 新零售平级收益
*/
@TableField("RETAIL_SAME_LEVEL_INCOME")
private BigDecimal retailSameLevelIncome;
/**
* 新零售区域分红
*/
@TableField("RETAIL_AREA_INCOME")
private BigDecimal retailAreaIncome;
/**
* 新零售福利级差收益
*/
@TableField("RETAIL_BENEFIT_RANGE_INCOME")
private BigDecimal retailBenefitRangeIncome;
/**
* 新零售复购级差收益
*/
@TableField("RETAIL_MONTH_REPURCHASE_INCOME")
private BigDecimal retailMonthRepurchaseIncome;
/**
* 福利分红平均收益
*/
@TableField("RETAIL_BENEFIT_AVG_INCOME")
private BigDecimal retailBenefitAvgIncome;
/**
* 福利分红加权收益
*/
@TableField("RETAIL_BENEFIT_INCOME")
private BigDecimal retailBenefitIncome;
/**
* 新零售收益小计
*/
@TableField("RETAIL_REAL_SUBTOTAL")
private BigDecimal retailRealSubtotal;
/**
* 实发收益总计