@@ -104,6 +104,11 @@ public class UserConsumptionPackage implements Serializable { | |||||
*/ | */ | ||||
private Integer isDel; | private Integer isDel; | ||||
/** | |||||
* 套餐颜色 | |||||
*/ | |||||
private String color; | |||||
/** | /** | ||||
* 详细配置信息 | * 详细配置信息 | ||||
*/ | */ | ||||
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableId; | |||||
import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
import java.util.Date; | import java.util.Date; | ||||
import java.io.Serializable; | import java.io.Serializable; | ||||
import io.swagger.models.auth.In; | |||||
import lombok.Data; | import lombok.Data; | ||||
@@ -42,7 +44,7 @@ public class UserCreditLog implements Serializable { | |||||
/** | /** | ||||
* 视频id 或者 图片id 或者 口播id | * 视频id 或者 图片id 或者 口播id | ||||
*/ | */ | ||||
private Integer videoOrPhotoOrTalkId; | |||||
private Long videoOrPhotoOrTalkId; | |||||
/** | /** | ||||
* 订单id | * 订单id | ||||
@@ -404,6 +404,7 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { | |||||
log.setCredits(-(float)useCredit); | log.setCredits(-(float)useCredit); | ||||
log.setType(EnumLogType.PHOTO_SPEAK.getCode()); | log.setType(EnumLogType.PHOTO_SPEAK.getCode()); | ||||
log.setRemark(EnumLogType.PHOTO_SPEAK.getMessage()); | log.setRemark(EnumLogType.PHOTO_SPEAK.getMessage()); | ||||
log.setVideoOrPhotoOrTalkId(videoUpd.getId()); | |||||
userCreditLogService.insertLog(log); | userCreditLogService.insertLog(log); | ||||
this.uploadVideo(videoUpd); | this.uploadVideo(videoUpd); | ||||