权益

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

@@ -54,6 +54,7 @@ public enum ResultCode  {
     OLD_PASSWORD_ERROR(50037, "原密码错误"),
     UPLOAD_YUN_TYPE_ERROR(50038, "上传服务器类型错误，请确认环境上传"),
     UPDATE_MYSELF_PASSWORD(50039, "只能修改自己的密码!"),
+    INCREMENT_TYPE_EMPTY(50040, "权益类型不存在!"),
 
     ;
 

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

@@ -3,9 +3,12 @@ package com.fdkankan.manage.controller;
 
 import cn.hutool.core.io.FileUtil;
 import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.entity.IncrementType;
+import com.fdkankan.manage.entity.User;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.manage.service.ICameraService;
+import com.fdkankan.manage.service.IIncrementTypeService;
 import com.fdkankan.manage.service.IUserIncrementService;
 import com.fdkankan.manage.service.IUserService;
 import com.fdkankan.manage.vo.request.CameraParam;
@@ -27,6 +30,8 @@ public class UserController {
     @Autowired
     IUserIncrementService userIncrementService;
     @Autowired
+    IIncrementTypeService incrementTypeService;
+    @Autowired
     ICameraService cameraService;
 
     /**
@@ -78,6 +83,15 @@ public class UserController {
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         userIncrementService.add(param);
+        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);
+        }
+        user.setDownloadNumTotal(user.getDownloadNumTotal() + incrementType.getDownloadNum());
         return ResultData.ok();
     }
 

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

@@ -391,7 +391,7 @@ public class DataService implements IDataService {
             if(dataGroupByCount.getGroupKey2().equals("10")){    //深时
                 ssMap.merge(dataGroupByCount.getGroupKey(),dataGroupByCount.getCount(), Long:: sum);
             }
-            if(Arrays.asList("0","1","2","5").contains(dataGroupByCount.getGroupKey2())){    //看看
+            if(Arrays.asList("1").contains(dataGroupByCount.getGroupKey2())){    //看看
                 kkMap.merge(dataGroupByCount.getGroupKey(),dataGroupByCount.getCount(), Long:: sum);
             }
         }

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

@@ -44,7 +44,7 @@ public class OrderVo {
     private String shipMobile;
 
     @ExcelProperty("收件人")
-    private String shipName;
+    private String shipName;a
 
     public String getShipAddress() {
         return shipAreaPath + shipAddress;