This commit is contained in:
777
2025-12-09 14:55:18 +08:00
parent e36a5a9ddd
commit 1071ba3fb0
3 changed files with 22 additions and 16 deletions

2
doc/20251209.sql Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE cai_point_record_log
ADD COLUMN one_join tinyint default 1 not null comment '是否参与分销';

View File

@@ -62,6 +62,7 @@ public class PointRecordLog implements Serializable{
* 分销方积分 * 分销方积分
*/ */
private Long onePoints; private Long onePoints;
private Boolean oneJoin;
/** /**
* 状态 -1-无须分销 0-待分销 1-已分销 * 状态 -1-无须分销 0-待分销 1-已分销
*/ */

View File

@@ -68,6 +68,7 @@ public class PointRecordLogServiceImpl extends ServiceImpl<PointRecordLogMapper,
pointLog.setOneUserId(oneUser.getId()); pointLog.setOneUserId(oneUser.getId());
pointLog.setOneUsercode(oneUser.getUsercode()); pointLog.setOneUsercode(oneUser.getUsercode());
pointLog.setOnePhone(oneUser.getMobile()); pointLog.setOnePhone(oneUser.getMobile());
pointLog.setOneJoin(userInvite.getEnableRate());
pointLog.setOnePoints(CaiNumUtil.coin(pointLog.getPoints(),pointLog.getOneRate())); pointLog.setOnePoints(CaiNumUtil.coin(pointLog.getPoints(),pointLog.getOneRate()));
} }
} }
@@ -87,29 +88,30 @@ public class PointRecordLogServiceImpl extends ServiceImpl<PointRecordLogMapper,
@Override @Override
public PointRecordLog initOrder(RechargeOrder rechargeOrder, User user){ public PointRecordLog initOrder(RechargeOrder rechargeOrder, User user){
PointRecordLog log = new PointRecordLog(); PointRecordLog pointLog = new PointRecordLog();
log.setPoints(rechargeOrder.getGivePoint()); pointLog.setPoints(rechargeOrder.getGivePoint());
log.setSourceUserId(user.getId()); pointLog.setSourceUserId(user.getId());
log.setSourceUsercode(user.getUsercode()); pointLog.setSourceUsercode(user.getUsercode());
log.setSourcePhone(user.getMobile()); pointLog.setSourcePhone(user.getMobile());
UserInvite userInvite = userInviteService.getByUserId(user.getId()); UserInvite userInvite = userInviteService.getByUserId(user.getId());
if(userInvite != null){ if(userInvite != null){
User oneUser = userService.getById(userInvite.getInviteId()); User oneUser = userService.getById(userInvite.getInviteId());
if(oneUser != null && oneUser.getStatus() == 0){ if(oneUser != null && oneUser.getStatus() == 0){
UserInfo userInfo = userInfoService.getByUserId(userInvite.getUserId()); UserInfo userInfo = userInfoService.getByUserId(userInvite.getUserId());
log.setOneRate(userInfo.getPointRate()); pointLog.setOneRate(userInfo.getPointRate());
log.setOneUserId(oneUser.getId()); pointLog.setOneUserId(oneUser.getId());
log.setOneUsercode(oneUser.getUsercode()); pointLog.setOneUsercode(oneUser.getUsercode());
log.setOnePhone(oneUser.getMobile()); pointLog.setOnePhone(oneUser.getMobile());
log.setOnePoints(CaiNumUtil.coin(log.getPoints(),log.getOneRate())); pointLog.setOnePoints(CaiNumUtil.coin(pointLog.getPoints(),pointLog.getOneRate()));
pointLog.setOneJoin(userInvite.getEnableRate());
} }
} }
log.setStatus(ConsumeLogStatus.READY.getCode()); pointLog.setStatus(ConsumeLogStatus.READY.getCode());
log.setSourceType(PointLogType.ORDER.getCode()); pointLog.setSourceType(PointLogType.ORDER.getCode());
log.setSourceId(rechargeOrder.getOrderNo()); pointLog.setSourceId(rechargeOrder.getOrderNo());
log.setCreateTime(LocalDateTime.now()); pointLog.setCreateTime(LocalDateTime.now());
this.save(log); this.save(pointLog);
return log; return pointLog;
} }
@Override @Override
@@ -132,6 +134,7 @@ public class PointRecordLogServiceImpl extends ServiceImpl<PointRecordLogMapper,
if(pointRecordLog.getOneUserId() == null || pointRecordLog.getPoints() <= 0){ if(pointRecordLog.getOneUserId() == null || pointRecordLog.getPoints() <= 0){
return; return;
} }
accountMapper.incrPoint(pointRecordLog.getOneUserId(), pointRecordLog.getOnePoints()); accountMapper.incrPoint(pointRecordLog.getOneUserId(), pointRecordLog.getOnePoints());
} }