购物积分变动枚举

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

@@ -9,8 +9,8 @@ public enum CaclEnum {
     PLATFORM_TOTAL_ADD(0, "平台总收益"),
     PLATFORM_SERVICE_FEE(1, "平台服务费"),
     PLATFORM_REVENUE(2, "平台收益"),
-    RECOMMENDED_PERSON_QUOTA(3, "直推奖获得"),
-    DIRECT_REFERRAL_QUOTA(4, "购物获得"),       //购物用户自得额度
+    RECOMMENDED_PERSON_QUOTA(3, "直推奖获得可用积分"),
+    DIRECT_REFERRAL_QUOTA(4, "购物获得可用积分"),       //购物用户自得额度
     TOGETHER_AWARD(5, "合赢奖"),
     HIGH_QUOTA(6, "最高可以获得积分"),
     SMALL_QUOTA_CRASH(7, "合赢奖获得"),
@@ -26,7 +26,8 @@ public enum CaclEnum {
     ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL(17,"订单超时未支付，退回积分"),
     ORDER_PAY_INTEGRAL_ANCESTER(18, "直推人购物,推荐人获得冻结积分"),//购物 上级直推人 获得积分
     ORDER_REFUND_INTEGRAL_CONSUMER(19,"订单退款，收回消费者获得的冻结积分"),
-    ORDER_REFUND_INTEGRAL_ANCESTER(20,"订单退款，收回消费者的推荐人，获得的冻结积分")
+    ORDER_REFUND_INTEGRAL_ANCESTER(20,"订单退款，收回消费者的推荐人，获得的冻结积分"),
+    ORDER_PAY_INTEGRAL_CONSUMER(21, "消费者购物,获得冻结积分"),//购物者本人 获得积分
     ;
 
     /**

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -999,7 +999,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
 
             String OrderNum = order.getNo();
             //修改购物者本人获得的冻结积分
-            integralService.updateUserIntegral(tradeOrderDO.getUserId(),tradeOrderDO.getUserId(),CaclEnum.ORDER_PAY_INTEGRAL, 0L, totalFreezeAmount, tradeOrderId, OrderNum);
+            integralService.updateUserIntegral(tradeOrderDO.getUserId(),tradeOrderDO.getUserId(),CaclEnum.ORDER_PAY_INTEGRAL_CONSUMER, 0L, totalFreezeAmount, tradeOrderId, OrderNum);
 
             //修改推荐人（上级）获得的冻结积分
             integralService.updateUserIntegral(tradeOrderDO.getUserId(),ancesterUserId, CaclEnum.ORDER_PAY_INTEGRAL_ANCESTER, 0L, totalAncestorFreezeAmount, tradeOrderId, OrderNum);