diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AddUserVipRecordDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AddUserVipRecordDto.java index fad4aca..340f1ad 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AddUserVipRecordDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AddUserVipRecordDto.java @@ -23,14 +23,6 @@ public class AddUserVipRecordDto extends BaseDto{ @ApiModelProperty(value="vip表id") private Long vipId; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="开始时间") - private Date startTime; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="到期时间") - private Date endTime; - @ApiModelProperty(value="时长天数") private Integer days; diff --git a/bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/domain/img/AddUserVipRecordMessage.java b/bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/domain/img/AddUserVipRecordMessage.java index 50c3759..4a1908b 100644 --- a/bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/domain/img/AddUserVipRecordMessage.java +++ b/bnyer-common/bnyer-common-rocketmq/src/main/java/com/bnyer/common/rocketmq/domain/img/AddUserVipRecordMessage.java @@ -28,14 +28,6 @@ public class AddUserVipRecordMessage extends BaseMessage { @ApiModelProperty(value="vip表id") private Long vipId; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="开始时间") - private Date startTime; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="到期时间") - private Date endTime; - @ApiModelProperty(value="本次开通计算后的天数") private Integer days; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceRecordImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceRecordImpl.java index 13b8e19..6aaf8a1 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceRecordImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceRecordImpl.java @@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.Objects; @Service @@ -95,6 +96,7 @@ public class UserVipServiceRecordImpl implements UserVipRecordService { .eq(UserVipRecord::getStatus,EnumUserVipRecordStatus.VALID.getStatus())); //判断是否存在生效的数据,存在走续费 if (Objects.isNull(oldUserVipRecord)){ + userVipRecord.setStartTime(new Date()); userVipRecord.setStatus(EnumUserVipRecordStatus.VALID.getStatus()); userVipRecordMapper.insert(userVipRecord); }else { diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipRecordMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipRecordMapper.xml index 7b5e5e2..dab0db1 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipRecordMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipRecordMapper.xml @@ -22,12 +22,15 @@ a.id, - a.user_id , - a.phone,vip_name, + a.user_id, + a.phone, + a.vip_name, a.vip_type_name, a.user_client_type, - a.`status`, vip_id, - a.start_time, end_time, + a.`status`, + a.vip_id, + a.start_time, + a.end_time, a.is_show, a.create_time, a.update_time,