diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/UserConsumptionPackage.java b/suimangService/src/main/java/com/iformall/domain/po/sm/UserConsumptionPackage.java index 06d87d1..8387447 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/UserConsumptionPackage.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/UserConsumptionPackage.java @@ -104,6 +104,11 @@ public class UserConsumptionPackage implements Serializable { */ private Integer isDel; + /** + * 套餐颜色 + */ + private String color; + /** * 详细配置信息 */ diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/UserCreditLog.java b/suimangService/src/main/java/com/iformall/domain/po/sm/UserCreditLog.java index 168d8c9..650d038 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/UserCreditLog.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/UserCreditLog.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; import java.io.Serializable; + +import io.swagger.models.auth.In; import lombok.Data; @@ -42,7 +44,7 @@ public class UserCreditLog implements Serializable { /** * 视频id 或者 图片id 或者 口播id */ - private Integer videoOrPhotoOrTalkId; + private Long videoOrPhotoOrTalkId; /** * 订单id diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java index 9ce5bd9..78631e3 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java @@ -404,6 +404,7 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { log.setCredits(-(float)useCredit); log.setType(EnumLogType.PHOTO_SPEAK.getCode()); log.setRemark(EnumLogType.PHOTO_SPEAK.getMessage()); + log.setVideoOrPhotoOrTalkId(videoUpd.getId()); userCreditLogService.insertLog(log); this.uploadVideo(videoUpd);