Merge remote-tracking branch 'origin/master'

src/main/java/com/ycwl/basic/model/jwt/JwtInfo.java

@@ -28,7 +28,7 @@ public class JwtInfo implements Serializable {
     /**
      * 用户ID
      */
-    private String userId;
+    private Long userId;
 
     /**
      * 角色ID

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

@@ -39,4 +39,8 @@ public class GoodsDetailVO {
     private String videoUrl;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
+    @ApiModelProperty("价格")
+    private BigDecimal price;
+    @ApiModelProperty("是否已购买 0否 1是")
+    private Integer isBuy;
 }

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

@@ -13,7 +13,7 @@ import lombok.Data;
 public class GoodsReqQuery {
     @ApiModelProperty("是否已购买 0否 1是")
     private Integer isBuy;
-    @ApiModelProperty("用户id")
+    @ApiModelProperty(value = "用户id", hidden = true)
     private Long memberId;
     @ApiModelProperty("景区id")
     private Long scenicId;

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

@@ -0,0 +1,48 @@
+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("vlog商品详情")
+public class VideoGoodsDetailVO {
+    @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时为videoId，goodsType=2时为sourceId")
+    private Long goodsId;
+    @ApiModelProperty("模版封面图片")
+    private String templateCoverUrl;
+    @ApiModelProperty("图片文件存储地址")
+    private String url;
+    @ApiModelProperty("视频文件存储地址")
+    private String videoUrl;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    @ApiModelProperty("价格")
+    private BigDecimal price;
+    @ApiModelProperty("是否已购买 0否 1是")
+    private Integer isBuy;
+    @ApiModelProperty("镜头数")
+    private Integer lensNum;
+}

src/main/java/com/ycwl/basic/model/mobile/order/OrderAppPageReq.java

@@ -0,0 +1,87 @@
+package com.ycwl.basic.model.mobile.order;
+
+import com.ycwl.basic.model.common.BaseQueryParameterReq;
+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/11/29 16:33
+ */
+@Data
+@ApiModel(value = "移动端订单查询对象")
+public class OrderAppPageReq extends BaseQueryParameterReq {
+    @ApiModelProperty(value = "用户id",hidden = true)
+    private Long memberId;
+//    /**
+//     * 微信openId
+//     */
+//    @ApiModelProperty("微信openId")
+//    private Long openId;
+//    /**
+//     * 价格
+//     */
+//    @ApiModelProperty("价格")
+//    private BigDecimal price;
+//    /**
+//     * 实际支付价格
+//     */
+//    @ApiModelProperty("实际支付价格")
+//    private BigDecimal payPrice;
+//    /**
+//     * 推客id
+//     */
+//    @ApiModelProperty("推客id")
+//    private Long brokerId;
+//    /**
+//     * 推客优惠码
+//     */
+//    @ApiModelProperty("推客优惠码")
+//    private String promoCode;
+//    /**
+//     * 退款原因
+//     */
+//    @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("订单创建时间")
+//    private Date startCreateTime;
+//    private Date endCreateTime;
+//    /**
+//     * 订单支付时间
+//     */
+//    @ApiModelProperty("订单支付时间")
+//    private Date startPayTime;
+//    private Date endPayTime;
+//    /**
+//     * 订单取消时间
+//     */
+//    @ApiModelProperty("订单取消时间")
+//    private Date startCancelTime;
+//    private Date endCancelTime;
+//    /**
+//     * 订单退款时间
+//     */
+//    @ApiModelProperty("订单退款时间")
+//    private Date startRefundTime;
+//    private Date endRefundTime;
+
+    @ApiModelProperty("订单类型 0成片（vlog） 1原片 2照片")
+    private Integer type;
+}

src/main/java/com/ycwl/basic/model/mobile/scenic/content/ContentPageVO.java

@@ -0,0 +1,34 @@
+package com.ycwl.basic.model.mobile.scenic.content;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/5 15:10
+ */
+@Data
+@ApiModel("景区内容（成片、待成片模版、源素材）列表响应信息")
+public class ContentPageVO {
+    @ApiModelProperty("内容名称")
+    private String name;
+//    @ApiModelProperty("景区id")
+//    private Long scenicId;
+//    @ApiModelProperty("景区名称")
+//    private String scenicName;
+//    @ApiModelProperty("经度")
+//    private BigDecimal longitude;
+//    @ApiModelProperty("纬度")
+//    private BigDecimal latitude;
+    @ApiModelProperty("内容类型 0模版 1:成片视频 2:源素材 ")
+    private Integer contentType;
+    @ApiModelProperty("源素材类型 1:视频 2:图片")
+    private Integer sourceType;
+    @ApiModelProperty("内容id contentType为0或1时才有值")
+    private Long contentId;
+    @ApiModelProperty("模版封面图片 contentType为0或1时才有值")
+    private String templateCoverUrl;
+}

src/main/java/com/ycwl/basic/model/pc/adminUser/entity/LoginEntity.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 @Data
 public class LoginEntity {
-    private String staffId;
+    private Long staffId;
     private String staffName;
     private String account;
     private String password;

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

@@ -27,6 +27,8 @@ public class OrderAddOrUpdateReq {
      */
     @ApiModelProperty("微信openId")
     private Long openId;
+    @ApiModelProperty("景区id")
+    private Long scenicId;
     /**
      * 价格
      */
@@ -52,6 +54,8 @@ public class OrderAddOrUpdateReq {
      */
     @ApiModelProperty("推客优惠码")
     private String promoCode;
+    @ApiModelProperty("订单商品类型 1成片，2源素材")
+    private Integer goodsType;
     /**
      * 退款原因
      */

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

@@ -83,6 +83,15 @@ public class OrderAppRespVO {
     private String goodsName;
     @ApiModelProperty("拍摄时间")
     private Date shootingTime;
+    /**
+     * 商品类型，0其他，1成片，2原片，3模板成片
+     */
+    @ApiModelProperty("商品类型，1成片，2源素材")
+    private Integer goodsType;
+    @ApiModelProperty("封面图片（来自模版封面图片）")
+    private String coverUrl;
+    @ApiModelProperty("原素材类型：1视频，2图像")
+    private Integer sourceType;
     @ApiModelProperty("订单明细")
     private List<OrderItemVO> orderItemList;
 }

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

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

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

@@ -53,6 +53,8 @@ public class OrderRespVO {
      */
     @ApiModelProperty("推客优惠码")
     private String promoCode;
+    @ApiModelProperty("订单商品类型 1成片，2源素材")
+    private Integer goodsType;
     /**
      * 退款原因
      */

src/main/java/com/ycwl/basic/model/pc/orderOp/entity/OrderOperationEntity.java

@@ -0,0 +1,18 @@
+package com.ycwl.basic.model.pc.orderOp.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("order_operation")
+public class OrderOperationEntity {
+    private Long id;
+    private Long orderId;
+    private String type;
+    private String remark;
+    private String user;
+    private String userId;
+    private Date createTime;
+}

src/main/java/com/ycwl/basic/model/pc/template/req/TemplateReqQuery.java

@@ -19,6 +19,8 @@ import java.util.Date;
 @Data
 @ApiModel("模版查询请求类")
 public class TemplateReqQuery extends BaseQueryParameterReq {
+    @ApiModelProperty("景区id")
+    private Long scenicId;
     /**
      * 模版名称
      */