修改bug,添加数据统计相关类

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

@@ -40,7 +40,7 @@ public class VideoGoodsDetailVO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
     @ApiModelProperty("价格")
-    private BigDecimal price;
+    private String price;
     @ApiModelProperty("是否已购买 0否 1是")
     private Integer isBuy;
     @ApiModelProperty("镜头数")

src/main/java/com/ycwl/basic/model/mobile/scenic/ScenicAppVO.java

@@ -29,6 +29,8 @@ public class ScenicAppVO {
      */
     @ApiModelProperty("景区介绍")
     private String introduction;
+    @ApiModelProperty("封面图")
+    private String coverUrl;
     /**
      * 经度
      */

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

@@ -31,4 +31,6 @@ public class ContentPageVO {
     private Long contentId;
     @ApiModelProperty("模版封面图片 contentType为0或1时才有值")
     private String templateCoverUrl;
+    @ApiModelProperty("是否购买：0未购买，1已购买")
+    private Integer isBuy;
 }

src/main/java/com/ycwl/basic/model/mobile/statistic/AppSta1VO.java

@@ -0,0 +1,24 @@
+package com.ycwl.basic.model.mobile.statistic;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/11 18:23
+ */
+@ApiModel("移动端订单金额、预览_支付转化率、扫码_付费用户转化率统计结果类")
+public class AppSta1VO {
+    @ApiModelProperty("现在的数据 支付订单金额")
+    private String nowOrderAmount;
+    @ApiModelProperty("上一期的数据 支付订单金额")
+    private String previousOrderAmount;
+    @ApiModelProperty("现在的数据 预览_支付转化率")
+    private String nowPreviewPay;
+    @ApiModelProperty("上一期的数据 预览_支付转化率")
+    private String previousPreviewPay;
+    @ApiModelProperty("现在的数据 扫码_付费用户转化率")
+    private String nowScanCodePay;
+    @ApiModelProperty("上一期的数据 扫码_付费用户转化率")
+    private String previousScanCodePay;
+}

src/main/java/com/ycwl/basic/model/mobile/statistic/CommonQueryReq.java

@@ -0,0 +1,21 @@
+package com.ycwl.basic.model.mobile.statistic;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/11 19:03
+ */
+@Data
+@ApiModel("移动端公用请求参数")
+public class CommonQueryReq {
+    @ApiModelProperty(value = "查询统计纬度 0今天、1昨天、2-近一周（7天）、3-近30天、4-近1年")
+    private Integer standard;
+    private Date startTime;
+    private Date endTime;
+}

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

@@ -1,13 +1,11 @@
 package com.ycwl.basic.model.pc.order.req;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ycwl.basic.model.mobile.goods.GoodsDetailVO;
 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;
 
 /**
@@ -25,7 +23,7 @@ public class OrderAddReq {
      * 微信openId
      */
     @ApiModelProperty(value = "微信openId", hidden = true)
-    private Long openId;
+    private String openid;
 
     @ApiModelProperty("景区id")
     private Long scenicId;
@@ -44,17 +42,17 @@ public class OrderAddReq {
      */
     @ApiModelProperty("备注")
     private String remark;
-//    /**
-//     * 推客id
-//     */
-//    @ApiModelProperty("推客id")
-//    private Long brokerId;
-//    /**
-//     * 推客优惠码
-//     */
-//    @ApiModelProperty("推客优惠码")
-//    private String promoCode;
-    @ApiModelProperty("订单商品类型 1成片，2源素材")
+    /**
+     * 推客id
+     */
+    @ApiModelProperty(value = "推客id",hidden = true)
+    private Long brokerId;
+    /**
+     * 推客优惠码
+     */
+    @ApiModelProperty(value="推客优惠码",hidden = true)
+    private String promoCode;
+    @ApiModelProperty(value = "订单商品类型 1成片，2源素材")
     private Integer goodsType;
     @ApiModelProperty("订单商品明细")
     private List<GoodsDetailVO> goodsItemList;

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

@@ -32,6 +32,8 @@ public class ScenicAddOrUpdateReq {
      */
     @ApiModelProperty("景区介绍")
     private String introduction;
+    @ApiModelProperty("封面图")
+    private String coverUrl;
     /**
      * 经度
      */

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

@@ -38,6 +38,8 @@ public class ScenicRespVO {
      */
     @ApiModelProperty("景区介绍")
     private String introduction;
+    @ApiModelProperty("封面图")
+    private String coverUrl;
     /**
      * 经度
      */
@@ -86,4 +88,6 @@ public class ScenicRespVO {
     private ScenicConfigEntity scenicConfig;
     @ApiModelProperty("景区源素材价格，元")
     private BigDecimal price;
+    @ApiModelProperty("镜头数")
+    private Integer lensNum;
 }

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

@@ -51,4 +51,6 @@ public class SourceRespVO {
     private String videoUrl;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
+    @ApiModelProperty("是否购买：0未购买，1已购买")
+    private Integer isBuy;
 }