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

Compare commits

base: angelo:f879199b251c24666c32f2330cd1e3822ee477a3
Branches Tags
angelo:master
angelo:online
angelo:test
angelo:dev
angelo:feat_shared_reg
..
compare: angelo:3f4afdc3b2bab3d4b6c27a8ae7e9e8f7831cad87
Branches Tags
angelo:online
angelo:test
angelo:dev
angelo:feat_shared_reg
angelo:master

No commits in common. "f879199b251c24666c32f2330cd1e3822ee477a3" and "3f4afdc3b2bab3d4b6c27a8ae7e9e8f7831cad87" have entirely different histories.
f879199b25 ... 3f4afdc3b2

2 changed files with 21 additions and 21 deletions
Show Stats Expand all files Collapse all files

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

@ -65,6 +65,17 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
@DubboReference @DubboReference
ICuMemberServiceLogServiceApi iCuMemberServiceLogServiceApi; ICuMemberServiceLogServiceApi iCuMemberServiceLogServiceApi;
/**
* 特殊体系PK_ID: 150
* V4：总 500，小 100
* V5：总 2000，小 400
*/
public static final Long VERTEX_PK_ID = 150L;
public static final BigDecimal VERTEX_V4_TOTAL_BOX = new BigDecimal("500");
public static final BigDecimal VERTEX_V4_SMALL_BOX = new BigDecimal("100");
public static final BigDecimal VERTEX_V5_TOTAL_BOX = new BigDecimal("2000");
public static final BigDecimal VERTEX_V5_SMALL_BOX = new BigDecimal("400");
/** /**
* 秒结： * 秒结：
* 实时计算秒结数据（业绩、盒数、等级、奖衔、日奖） * 实时计算秒结数据（业绩、盒数、等级、奖衔、日奖）
@ -728,16 +739,16 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
// 等级小市场盒数 // 等级小市场盒数
BigDecimal boxSmallTotal = bdGrade.getBoxSmallTotal(); BigDecimal boxSmallTotal = bdGrade.getBoxSmallTotal();
if (RetailConstants.VERTEX_PK_ID.equals(targetMemberRangeExt.getPkVertex())) { if (VERTEX_PK_ID.equals(targetMemberRangeExt.getPkVertex())) {
// TODO 需要根据配置写死的体系，进行单独处理 // TODO 需要根据配置写死的体系，进行单独处理
// V4： 总 500，小 100 // V4： 总 500，小 100
// V5： 总 2000，小 400 // V5： 总 2000，小 400
if (EGrade.VIP.getValue() == bdGrade.getGradeValue()) { if (EGrade.VIP.getValue() == bdGrade.getGradeValue()) {
boxTotal = RetailConstants.VERTEX_V4_TOTAL_BOX; boxTotal = VERTEX_V4_TOTAL_BOX;
boxSmallTotal = RetailConstants.VERTEX_V4_SMALL_BOX; boxSmallTotal = VERTEX_V4_SMALL_BOX;
} else if (EGrade.S_VIP.getValue() == bdGrade.getGradeValue()) { } else if (EGrade.S_VIP.getValue() == bdGrade.getGradeValue()) {
boxTotal = RetailConstants.VERTEX_V5_TOTAL_BOX; boxTotal = VERTEX_V5_TOTAL_BOX;
boxSmallTotal = RetailConstants.VERTEX_V5_SMALL_BOX; boxSmallTotal = VERTEX_V5_SMALL_BOX;
} }
} }
@ -977,16 +988,16 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
// 等级小市场盒数 // 等级小市场盒数
BigDecimal boxSmallTotal = bdGrade.getBoxSmallTotal(); BigDecimal boxSmallTotal = bdGrade.getBoxSmallTotal();
if (RetailConstants.VERTEX_PK_ID.equals(targetMemberRangeExt.getPkVertex())) { if (VERTEX_PK_ID.equals(targetMemberRangeExt.getPkVertex())) {
// TODO 需要根据配置写死的体系，进行单独处理 // TODO 需要根据配置写死的体系，进行单独处理
// V4： 总 500，小 100 // V4： 总 500，小 100
// V5： 总 2000，小 400 // V5： 总 2000，小 400
if (EGrade.VIP.getValue() == bdGrade.getGradeValue()) { if (EGrade.VIP.getValue() == bdGrade.getGradeValue()) {
boxTotal = RetailConstants.VERTEX_V4_TOTAL_BOX; boxTotal = VERTEX_V4_TOTAL_BOX;
boxSmallTotal = RetailConstants.VERTEX_V4_SMALL_BOX; boxSmallTotal = VERTEX_V4_SMALL_BOX;
} else if (EGrade.S_VIP.getValue() == bdGrade.getGradeValue()) { } else if (EGrade.S_VIP.getValue() == bdGrade.getGradeValue()) {
boxTotal = RetailConstants.VERTEX_V5_TOTAL_BOX; boxTotal = VERTEX_V5_TOTAL_BOX;
boxSmallTotal = RetailConstants.VERTEX_V5_SMALL_BOX; boxSmallTotal = VERTEX_V5_SMALL_BOX;
} }
} }

11
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailConstants.java
View File

@ -18,17 +18,6 @@ public class RetailConstants {
*/ */
public static final BigDecimal SAME_RATIO = new BigDecimal("0.005"); public static final BigDecimal SAME_RATIO = new BigDecimal("0.005");
/**
* 特殊体系PK_ID: 150
* V4：总 500，小 100
* V5：总 2000，小 400
*/
public static final Long VERTEX_PK_ID = 150L;
public static final BigDecimal VERTEX_V4_TOTAL_BOX = new BigDecimal("500");
public static final BigDecimal VERTEX_V4_SMALL_BOX = new BigDecimal("100");
public static final BigDecimal VERTEX_V5_TOTAL_BOX = new BigDecimal("2000");
public static final BigDecimal VERTEX_V5_SMALL_BOX = new BigDecimal("400");
/** /**
* 盒数产品列表 * 盒数产品列表
*/ */