Merge branch 'lyh-task-incType' into test

# Conflicts:
#	src/main/java/com/fdkankan/ucenter/generate/AutoGenerate.java

src/main/java/com/fdkankan/ucenter/controller/IncrementController.java

@@ -25,11 +25,8 @@ public class IncrementController extends BaseController {
     IIncrementTypeService incrementTypeService;
 
     @GetMapping("/getIncrementType")
-    public Result getIncrementType(@RequestParam (required = false) String type){
-        if(StringUtils.isEmpty(type)){
-            type = "cn";
-        }
-        return Result.success(incrementTypeService.getByType(type));
+    public Result getIncrementType(@RequestParam (required = false) String cameraUnit){
+        return Result.success(incrementTypeService.getByCameraUnit(cameraUnit));
     }
 
     @PostMapping("/findIncrementList")

src/main/java/com/fdkankan/ucenter/entity/IncrementType.java

@@ -17,7 +17,7 @@ import lombok.Setter;
  * </p>
  *
  * @author 
- * @since 2022-08-01
+ * @since 2023-06-19
  */
 @Getter
 @Setter
@@ -35,6 +35,9 @@ public class IncrementType implements Serializable {
     @TableField("name")
     private String name;
 
+    /**
+     * member会员,freeMember免费会员
+     */
     @TableField("type")
     private String type;
 
@@ -43,8 +46,9 @@ public class IncrementType implements Serializable {
      */
     @TableField("download_num")
     private Integer downloadNum;
+
     /**
-     * 下载次数，-1代表无限次
+     * 下载价格
      */
     @TableField("download_price")
     private BigDecimal downloadPrice;
@@ -56,6 +60,12 @@ public class IncrementType implements Serializable {
     private Integer cameraCapacity;
 
     /**
+     * 相机容量单位
+     */
+    @TableField("unit")
+    private String unit;
+
+    /**
      * 购买之后，有效期天数，-1代表无限制
      */
     @TableField("valid_time")
@@ -79,15 +89,66 @@ public class IncrementType implements Serializable {
     @TableField("symbol")
     private String symbol;
 
-    @TableField("create_time")
-    private String createTime;
+    /**
+     * 自定义logo
+     */
+    @TableField("custom_logo")
+    private Boolean customLogo;
 
-    @TableField("update_time")
-    private String updateTime;
+    /**
+     * 自定义热点样式
+     */
+    @TableField("custom_style")
+    private Boolean customStyle;
+
+    /**
+     * 空间贴图
+     */
+    @TableField("custom_image")
+    private Boolean customImage;
+
+    /**
+     * 三维模型
+     */
+    @TableField("custom_model")
+    private Boolean customModel;
+
+    /**
+     * 场景美化调节
+     */
+    @TableField("custom_scene")
+    private Boolean customScene;
+
+    /**
+     * 场景复制
+     */
+    @TableField("custom_copy")
+    private Boolean customCopy;
+
+    /**
+     * 场景计算
+     */
+    @TableField("custom_modeling")
+    private Integer customModeling;
+
+    /**
+     * 场景下载
+     */
+    @TableField("custom_down")
+    private Integer customDown;
 
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 权益价格
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
 
 }

src/main/java/com/fdkankan/ucenter/entity/User.java

@@ -148,5 +148,7 @@ public class User implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("camera_unit")
+    private String cameraUnit;  //相机单位 GB SP
 
 }

src/main/java/com/fdkankan/ucenter/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"ucenter", getTables(new String[]{
-                "t_camera_type",
+                "t_increment_type",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/ucenter/mapper/IIncrementTypeMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author 
- * @since 2022-08-01
+ * @since 2023-06-19
  */
 @Mapper
 public interface IIncrementTypeMapper extends BaseMapper<IncrementType> {

src/main/java/com/fdkankan/ucenter/service/IIncrementTypeService.java

@@ -11,9 +11,9 @@ import java.util.List;
  * </p>
  *
  * @author 
- * @since 2022-08-01
+ * @since 2023-06-19
  */
 public interface IIncrementTypeService extends IService<IncrementType> {
 
-    List<IncrementType> getByType(String type);
+    List<IncrementType> getByCameraUnit(String cameraUnit);
 }

src/main/java/com/fdkankan/ucenter/service/impl/IncrementTypeServiceImpl.java

@@ -15,16 +15,15 @@ import java.util.List;
  * </p>
  *
  * @author 
- * @since 2022-08-01
+ * @since 2023-06-19
  */
 @Service
 public class IncrementTypeServiceImpl extends ServiceImpl<IIncrementTypeMapper, IncrementType> implements IIncrementTypeService {
 
     @Override
-    public List<IncrementType> getByType(String type) {
+    public List<IncrementType> getByCameraUnit(String cameraUnit) {
         LambdaQueryWrapper<IncrementType> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(IncrementType::getType,type);
-        wrapper.orderByAsc(IncrementType::getId);
+        wrapper.eq(IncrementType::getUnit,cameraUnit);
         return this.list(wrapper);
     }
 }

src/main/java/com/fdkankan/ucenter/vo/response/UserVo.java

@@ -28,4 +28,6 @@ public class UserVo {
 
     private String country;
 
+    private String cameraUnit;  //相机单位 GB SP
+
 }