Merge remote-tracking branch 'origin/dev' into dev

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

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

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

@@ -18,6 +18,17 @@ public class RetailConstants {
      */
     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");
+
     /**
      * 盒数产品列表
      */