bnyer
/
bnyer-cloud
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity
Browse Source

bug修复

feature-1.1
wuxicheng 3 years ago
parent
dd3e09307b
commit
fdf88febb4
4 changed files with 20 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/domain/img/GoldRewardMessage.java
  2. 8
      bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/template/RocketMQEnhanceTemplate.java
  3. 15
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceRecordImpl.java
  4. 8
      bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/OrderMqMessageRecordServiceImpl.java

2
bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/domain/img/GoldRewardMessage.java
View File

@ -17,7 +17,7 @@ import java.util.Date;
@Getter
@Setter
@NoArgsConstructor
public class GoldRewardMessage extends BaseMessage {
public class GoldRewardMessage {
@ApiModelProperty(value="用户id")
private Long userId;

8
bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/template/RocketMQEnhanceTemplate.java
View File

@ -107,12 +107,12 @@ public class RocketMQEnhanceTemplate {
@Override
public void onSuccess(SendResult sendResult) {
// 处理消息发送成功逻辑
log.info("消息发送成功,topic:{},tag:{},message:{},result:{}",topic,tag,message, JSON.toJSONString(sendResult));
log.info("消息发送成功,topic:{},tag:{},message:{},result:{}",topic,tag,JSON.toJSONString(message), JSON.toJSONString(sendResult));
}
@Override
public void onException(Throwable throwable) {
// 处理消息发送失败逻辑
log.error("消息发送失败,topic:{},tag:{},message:{},error:{}",topic,tag,message,throwable.getMessage());
log.error("消息发送失败,topic:{},tag:{},message:{},error:{}",topic,tag,JSON.toJSONString(message),throwable.getMessage());
}
});
}
@ -126,11 +126,11 @@ public class RocketMQEnhanceTemplate {
@Override
public void onSuccess(SendResult sendResult) {
// 处理消息发送成功逻辑
log.info("消息发送成功,topic:{},tag:{},message:{},result:{}",topic,tag,message,JSON.toJSONString(sendResult));
log.info("消息发送成功,topic:{},tag:{},message:{},result:{}",topic,tag,JSON.toJSONString(message),JSON.toJSONString(sendResult));
}
@Override
public void onException(Throwable throwable) {
log.error("消息发送失败,topic:{},tag:{},message:{},error:{}",topic,tag,message,throwable.getMessage());
log.error("消息发送失败,topic:{},tag:{},message:{},error:{}",topic,tag,JSON.toJSONString(message),throwable.getMessage());
}
},10000,delayLevel);
}

15
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceRecordImpl.java
View File

@ -92,17 +92,24 @@ public class UserVipServiceRecordImpl implements UserVipRecordService {
public void saveUserVipRecord(AddUserVipRecordDto dto) {
UserVipRecord userVipRecord = dto.toEntity();
UserVipRecord oldUserVipRecord = userVipRecordMapper.selectOne(new LambdaQueryWrapper<UserVipRecord>().eq(UserVipRecord::getUserId, userVipRecord.getUserId())
.eq(UserVipRecord::getUserClientType, userVipRecord.getUserClientType())
.eq(UserVipRecord::getStatus,EnumUserVipRecordStatus.VALID.getStatus()));
.eq(UserVipRecord::getUserClientType, userVipRecord.getUserClientType()));
//判断是否存在生效的数据，存在走续费
if (Objects.isNull(oldUserVipRecord)){
userVipRecord.setStartTime(new Date());
userVipRecord.setEndTime(DateUtils.getDateByType(EnumTimeUnit.DAY,userVipRecord.getStartTime(), dto.getDays()));
userVipRecord.setStatus(EnumUserVipRecordStatus.VALID.getStatus());
userVipRecordMapper.insert(userVipRecord);
}else {
//续费
userVipRecord.setId(oldUserVipRecord.getId());
userVipRecord.setEndTime(DateUtils.getDateByType(EnumTimeUnit.DAY,oldUserVipRecord.getEndTime(), dto.getDays()));
//如果之前开通过且已经到期，那么更新开始结束时间，从今天开始算，状态改为生效
if (EnumUserVipRecordStatus.EXPIRE.getStatus() == oldUserVipRecord.getStatus()){
userVipRecord.setStartTime(new Date());
userVipRecord.setEndTime(DateUtils.getDateByType(EnumTimeUnit.DAY,userVipRecord.getStartTime(), dto.getDays()));
userVipRecord.setStatus(EnumUserVipRecordStatus.VALID.getStatus());
}else {
//续费，直接加上续费的时长
userVipRecord.setEndTime(DateUtils.getDateByType(EnumTimeUnit.DAY,oldUserVipRecord.getEndTime(), dto.getDays()));
}
userVipRecordMapper.updateById(userVipRecord);
}
}

8
bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/OrderMqMessageRecordServiceImpl.java
View File

@ -93,11 +93,11 @@ public class OrderMqMessageRecordServiceImpl implements OrderMqMessageRecordServ
rocketMQTemplate.asyncSend(rocketMQEnhanceTemplate.buildDestination(topic,tag), MessageBuilder.withPayload(mqLocalMessage).build(), new SendCallback() {
@Override
public void onSuccess(SendResult sendResult) {
log.info("消息发送成功,topic:{},tag:{},message:{},result:{}",topic,tag,message, JSON.toJSONString(sendResult));
log.info("消息发送成功,topic:{},tag:{},message:{},result:{}",topic,tag,JSON.toJSONString(message), JSON.toJSONString(sendResult));
}
@Override
public void onException(Throwable throwable) {
log.error("消息发送失败,topic:{},tag:{},message:{},error:{}",topic,tag,message,throwable.getMessage());
log.error("消息发送失败,topic:{},tag:{},message:{},error:{}",topic,tag,JSON.toJSONString(message),throwable.getMessage());
log.info("消息发送失败，更新消息记录，等待定时任务进行消息补偿");
orderMqMessageRecord.setErrMsg(throwable.getMessage());
editMessageRecordStatus(orderMqMessageRecord.getId(),orderMqMessageRecord.getStatus(),orderMqMessageRecord.getErrMsg());
@ -122,11 +122,11 @@ public class OrderMqMessageRecordServiceImpl implements OrderMqMessageRecordServ
rocketMQTemplate.asyncSend(rocketMQEnhanceTemplate.buildDestination(topic,tag), MessageBuilder.withPayload(mqLocalMessage).build(), new SendCallback() {
@Override
public void onSuccess(SendResult sendResult) {
log.info("消息发送成功,topic:{},tag:{},message:{},result:{}",topic,tag,message,JSON.toJSONString(sendResult));
log.info("消息发送成功,topic:{},tag:{},message:{},result:{}",topic,tag,JSON.toJSONString(message),JSON.toJSONString(sendResult));
}
@Override
public void onException(Throwable throwable) {
log.error("消息发送失败,topic:{},tag:{},message:{},error:{}",topic,tag,message,throwable.getMessage());
log.error("消息发送失败,topic:{},tag:{},message:{},error:{}",topic,tag,JSON.toJSONString(message),throwable.getMessage());
log.info("消息发送失败，更新消息记录，等待定时任务进行消息补偿");
editMessageRecordStatus(orderMqMessageRecord.getId(),orderMqMessageRecord.getStatus(),throwable.getMessage());
}

Write Preview
Loading…
Cancel
Save