nnnn
This commit is contained in:
@@ -93,7 +93,7 @@ public class PointChangeLogServiceImpl extends ServiceImpl<PointChangeLogMapper,
|
||||
pointChangeLog.setUserId(userId);
|
||||
pointChangeLog.setUsercode(user.getUsercode());
|
||||
pointChangeLog.setActionType(PointChangeLogActionTypeEnum.SYSTEM.getCode());
|
||||
String message = String.format("从【%s】中充值分成新增%s积分", inviteUser.getNickname(), givePoint);
|
||||
String message = String.format("从【%s】的充值中获得%s积分", inviteUser.getNickname(), givePoint);
|
||||
pointChangeLog.setMessage(message);
|
||||
pointChangeLog.setTarUserId(inviteUser.getId());
|
||||
pointChangeLog.setTarUsercode(inviteUser.getUsercode());
|
||||
|
||||
@@ -63,8 +63,8 @@ public class PointRecordLogServiceImpl extends ServiceImpl<PointRecordLogMapper,
|
||||
if(userInvite != null){
|
||||
User oneUser = userService.getById(userInvite.getInviteId());
|
||||
if(oneUser != null && oneUser.getStatus() == 0){
|
||||
UserInfo userInfo = userInfoService.getByUserId(userInvite.getUserId());
|
||||
pointLog.setOneRate(userInfo.getPointRate());
|
||||
UserInfo inviteUserInfo = userInfoService.getByUserId(userInvite.getInviteId());
|
||||
pointLog.setOneRate(inviteUserInfo.getPointRate());
|
||||
pointLog.setOneUserId(oneUser.getId());
|
||||
pointLog.setOneUsercode(oneUser.getUsercode());
|
||||
pointLog.setOnePhone(oneUser.getMobile());
|
||||
@@ -74,7 +74,7 @@ public class PointRecordLogServiceImpl extends ServiceImpl<PointRecordLogMapper,
|
||||
}
|
||||
if(dto.isDistribution()){ // 需要分销,直接分销
|
||||
pointLog.setStatus(ConsumeLogStatus.ALREADY.getCode());
|
||||
if(pointLog.getOnePoints() >= 0 && pointLog.getOneUserId() != null && !pointLog.getOneJoin()){
|
||||
if(pointLog.getOnePoints() >= 0 && pointLog.getOneUserId() != null && pointLog.getOneJoin()){
|
||||
String traceId = IdManager.nextIdStr();
|
||||
pointChangeLogService.adminInvite(pointLog.getOneUserId(),pointLog.getOnePoints(),pointLog.getSourceUserId(),traceId);
|
||||
pointLog.setTraceId(traceId);
|
||||
|
||||
Reference in New Issue
Block a user