加个普通水印、推送订单纠正、水印预览和下载

src/main/java/com/ycwl/basic/model/mobile/goods/GoodsReqQuery.java

@@ -14,6 +14,7 @@ public class GoodsReqQuery {
     @ApiModelProperty("是否已购买 0否 1是")
     private Integer isBuy;
     private Long faceId;
+    private Long goodsId;
     @ApiModelProperty("景区id")
     private Long scenicId;
     @ApiModelProperty("源素材商品类型 1视频 2图像")

src/main/java/com/ycwl/basic/model/mobile/goods/GoodsUrlVO.java

@@ -0,0 +1,26 @@
+package com.ycwl.basic.model.mobile.goods;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/5 15:10
+ */
+@Data
+@ApiModel("商品详情")
+public class GoodsUrlVO {
+    @ApiModelProperty("商品类型 0:vlog 1:成片视频 2:源素材")
+    private Integer goodsType;
+    @ApiModelProperty("商品id goodsType=0时为videoId，goodsType=2时为sourceId")
+    private Long goodsId;
+    @ApiModelProperty("图片文件存储地址")
+    private String url;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+}

src/main/java/com/ycwl/basic/model/pc/source/entity/MemberSourceEntity.java

@@ -15,5 +15,4 @@ public class MemberSourceEntity {
     private Integer isBuy;
     private Long orderId;
     private Integer isFree;
-    private String waterUrl;
 }

src/main/java/com/ycwl/basic/model/pc/source/entity/SourceWatermarkEntity.java

@@ -0,0 +1,12 @@
+package com.ycwl.basic.model.pc.source.entity;
+
+import lombok.Data;
+
+@Data
+public class SourceWatermarkEntity {
+    private Integer id;
+    private Long sourceId;
+    private Long faceId;
+    private String watermarkType;
+    private String watermarkUrl;
+}