1
0

2 Коммиты c301680d23 ... 5c558e6506

Автор SHA1 Сообщение Дата
  Ben 5c558e6506 Merge remote-tracking branch 'origin/master' 5 месяцев назад
  Ben 3122ae0966 修改积分日志枚举 5 месяцев назад

+ 3 - 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, "订单退款,积分退回", "购物收货7天后,冻结积分变为可用积分"),
+    ORDER_REFUND_INTEGRAL(10, "退回退款订单项,消费者支付的积分", "退回退款订单项,购物者支付的积分"),
     ORDER_INTEGRAL_UNFREEZE(11, "订单积分到账", "订单积分到账"),
     AFTER_CRASH_CALC_PT_TOTAL_GROSS_QUOTA(12, "碰撞后计算平台收益", "碰撞后计算平台收益"),
     FREEZE_CHANGE_INTEGRAL(13, "冻结积分转化成可用积分", "冻结积分变为可用积分"),
@@ -25,7 +25,8 @@ public enum CaclEnum {
     ORDER_CANCEL_BY_USER_REFUND_INTEGRAL(16,"取消订单,退回积分","取消订单,退回积分"),
     ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL(17,"订单超时未支付,退回积分","订单超时未支付,退回积分"),
     ORDER_PAY_INTEGRAL_ANCESTER(18, "直推人购物,推荐人获得冻结积分","直推人购物,推荐人获得冻结积分(购物上级直推人获得积分)"),
-    ORDER_REFUND_INTEGRAL_ANCESTER(19,"订单退款,积分退回","订单超时未支付,退回积分")
+    ORDER_REFUND_INTEGRAL_CONSUMER(19,"订单退款,收回消费者获得的冻结积分","订单退款,收回消费者获得的冻结积分"),
+    ORDER_REFUND_INTEGRAL_ANCESTER(20,"订单退款,收回消费者的推荐人,获得的冻结积分","订单退款,收回消费者的推荐人,获得的冻结积分")
     ;
 
     /**