2 Commity 0915ac1ff7 ... d1e9bf4c1e

Autor SHA1 Wiadomość Data
  Ben d1e9bf4c1e Merge remote-tracking branch 'origin/master' 8 miesięcy temu
  Ben 4cdcda4228 支付生成直推人积分 8 miesięcy temu

+ 4 - 2
feifan-module-distri/feifan-module-distri-api/src/main/java/cn/newfeifan/mall/module/distri/enums/CaclEnum.java

@@ -16,7 +16,7 @@ public enum CaclEnum {
     SMALL_QUOTA_CRASH(7, "合赢奖获得"),
     AFTER_CRASH_CALC_PT_TOTAL_QUOTA(8, "碰撞后计算平台总收益"),
     ORDER_PAY_INTEGRAL(9, "购物获得"),      //购物获得冻结积分
-    ORDER_REFUND_INTEGRAL(10, "订单退款,积分退回"),
+    ORDER_REFUND_INTEGRAL(10, "退回退款订单项,消费者支付的积分"),
     ORDER_INTEGRAL_UNFREEZE(11, "订单积分到账"),
     AFTER_CRASH_CALC_PT_TOTAL_GROSS_QUOTA(12, "碰撞后计算平台收益"),
     FREEZE_CHANGE_INTEGRAL(13, "冻结积分转化成可用积分"),
@@ -24,7 +24,9 @@ public enum CaclEnum {
     GROSS_PROFIT_ANCESTOR_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT(15, "直推奖超额"),
     ORDER_CANCEL_BY_USER_REFUND_INTEGRAL(16,"取消订单,退回积分"),
     ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL(17,"订单超时未支付,退回积分"),
-    ORDER_PAY_INTEGRAL_ANCESTER(18, "直推人购物,推荐人获得冻结积分")//购物 上级直推人 获得积分
+    ORDER_PAY_INTEGRAL_ANCESTER(18, "直推人购物,推荐人获得冻结积分"),//购物 上级直推人 获得积分
+    ORDER_REFUND_INTEGRAL_CONSUMER(19,"订单退款,收回消费者获得的冻结积分"),
+    ORDER_REFUND_INTEGRAL_ANCESTER(20,"订单退款,收回消费者的推荐人,获得的冻结积分")
     ;
 
     /**