新增权益，判断会员类型，续费同理。修复固件修改接口

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -62,6 +62,7 @@ public enum ResultCode  {
     SCENE_REBUILD_ERROR(50045, "场景重算失败。。。"),
     PASSWORD_ERROR_G(50046, "密码格式错误！"),
     AGENT_U_NOT_EMPTY(50047, "经销商账号已存在！"),
+    INCREMENT_TYPE_ERROR(50048, "权益类型错误！"),
 
     ;
 

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

@@ -96,4 +96,10 @@ public class UserIncrement implements Serializable {
 
     @TableField("agent_id")
     private Integer agentId;
+
+    @TableField("member_levels")
+    private String memberLevels;
+
+    @TableField("month_qy")
+    private Integer monthQy;
 }

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

@@ -166,14 +166,6 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         if(param.getId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        Integer type = param.getType();
-        switch (type){
-            case 1: type = 1;break;
-            case 2: type = 9;break;
-            case 3: type = 10;break;
-            default: throw new BusinessException(ResultCode.CAMERA_TYPE_ERROR);
-        }
-        param.setType(type);
         CameraVersion cameraVersion = this.getById(param.getId());
         if(cameraVersion == null){
             throw new BusinessException(ResultCode.CAMERA_VERSION_NOT_EXIST);

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

@@ -93,6 +93,10 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
                     vo.setSnCode(camera.getSnCode());
                 }
             }
+            if(record.getIncrementTypeId()!= null){
+                IncrementType incrementType = incrementTypeService.getById(record.getIncrementTypeId());
+                vo.setValidTimeType(incrementType.getValidTimeType());
+            }
             voList.add(vo);
         }
         Page<UserIncrementVo> voPage = new Page<>(pageNum, pageSize);
@@ -107,18 +111,32 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         if(userIncrement == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
+
         userIncrement.setIsExpired(0);
         Date date = DateUtil.string2Date(userIncrement.getIncrementEndTime(), DateUtil.DEFAULT_DATE_FORMAT);
-        Date delay = DateUtil.delay(date, 1, 1);
+        Date delay = null;
+        switch (incrementType.getValidTimeType()){
+            case 0 : delay = DateUtil.delay(date, 1, 1); break;
+            case 1 : delay = DateUtil.delay(date, 1, 2); break;
+            case 2 : delay = DateUtil.delay(date, 1, 5); break;
+            default: throw new BusinessException(ResultCode.INCREMENT_TYPE_ERROR);
+        }
+
         userIncrement.setIncrementEndTime(DateUtil.date2String(delay,DateUtil.DEFAULT_DATE_FORMAT));
         userIncrement.setUpdateTime(null);
         this.updateById(userIncrement);
         agentNewLogService.addByUserIncrement(userIncrement);
     }
 
+
     @Override
     public void add(UserIncrementParam param) {
         List<UserIncrement> userIncrementList = new ArrayList<>();
+        IncrementType incrementType = incrementTypeService.getById(param.getIncrementTypeId());
+        if(incrementType == null){
+            throw new BusinessException(ResultCode.INCREMENT_TYPE_EMPTY);
+        }
         for (int i = 0 ; i<param.getCount() ;i++) {
             UserIncrement userIncrement = new UserIncrement();
             String date = DateUtil.date2String(new Date(), DateUtil.DEFAULT_DATE_FORMAT);
@@ -130,15 +148,20 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
             userIncrement.setIncrementStartTime(date);
             userIncrement.setIncrementEndTime(param.getIncrementEndTime());
             userIncrement.setIncrementTypeId(param.getIncrementTypeId());
+            if(incrementType.getValidTimeType() == 0){
+                userIncrement.setMemberLevels("PR");
+            }
+            if(incrementType.getValidTimeType() == 1){
+                userIncrement.setMemberLevels("SE");
+            }
+            if(param.getMonthQy() != null){
+                userIncrement.setMonthQy(param.getMonthQy());
+            }
             userIncrementList.add(userIncrement);
         }
 
         if(userIncrementList.size() >0){
             this.saveBatch(userIncrementList);
-            IncrementType incrementType = incrementTypeService.getById(param.getIncrementTypeId());
-            if(incrementType == null){
-                throw new BusinessException(ResultCode.INCREMENT_TYPE_EMPTY);
-            }
             User user = userService.getById(param.getUserId());
             if(user == null){
                 throw new BusinessException(ResultCode.USER_NOT_EXIST);

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

@@ -10,4 +10,6 @@ public class UserIncrementParam {
     private Integer count = 1;
     private String incrementEndTime;
     private Integer incrementTypeId;
+
+    private Integer monthQy;
 }

src/main/java/com/fdkankan/manage/vo/response/UserIncrementVo.java

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.vo.response;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 @Data
@@ -8,4 +9,10 @@ public class UserIncrementVo {
     private String snCode;                          //相机snCode
     private String incrementStartTime;              //购买日期
     private String incrementEndTime;                //到期日期
+
+    private String memberLevels;
+
+    private Integer monthQy;
+
+    private Integer validTimeType;      // 0年，1月，2日
 }