From 1071ba3fb0924c6af1e1b459b4bba897466d7a00 Mon Sep 17 00:00:00 2001
From: 777 <123@qwe.com>
Date: Tue, 9 Dec 2025 14:55:18 +0800
Subject: [PATCH] nnnn

---
 doc/20251209.sql                              |  2 ++
 .../com/ruoyi/cai/domain/PointRecordLog.java  |  1 +
 .../impl/PointRecordLogServiceImpl.java       | 35 ++++++++++---------
 3 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 doc/20251209.sql

diff --git a/doc/20251209.sql b/doc/20251209.sql
new file mode 100644
index 00000000..a2449cd0
--- /dev/null
+++ b/doc/20251209.sql
@@ -0,0 +1,2 @@
+ALTER TABLE cai_point_record_log
+    ADD COLUMN one_join tinyint default 1 not null comment '是否参与分销';
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/PointRecordLog.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/PointRecordLog.java
index ee1e01de..39e74500 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/PointRecordLog.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/PointRecordLog.java
@@ -62,6 +62,7 @@ public class PointRecordLog implements Serializable{
      * 分销方积分
      */
     private Long onePoints;
+    private Boolean oneJoin;
     /**
      * 状态  -1-无须分销 0-待分销 1-已分销
      */
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PointRecordLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PointRecordLogServiceImpl.java
index 48d7be16..b69d1c03 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PointRecordLogServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PointRecordLogServiceImpl.java
@@ -68,6 +68,7 @@ public class PointRecordLogServiceImpl extends ServiceImpl<PointRecordLogMapper,
                 pointLog.setOneUserId(oneUser.getId());
                 pointLog.setOneUsercode(oneUser.getUsercode());
                 pointLog.setOnePhone(oneUser.getMobile());
+                pointLog.setOneJoin(userInvite.getEnableRate());
                 pointLog.setOnePoints(CaiNumUtil.coin(pointLog.getPoints(),pointLog.getOneRate()));
             }
         }
@@ -87,29 +88,30 @@ public class PointRecordLogServiceImpl extends ServiceImpl<PointRecordLogMapper,
 
     @Override
     public PointRecordLog initOrder(RechargeOrder rechargeOrder, User user){
-        PointRecordLog log = new PointRecordLog();
-        log.setPoints(rechargeOrder.getGivePoint());
-        log.setSourceUserId(user.getId());
-        log.setSourceUsercode(user.getUsercode());
-        log.setSourcePhone(user.getMobile());
+        PointRecordLog pointLog = new PointRecordLog();
+        pointLog.setPoints(rechargeOrder.getGivePoint());
+        pointLog.setSourceUserId(user.getId());
+        pointLog.setSourceUsercode(user.getUsercode());
+        pointLog.setSourcePhone(user.getMobile());
         UserInvite userInvite = userInviteService.getByUserId(user.getId());
         if(userInvite != null){
             User oneUser = userService.getById(userInvite.getInviteId());
             if(oneUser != null && oneUser.getStatus() == 0){
                 UserInfo userInfo = userInfoService.getByUserId(userInvite.getUserId());
-                log.setOneRate(userInfo.getPointRate());
-                log.setOneUserId(oneUser.getId());
-                log.setOneUsercode(oneUser.getUsercode());
-                log.setOnePhone(oneUser.getMobile());
-                log.setOnePoints(CaiNumUtil.coin(log.getPoints(),log.getOneRate()));
+                pointLog.setOneRate(userInfo.getPointRate());
+                pointLog.setOneUserId(oneUser.getId());
+                pointLog.setOneUsercode(oneUser.getUsercode());
+                pointLog.setOnePhone(oneUser.getMobile());
+                pointLog.setOnePoints(CaiNumUtil.coin(pointLog.getPoints(),pointLog.getOneRate()));
+                pointLog.setOneJoin(userInvite.getEnableRate());
             }
         }
-        log.setStatus(ConsumeLogStatus.READY.getCode());
-        log.setSourceType(PointLogType.ORDER.getCode());
-        log.setSourceId(rechargeOrder.getOrderNo());
-        log.setCreateTime(LocalDateTime.now());
-        this.save(log);
-        return log;
+        pointLog.setStatus(ConsumeLogStatus.READY.getCode());
+        pointLog.setSourceType(PointLogType.ORDER.getCode());
+        pointLog.setSourceId(rechargeOrder.getOrderNo());
+        pointLog.setCreateTime(LocalDateTime.now());
+        this.save(pointLog);
+        return pointLog;
     }
 
     @Override
@@ -132,6 +134,7 @@ public class PointRecordLogServiceImpl extends ServiceImpl<PointRecordLogMapper,
         if(pointRecordLog.getOneUserId() == null || pointRecordLog.getPoints() <= 0){
             return;
         }
+
         accountMapper.incrPoint(pointRecordLog.getOneUserId(), pointRecordLog.getOnePoints());
     }