21

src/main/java/com/fdkankan/manage/controller/IncrementTypeController.java

@@ -0,0 +1,39 @@
+package com.fdkankan.manage.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.entity.IncrementType;
+import com.fdkankan.manage.service.IIncrementTypeService;
+import com.fdkankan.manage.vo.request.OrderParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.WeakHashMap;
+
+/**
+ * <p>
+ * 会员权益类型 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-04
+ */
+@RestController
+@RequestMapping("/service/manage/incrementType")
+public class IncrementTypeController {
+
+    @Autowired
+    IIncrementTypeService incrementTypeService;
+    @Value("${environment:cn}")
+    public String environment;
+
+    @GetMapping("/allList")
+    public ResultData list(){
+        LambdaQueryWrapper<IncrementType> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IncrementType::getType,environment);
+        return ResultData.ok(incrementTypeService.list(wrapper));
+    }
+}
+

src/main/java/com/fdkankan/manage/controller/UserController.java

@@ -73,7 +73,8 @@ public class UserController {
      */
     @PostMapping("/addUserIncrement")
     public ResultData addUserIncrement(@RequestBody UserIncrementParam param){
-        if(param.getUserId() == null || StringUtils.isEmpty(param.getIncrementEndTime())){
+        if(param.getUserId() == null || StringUtils.isEmpty(param.getIncrementEndTime())
+                || param.getIncrementTypeId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         userIncrementService.add(param);

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

@@ -0,0 +1,97 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 会员权益类型
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-04
+ */
+@Getter
+@Setter
+@TableName("t_increment_type")
+public class IncrementType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 权益类型名称
+     */
+    @TableField("name")
+    private String name;
+
+    @TableField("type")
+    private String type;
+
+    /**
+     * 下载次数，-1代表无限次
+     */
+    @TableField("download_num")
+    private Integer downloadNum;
+
+    /**
+     * 下载价格
+     */
+    @TableField("download_price")
+    private BigDecimal downloadPrice;
+
+    /**
+     * 相机容量 单位 G
+     */
+    @TableField("camera_capacity")
+    private Integer cameraCapacity;
+
+    /**
+     * 购买之后，有效期天数，-1代表无限制
+     */
+    @TableField("valid_time")
+    private Integer validTime;
+
+    /**
+     * 0:年;1:月：2：日
+     */
+    @TableField("valid_time_type")
+    private Integer validTimeType;
+
+    /**
+     * 权益价格
+     */
+    @TableField("price")
+    private BigDecimal price;
+
+    /**
+     * 价格符号
+     */
+    @TableField("symbol")
+    private String symbol;
+
+    @TableField("rec_status")
+    @TableLogic
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 权益价格
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

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

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

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

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.IncrementType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 会员权益类型 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-04
+ */
+@Mapper
+public interface IIncrementTypeMapper extends BaseMapper<IncrementType> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.IncrementType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 会员权益类型 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-04
+ */
+public interface IIncrementTypeService extends IService<IncrementType> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.service.impl;
+
+import com.fdkankan.manage.entity.IncrementType;
+import com.fdkankan.manage.mapper.IIncrementTypeMapper;
+import com.fdkankan.manage.service.IIncrementTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 会员权益类型 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-04
+ */
+@Service
+public class IncrementTypeServiceImpl extends ServiceImpl<IIncrementTypeMapper, IncrementType> implements IIncrementTypeService {
+
+}

src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.entity.IncrementType;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.util.DateUtil;
@@ -12,6 +13,7 @@ import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.entity.UserIncrement;
 import com.fdkankan.manage.mapper.IUserIncrementMapper;
 import com.fdkankan.manage.service.ICameraService;
+import com.fdkankan.manage.service.IIncrementTypeService;
 import com.fdkankan.manage.service.IUserIncrementService;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
 import com.fdkankan.manage.vo.response.GroupByCount;
@@ -36,6 +38,8 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
 
     @Autowired
     private ICameraService cameraService;
+    @Autowired
+    IIncrementTypeService incrementTypeService;
 
     @Override
     public Long getValidCountByUserId(Long userId) {
@@ -118,7 +122,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
             userIncrement.setUpdateTime(date);
             userIncrement.setIncrementStartTime(date);
             userIncrement.setIncrementEndTime(param.getIncrementEndTime());
-            userIncrement.setIncrementTypeId(1);
+            userIncrement.setIncrementTypeId(param.getIncrementTypeId());
             userIncrementList.add(userIncrement);
         }
         this.saveBatch(userIncrementList);

src/main/java/com/fdkankan/manage/vo/request/UserIncrementParam.java

@@ -9,4 +9,5 @@ public class UserIncrementParam {
     private Integer year = 1;
     private Integer count = 1;
     private String incrementEndTime;
+    private Integer incrementTypeId;
 }

src/main/resources/mapper/manage/IncrementTypeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage.mapper.IIncrementTypeMapper">
+
+</mapper>