Merge branch 'refs/heads/order_v2'

# Conflicts:
#	src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicAccountController.java

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

@@ -67,17 +67,17 @@ public class ScenicConfigEntity {
     /**
      * 是否开启全部免费
      */
-    private Integer allFree;
+    private Boolean allFree;
     /**
      * 是否禁用源视频
      * 0-否 1-是
      */
-    private Integer disableSourceVideo;
+    private Boolean disableSourceVideo;
     /**
      * 是否禁用源图片
      * 0-否 1-是
      */
-    private Integer disableSourceImage;
+    private Boolean disableSourceImage;
     private Integer templateNewVideoType;
     /**
      * 是否开启防录屏
@@ -130,5 +130,5 @@ public class ScenicConfigEntity {
      * 是否启用券码功能
      * 0-禁用 1-启用
      */
-    private Integer voucherEnable;
+    private Boolean voucherEnable;
 }

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

@@ -1,11 +1,8 @@
 package com.ycwl.basic.model.pc.scenic.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * @Author：longbinbin
@@ -13,15 +10,17 @@ import java.util.Date;
  * 景区管理表
  */
 @Data
-@TableName("scenic")
 public class ScenicEntity {
-    @TableId
     private Long id;
     /**
      * 景区名称
      */
     private String name;
     private Integer mpId;
+    private String phone;
+    private String logoUrl;
+    // 封面图
+    private String coverUrl;
     /**
      * 景区介绍
      */
@@ -58,11 +57,10 @@ public class ScenicEntity {
      * 状态 1启用0关闭
      */
     private String status;
-    private Date createTime;
-    private Date updateTime;
     /**
      * 景区源素材价格，元
      */
+    private String kfCodeUrl;
     private BigDecimal price;
     private BigDecimal sourceVideoPrice;
     private BigDecimal sourceImagePrice;

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

@@ -23,51 +23,9 @@ public class ScenicReqQuery extends BaseQueryParameterReq {
      */
     // 景区名称
     private String name;
-    /**
-     * 景区介绍
-     */
-    // 景区介绍
-    private String introduction;
-    /**
-     * 经度
-     */
-    // 经度
-    private BigDecimal longitude;
-    /***
-     * 纬度
-     */
-    // 纬度
-    private BigDecimal latitude;
-    /**
-     * 半径（km）
-     */
-    // 半径（km）
-    private BigDecimal radius;
-    /**
-     * 省份
-     */
-    // 省份
-    private String province;
-    /**
-     * 城市
-     */
-    // 城市
-    private String city;
-    /**
-     * 区
-     */
-    // 区
-    private String area;
-    /**
-     * 详细地址
-     */
-    // 详细地址
-    private String address;
     /**
      * 状态 1启用0关闭
      */
     // 状态 1启用0关闭
     private String status;
-    private Date startTime;
-    private Date endTime;
 }

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

@@ -34,9 +34,9 @@ public class ScenicConfigResp {
      * 视频保存时间
      */
     private Integer videoStoreDay;
-    private Integer allFree;
-    private Integer disableSourceVideo;
-    private Integer disableSourceImage;
+    private Boolean allFree;
+    private Boolean disableSourceVideo;
+    private Boolean disableSourceImage;
     private Integer antiScreenRecordType;
     private Integer videoSourceStoreDay;
     private Integer imageSourceStoreDay;
@@ -45,9 +45,5 @@ public class ScenicConfigResp {
 
     private String imageSourcePackHint = "";
     private String videoSourcePackHint = "";
-    /**
-     * 是否启用券码功能
-     * 0-禁用 1-启用
-     */
-    private Integer voucherEnable;
+    private Boolean voucherEnable;
 }

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

@@ -74,19 +74,6 @@ public class ScenicRespVO {
      */
     // 详细地址
     private String address;
-    /**
-     * 状态 1启用0关闭
-     */
-    // 状态 1启用0关闭
-    private Integer status;
-    @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")
-    private Date updateTime;
-    // 景区源素材价格，元
-    private BigDecimal price;
-    private BigDecimal sourceVideoPrice;
-    private BigDecimal sourceImagePrice;
     // 镜头数
     private Integer lensNum;
     private String kfCodeUrl;