## 奖金修改:
1.成为银级会员改为赠送1000元产品,成为金级会员改为赠送3000元产品。 2.增加在精品专区购物的会员推荐奖10%,取消银级会员、金级会员推荐给1000元、2000元产品。
This commit is contained in:
		
							parent
							
								
									8911e80a8d
								
							
						
					
					
						commit
						fa61fa368e
					
				| 
						 | 
					@ -403,10 +403,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
 | 
				
			||||||
                    this.calculateRetailRangeBonus(cuMemberBonusRangeList, memberRangeExtMap, cuMemberBonusMap, bonusConfigDTO, period,
 | 
					                    this.calculateRetailRangeBonus(cuMemberBonusRangeList, memberRangeExtMap, cuMemberBonusMap, bonusConfigDTO, period,
 | 
				
			||||||
                            awardsMap, saOrderExt, sourceMember);
 | 
					                            awardsMap, saOrderExt, sourceMember);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    // 2025.10.27需求调整,去掉直推收益
 | 
					                    // 直推收益 -- 来源订单金额,直推拿业绩的10%
 | 
				
			||||||
//                    // 直推收益 -- 来源订单金额,直推拿业绩的10%
 | 
					                    this.calculateDirectIncome(cuMemberBonusPushList, memberRangeExtMap, sourceMember, saOrderExt,
 | 
				
			||||||
//                    this.calculateDirectIncome(cuMemberBonusPushList, memberRangeExtMap, sourceMember, saOrderExt,
 | 
					                            bonusConfigDTO, period, cuMemberBonusMap);
 | 
				
			||||||
//                            bonusConfigDTO, period, cuMemberBonusMap);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    // 2025.10.27需求调整,订单满指定PV对应给指定赠品积分
 | 
					                    // 2025.10.27需求调整,订单满指定PV对应给指定赠品积分
 | 
				
			||||||
                    this.calculateGiftPoint(memberRangeExtMap, saOrderExt, cuMemberBonusMap, cuMemberBonusDetailList, bonusConfigDTO, period);
 | 
					                    this.calculateGiftPoint(memberRangeExtMap, saOrderExt, cuMemberBonusMap, cuMemberBonusDetailList, bonusConfigDTO, period);
 | 
				
			||||||
| 
						 | 
					@ -1462,17 +1461,17 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // 赠送积分
 | 
					        // 赠送积分
 | 
				
			||||||
        BigDecimal giftPoint = BigDecimal.ZERO;
 | 
					        BigDecimal giftPoint = BigDecimal.ZERO;
 | 
				
			||||||
        // 推荐赠送积分
 | 
					//        // 推荐赠送积分
 | 
				
			||||||
        BigDecimal targetGiftPoint = BigDecimal.ZERO;
 | 
					//        BigDecimal targetGiftPoint = BigDecimal.ZERO;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (orderAchieve.compareTo(BonusConstants.GIFT_TWO_AMOUNT) >= 0) {
 | 
					        if (orderAchieve.compareTo(BonusConstants.GIFT_TWO_AMOUNT) >= 0) {
 | 
				
			||||||
            // 订单业绩大于等于2万
 | 
					            // 订单业绩大于等于2万
 | 
				
			||||||
            giftPoint = BonusConstants.GIFT_TWO_POINT;
 | 
					            giftPoint = BonusConstants.GIFT_TWO_POINT;
 | 
				
			||||||
            targetGiftPoint = BonusConstants.TARGET_GIFT_TWO_POINT;
 | 
					//            targetGiftPoint = BonusConstants.TARGET_GIFT_TWO_POINT;
 | 
				
			||||||
        } else if (orderAchieve.compareTo(BonusConstants.GIFT_ONE_AMOUNT) >= 0) {
 | 
					        } else if (orderAchieve.compareTo(BonusConstants.GIFT_ONE_AMOUNT) >= 0) {
 | 
				
			||||||
            // 订单业绩大于等于1万
 | 
					            // 订单业绩大于等于1万
 | 
				
			||||||
            giftPoint = BonusConstants.GIFT_ONE_POINT;
 | 
					            giftPoint = BonusConstants.GIFT_ONE_POINT;
 | 
				
			||||||
            targetGiftPoint = BonusConstants.TARGET_GIFT_ONE_POINT;
 | 
					//            targetGiftPoint = BonusConstants.TARGET_GIFT_ONE_POINT;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (giftPoint.compareTo(BigDecimal.ZERO) > 0 && null != sourceMember) {
 | 
					        if (giftPoint.compareTo(BigDecimal.ZERO) > 0 && null != sourceMember) {
 | 
				
			||||||
| 
						 | 
					@ -1488,20 +1487,20 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            cuMemberBonusDetailList.add(cuMemberBonusDetail);
 | 
					            cuMemberBonusDetailList.add(cuMemberBonusDetail);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        if (targetGiftPoint.compareTo(BigDecimal.ZERO) > 0 && null != targetMember && targetMember.getGradeValue() >= EGrade.HAI_FAN.getValue()) {
 | 
					//        if (targetGiftPoint.compareTo(BigDecimal.ZERO) > 0 && null != targetMember && targetMember.getGradeValue() >= EGrade.HAI_FAN.getValue()) {
 | 
				
			||||||
            // 银卡 或 金卡会员推荐才有奖励
 | 
					//            // 银卡 或 金卡会员推荐才有奖励
 | 
				
			||||||
            CuMemberBonus cuMemberBonus = getCuMemberBonus(period, cuMemberBonusMap, targetMember.getPkMember(),
 | 
					//            CuMemberBonus cuMemberBonus = getCuMemberBonus(period, cuMemberBonusMap, targetMember.getPkMember(),
 | 
				
			||||||
                    targetMember.getIncomeStatus(), targetMember.getPkSettleCountry(), targetMember.getPkRate() == null ? saOrderExt.getPkRate() : targetMember.getPkRate());
 | 
					//                    targetMember.getIncomeStatus(), targetMember.getPkSettleCountry(), targetMember.getPkRate() == null ? saOrderExt.getPkRate() : targetMember.getPkRate());
 | 
				
			||||||
            int pkBonusItems = getPkBonusItems(bonusConfigDTO, targetMember.getPkSettleCountry(), EBonusItems.GIFT_POINT.getValue());
 | 
					//            int pkBonusItems = getPkBonusItems(bonusConfigDTO, targetMember.getPkSettleCountry(), EBonusItems.GIFT_POINT.getValue());
 | 
				
			||||||
            CuMemberBonusDetail cuMemberBonusDetail = getCuMemberBonusDetail(saOrderExt, targetMember, cuMemberBonus, pkBonusItems);
 | 
					//            CuMemberBonusDetail cuMemberBonusDetail = getCuMemberBonusDetail(saOrderExt, targetMember, cuMemberBonus, pkBonusItems);
 | 
				
			||||||
            cuMemberBonusDetail.setPretaxIncome(targetGiftPoint);
 | 
					//            cuMemberBonusDetail.setPretaxIncome(targetGiftPoint);
 | 
				
			||||||
            setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusDetail, saOrderExt.getOrderAmount(), saOrderExt.getInExchangeRate());
 | 
					//            setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusDetail, saOrderExt.getOrderAmount(), saOrderExt.getInExchangeRate());
 | 
				
			||||||
            giftPointRemark(saOrderExt, cuMemberBonusDetail, targetMember);
 | 
					//            giftPointRemark(saOrderExt, cuMemberBonusDetail, targetMember);
 | 
				
			||||||
            if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusDetail.getIncomeStatus()) {
 | 
					//            if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusDetail.getIncomeStatus()) {
 | 
				
			||||||
                cuMemberBonus.setBackPoints(ComputeUtil.computeAdd(cuMemberBonus.getBackPoints(), targetGiftPoint));
 | 
					//                cuMemberBonus.setBackPoints(ComputeUtil.computeAdd(cuMemberBonus.getBackPoints(), targetGiftPoint));
 | 
				
			||||||
            }
 | 
					//            }
 | 
				
			||||||
            cuMemberBonusDetailList.add(cuMemberBonusDetail);
 | 
					//            cuMemberBonusDetailList.add(cuMemberBonusDetail);
 | 
				
			||||||
        }
 | 
					//        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -34,11 +34,11 @@ public class BonusConstants {
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * 2万业绩赠送积分
 | 
					     * 2万业绩赠送积分
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    public static final BigDecimal GIFT_TWO_POINT = new BigDecimal("7000");
 | 
					    public static final BigDecimal GIFT_TWO_POINT = new BigDecimal("3000");
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * 1万业绩赠送积分
 | 
					     * 1万业绩赠送积分
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    public static final BigDecimal GIFT_ONE_POINT = new BigDecimal("2000");
 | 
					    public static final BigDecimal GIFT_ONE_POINT = new BigDecimal("1000");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * 推荐2万业绩会员赠送积分
 | 
					     * 推荐2万业绩会员赠送积分
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue