Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java
#	src/main/java/com/ycwl/basic/service/pc/OrderService.java

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

@@ -0,0 +1,20 @@
+package com.ycwl.basic.model.mobile.goods;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/5 16:35
+ */
+@Data
+@ApiModel("查询商品价格请求参数")
+public class GoodsPriceQueryReq {
+    @ApiModelProperty("景区id")
+    private Long scenicId;
+    @ApiModelProperty("商品类型 1:成片vlog 2:源素材")
+    private Integer goodsType;
+    @ApiModelProperty("商品id goodsType=1时才有值")
+    private Long goodsId;
+}

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

@@ -0,0 +1,22 @@
+package com.ycwl.basic.model.mobile.goods;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/5 15:40
+ */
+@Data
+@ApiModel(value = "商品查询对象")
+public class GoodsReqQuery {
+    @ApiModelProperty("是否已购买 0否 1是")
+    private Integer isBuy;
+    @ApiModelProperty("用户id")
+    private Long memberId;
+    @ApiModelProperty("景区id")
+    private Long scenicId;
+    @ApiModelProperty("源素材商品类型 1视频 2图像")
+    private Integer sourceType;
+}

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

@@ -0,0 +1,37 @@
+package com.ycwl.basic.model.mobile.goods;
+
+import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/5 15:10
+ */
+@Data
+@ApiModel("商品")
+public class GoodsVO {
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    @ApiModelProperty("景区id")
+    private Long scenicId;
+    @ApiModelProperty("景区名称")
+    private String scenicName;
+    @ApiModelProperty("经度")
+    private BigDecimal longitude;
+    @ApiModelProperty("纬度")
+    private BigDecimal latitude;
+    @ApiModelProperty("商品类型 1:成片视频 2:源素材")
+    private Integer goodsType;
+    @ApiModelProperty("源素材类型 1:视频 2:图片")
+    private Integer sourceType;
+    @ApiModelProperty("商品id goodsType为1时才有值")
+    private Long goodsId;
+    @ApiModelProperty("视频链接 goodsType为1时才有值")
+    private String videoUrl;
+}

src/main/java/com/ycwl/basic/model/pc/order/entity/OrderItemEntity.java

@@ -19,11 +19,11 @@ public class OrderItemEntity {
      */
     private Long orderId;
     /**
-     * 商品类型，0其他，1成片，2原片，3模板成片
+     * 商品类型，0其他，1成片，，2源素材
      */
     private Integer goodsType;
     /**
-     * 商品ID，goods_type=1关联video.id，=2关联source.id，=3关联template.id
+     * 商品ID，goods_type=1关联video.id，=2关联source.id
      */
     private Long goodsId;
 

src/main/java/com/ycwl/basic/model/pc/order/req/OrderItemDTO.java

@@ -18,13 +18,13 @@ public class OrderItemDTO {
     @ApiModelProperty("订单id")
     private Long orderId;
     /**
-     * 商品类型，0其他，1成片，2原片，3模板成片
+     * 商品类型，0其他，1成片，2原片
      */
-    @ApiModelProperty("商品类型，0其他，1成片，2原片，3模板成片")
+    @ApiModelProperty("商品类型，0其他，1成片，，2源素材")
     private Integer goodsType;
     /**
-     * 商品ID，goods_type=1关联video.id，=2关联source.id，=3关联template.id
+     * 商品ID，goods_type=1关联video.id，=2关联source.id
      */
-    @ApiModelProperty("商品ID，goods_type=1关联video.id，=2关联source.id，=3关联template.id")
+    @ApiModelProperty("商品ID，goods_type=1关联video.id，=2关联source.id")
     private Long goodsId;
 }

src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java

@@ -17,6 +17,7 @@ import java.util.Date;
 @Data
 @ApiModel(value = "订单查询对象")
 public class OrderReqQuery extends BaseQueryParameterReq {
+    private Long memberId;
     @ApiModelProperty("用户昵称")
     private String memberNickname;
     @ApiModelProperty("用户真实名称")

src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java

@@ -0,0 +1,88 @@
+package com.ycwl.basic.model.pc.order.resp;
+
+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;
+import java.util.List;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/11/29 15:59
+ */
+@Data
+@ApiModel("移动端订单信息响应类")
+public class OrderAppRespVO {
+    private Long id;
+    /**
+     * 价格
+     */
+    @ApiModelProperty("价格")
+    private BigDecimal price;
+    /**
+     * 实际支付价格
+     */
+    @ApiModelProperty("实际支付价格")
+    private BigDecimal payPrice;
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+     * 退款原因
+     */
+    @ApiModelProperty("退款原因")
+    private String refundReason;
+    /**
+     * 退款状态，0未提出，1已通过，2待审核
+     */
+    @ApiModelProperty("退款状态，0未提出，1已通过，2待审核")
+    private Integer refundStatus;
+    /**
+     * 状态，0未支付，1已支付，2已退款，9已取消
+     */
+    @ApiModelProperty("状态，0未支付，1已支付，2已退款，9已取消")
+    private Integer status;
+    /**
+     * 订单创建时间
+     */
+    @ApiModelProperty("订单创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createAt;
+    /**
+     * 订单更新时间
+     */
+    @ApiModelProperty("订单更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateAt;
+    /**
+     * 订单支付时间
+     */
+    @ApiModelProperty("订单支付时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date payAt;
+    /**
+     * 订单取消时间
+     */
+    @ApiModelProperty("订单取消时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date cancelAt;
+    /**
+     * 订单退款时间
+     */
+    @ApiModelProperty("订单退款时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date refundAt;
+    @ApiModelProperty("景区名称")
+    private String scenicName;
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    @ApiModelProperty("拍摄时间")
+    private Date shootingTime;
+    @ApiModelProperty("订单明细")
+    private List<OrderItemVO> orderItemList;
+}

src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java

@@ -22,11 +22,21 @@ public class OrderItemVO {
     /**
      * 商品类型，0其他，1成片，2原片，3模板成片
      */
-    @ApiModelProperty("商品类型，0其他，1成片，2原片，3模板成片")
+    @ApiModelProperty("商品类型，0其他，1成片，2源素材")
     private Integer goodsType;
     /**
      * 商品ID，goods_type=1关联video.id，=2关联source.id，=3关联template.id
      */
-    @ApiModelProperty("商品ID，goods_type=1关联video.id，=2关联source.id，=3关联template.id")
+    @ApiModelProperty("商品ID，goods_type=1关联video.id，=2关联source.id")
     private Long goodsId;
+    @ApiModelProperty("景区名称")
+    private String scenicName;
+    @ApiModelProperty("商品名称 模版名称/原片x个/照片x个")
+    private String goodsName;
+    @ApiModelProperty("视频链接")
+    private String videoUrl;
+    @ApiModelProperty("图片存储地址")
+    private String imgUrl;
+    @ApiModelProperty("原素材类型：1视频，2图像")
+    private Integer sourceType;
 }

src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicEntity.java

@@ -2,6 +2,7 @@ package com.ycwl.basic.model.pc.scenic.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -59,4 +60,8 @@ public class ScenicEntity {
     private String status;
     private Date createTime;
     private Date updateTime;
+    /**
+     * 景区源素材价格，元
+     */
+    private BigDecimal price;
 }

src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAddOrUpdateReq.java

@@ -73,4 +73,6 @@ public class ScenicAddOrUpdateReq {
     private Date updateTime;
     @ApiModelProperty("景区配置")
     private ScenicConfigEntity scenicConfig;
+    @ApiModelProperty("景区源素材价格，元")
+    private BigDecimal price;
 }

src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicRespVO.java

@@ -74,4 +74,6 @@ public class ScenicRespVO {
     private Date updateTime;
     @ApiModelProperty("景区配置")
     private ScenicConfigEntity scenicConfig;
+    @ApiModelProperty("景区源素材价格，元")
+    private BigDecimal price;
 }

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

@@ -2,6 +2,7 @@ package com.ycwl.basic.model.pc.source.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -29,10 +30,22 @@ public class SourceEntity {
      * 所属用户
      */
     private Long memberId;
+    /**
+     * 原素材类型：1视频，2图像
+     */
+    private Integer type;
     /**
      * 文件存储地址
      */
     private String url;
+    /**
+     * 视频文件存储地址
+     */
+    private String videoUrl;
+    /**
+     * 是否被购买 0未购买 1已购买
+     */
+    private Integer isBuy;
     private Date createTime;
     private Date updateTime;
 }

src/main/java/com/ycwl/basic/model/pc/source/req/SourceReqQuery.java

@@ -35,11 +35,15 @@ public class SourceReqQuery extends BaseQueryParameterReq {
      */
     @ApiModelProperty("所属用户")
     private Long memberId;
+    @ApiModelProperty("原素材类型：1视频，2图像")
+    private Integer type;
     /**
      * 文件存储地址
      */
     @ApiModelProperty("文件存储地址")
     private String url;
+    @ApiModelProperty("是否被购买：0未购买，1已购买")
+    private Integer isBuy;
     private Date startTime;
     private Date endTime;
 }

src/main/java/com/ycwl/basic/model/pc/source/resp/SourceRespVO.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -25,6 +26,10 @@ public class SourceRespVO {
     private Long scenicId;
     @ApiModelProperty("景区名称")
     private String scenicName;
+    @ApiModelProperty("经度")
+    private BigDecimal longitude;
+    @ApiModelProperty("纬度")
+    private BigDecimal latitude;
     /**
      * 来源设备id
      */
@@ -35,11 +40,15 @@ public class SourceRespVO {
      */
     @ApiModelProperty("所属用户")
     private Long memberId;
+    @ApiModelProperty("原素材类型：1视频，2图像")
+    private Integer type;
     /**
      * 文件存储地址
      */
-    @ApiModelProperty("文件存储地址")
+    @ApiModelProperty("图片文件存储地址")
     private String url;
+    @ApiModelProperty("视频文件存储地址")
+    private String videoUrl;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

src/main/java/com/ycwl/basic/model/pc/video/entity/VideoEntity.java

@@ -2,6 +2,7 @@ package com.ycwl.basic.model.pc.video.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -40,6 +41,10 @@ public class VideoEntity {
      * 视频链接
      */
     private String videoUrl;
+    /**
+     * 是否购买 1是 0否
+     */
+    private Integer isBuy;
     private Date createTime;
     private Date updateTime;
 }

src/main/java/com/ycwl/basic/model/pc/video/req/VideoReqQuery.java

@@ -47,6 +47,8 @@ public class VideoReqQuery extends BaseQueryParameterReq {
      */
     @ApiModelProperty("视频链接")
     private String videoUrl;
+    @ApiModelProperty("是否购买 1是 0否")
+    private Integer isBuy;
     private Date startTime;
     private Date endTime;
 }

src/main/java/com/ycwl/basic/model/pc/video/resp/VideoRespVO.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -23,6 +24,8 @@ public class VideoRespVO {
      */
     @ApiModelProperty("景区id")
     private Long scenicId;
+    @ApiModelProperty("景区名称")
+    private String scenicName;
     /**
      * 用户id
      */
@@ -33,6 +36,14 @@ public class VideoRespVO {
      */
     @ApiModelProperty("模版id")
     private Long templateId;
+    @ApiModelProperty("模版名称")
+    private String templateName;
+    @ApiModelProperty("模版价格")
+    private BigDecimal tmplatePrice;
+    @ApiModelProperty("经度")
+    private BigDecimal longitude;
+    @ApiModelProperty("纬度")
+    private BigDecimal latitude;
     /**
      * 任务id
      */
@@ -48,6 +59,8 @@ public class VideoRespVO {
      */
     @ApiModelProperty("视频链接")
     private String videoUrl;
+    @ApiModelProperty("是否购买 1是 0否")
+    private Integer isBuy;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")