1

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

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.controller;
 
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.response.Result;
@@ -9,9 +10,9 @@ import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.AgentNew;
 import com.fdkankan.manage.entity.User;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.manage.service.IAgentIncrementService;
 import com.fdkankan.manage.service.IAgentNewService;
 import com.fdkankan.manage.service.IUserService;
+import com.fdkankan.manage.vo.request.AgentAddIncrementParam;
 import com.fdkankan.manage.vo.request.AgentParam;
 import com.fdkankan.manage.vo.response.AgentVo;
 import org.apache.commons.lang3.StringUtils;
@@ -35,8 +36,6 @@ public class AgentNewController {
     @Autowired
     IAgentNewService agentNewService;
     @Autowired
-    IAgentIncrementService agentIncrementService;
-    @Autowired
     IUserService userService;
 
     @PostMapping("/list")
@@ -63,7 +62,7 @@ public class AgentNewController {
         }
         userService.checkUserName(param.getUserName());
         agentNewService.save(param);
-        agentIncrementService.saveByAgent(param);
+        param.setSysUserId(Integer.valueOf((String)StpUtil.getLoginId()));
         return ResultData.ok();
     }
     @PostMapping("/update")
@@ -88,7 +87,7 @@ public class AgentNewController {
     }
 
     @PostMapping("/addIncrementNum")
-    public ResultData addIncrementNum(@RequestBody AgentVo param){
+    public ResultData addIncrementNum(@RequestBody AgentAddIncrementParam param){
         agentNewService.addIncrementNum(param);
         return ResultData.ok();
     }

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

@@ -1,69 +0,0 @@
-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.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 
- * @since 2022-11-08
- */
-@Getter
-@Setter
-@TableName("t_agent_increment")
-public class AgentIncrement implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 经销商权益数量
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 经销商id
-     */
-    @TableField("agent_id")
-    private Integer agentId;
-
-    /**
-     * 权益类型id
-     */
-    @TableField("increment_type_id")
-    private Integer incrementTypeId;
-
-    /**
-     * 总数量
-     */
-    @TableField("total_num")
-    private Integer totalNum;
-
-    /**
-     * 使用数量
-     */
-    @TableField("use_num")
-    private Integer useNum;
-
-    @TableField("rec_status")
-    @TableLogic(value = "A",delval = "I")
-    private String recStatus;
-
-    @TableField("create_time")
-    private String createTime;
-
-    @TableField("update_time")
-    private String updateTime;
-
-
-}

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

@@ -71,4 +71,16 @@ public class AgentNew implements Serializable {
     @TableField("down_use_num")
     private Integer downUseNum;
 
+    @TableField("high_total_num")
+    private Integer highTotalNum;
+
+    @TableField("high_use_num")
+    private Integer highUseNum;
+
+    @TableField("major_total_num")
+    private Integer majorTotalNum;
+
+    @TableField("major_use_num")
+    private Integer majorUseNum;
+
 }

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

@@ -1,25 +0,0 @@
-package com.fdkankan.manage.service;
-
-import com.fdkankan.manage.entity.AgentIncrement;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.manage.entity.AgentNew;
-import com.fdkankan.manage.vo.response.AgentIncrementVo;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 
- * @since 2022-11-08
- */
-public interface IAgentIncrementService extends IService<AgentIncrement> {
-
-    void saveByAgent(AgentNew param);
-
-    List<AgentIncrement> getByAgentId(Integer id);
-
-    void addNum(List<AgentIncrementVo> agentIncrements);
-}

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

@@ -2,6 +2,7 @@ package com.fdkankan.manage.service;
 
 import com.fdkankan.manage.entity.AgentNew;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.vo.request.AgentAddIncrementParam;
 import com.fdkankan.manage.vo.request.AgentParam;
 import com.fdkankan.manage.vo.response.AgentVo;
 
@@ -17,5 +18,5 @@ public interface IAgentNewService extends IService<AgentNew> {
 
     Object pageList(AgentParam agentParam);
 
-    void addIncrementNum(AgentVo param);
+    void addIncrementNum(AgentAddIncrementParam param);
 }

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

@@ -1,63 +0,0 @@
-package com.fdkankan.manage.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.manage.entity.AgentIncrement;
-import com.fdkankan.manage.entity.AgentNew;
-import com.fdkankan.manage.entity.IncrementType;
-import com.fdkankan.manage.mapper.IAgentIncrementMapper;
-import com.fdkankan.manage.service.IAgentIncrementService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.manage.service.IIncrementTypeService;
-import com.fdkankan.manage.vo.response.AgentIncrementVo;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 
- * @since 2022-11-08
- */
-@Service
-public class AgentIncrementServiceImpl extends ServiceImpl<IAgentIncrementMapper, AgentIncrement> implements IAgentIncrementService {
-
-    @Autowired
-    IIncrementTypeService incrementTypeService;
-
-    @Override
-    public void saveByAgent(AgentNew param) {
-        List<IncrementType> list = incrementTypeService.list();
-        for (IncrementType incrementType : list) {
-            AgentIncrement increment = new AgentIncrement();
-            increment.setAgentId(param.getId());
-            increment.setIncrementTypeId(incrementType.getId());
-            this.save(increment);
-        }
-    }
-
-    @Override
-    public List<AgentIncrement> getByAgentId(Integer id) {
-        LambdaQueryWrapper<AgentIncrement> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(AgentIncrement::getAgentId,id);
-        return this.list(wrapper);
-    }
-
-    @Override
-    public void addNum(List<AgentIncrementVo> agentIncrements) {
-        for (AgentIncrementVo agentIncrement : agentIncrements) {
-            if(agentIncrement == null || agentIncrement.getId() == null || agentIncrement.getTotalNum() == null){
-                continue;
-            }
-            LambdaUpdateWrapper<AgentIncrement> wrapper = new LambdaUpdateWrapper<>();
-            wrapper.eq(AgentIncrement::getId,agentIncrement.getId());
-            wrapper.set(AgentIncrement::getTotalNum,agentIncrement.getTotalNum());
-            this.update(wrapper);
-        }
-    }
-}

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

@@ -9,13 +9,12 @@ import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mapper.IAgentNewMapper;
-import com.fdkankan.manage.service.IAgentIncrementService;
 import com.fdkankan.manage.service.IAgentNewService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.service.IIncrementTypeService;
 import com.fdkankan.manage.service.ISysUserService;
+import com.fdkankan.manage.vo.request.AgentAddIncrementParam;
 import com.fdkankan.manage.vo.request.AgentParam;
-import com.fdkankan.manage.vo.response.AgentIncrementVo;
 import com.fdkankan.manage.vo.response.AgentVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -40,8 +39,6 @@ public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew>
     @Autowired
     ISysUserService sysUserService;
     @Autowired
-    IAgentIncrementService agentIncrementService;
-    @Autowired
     IIncrementTypeService incrementTypeService;
 
     @Override
@@ -53,7 +50,6 @@ public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew>
         wrapper.orderByDesc(AgentNew::getCreateTime);
         Page<AgentNew> page = this.page(new Page<>(agentParam.getPageNum(), agentParam.getPageSize()), wrapper);
         List<AgentVo> voList = new ArrayList<>();
-        HashMap<Integer,IncrementType> map = incrementTypeService.getIdMap();
         for (AgentNew record : page.getRecords()) {
             AgentVo vo = new AgentVo();
             BeanUtils.copyProperties(record,vo);
@@ -61,18 +57,6 @@ public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew>
             if(sysUser != null){
                 vo.setSysUserName(sysUser.getNickName());
             }
-            List<AgentIncrement> agentIncrements = agentIncrementService.getByAgentId(record.getId());
-            List<AgentIncrementVo> agentIncrementVos = new ArrayList<>();
-            for (AgentIncrement agentIncrement : agentIncrements) {
-                if(map.get(agentIncrement.getIncrementTypeId()) == null){
-                    continue;
-                }
-                AgentIncrementVo agentVo = new AgentIncrementVo();
-                BeanUtils.copyProperties(agentIncrement,agentVo);
-                agentVo.setIncrementTypeName(map.get(agentIncrement.getIncrementTypeId()).getName());
-                agentIncrementVos.add(agentVo);
-            }
-            vo.setAgentIncrements(agentIncrementVos );
             voList.add(vo);
         }
 
@@ -83,19 +67,27 @@ public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew>
     }
 
     @Override
-    public void addIncrementNum(AgentVo param) {
+    public void addIncrementNum(AgentAddIncrementParam param) {
         if(param.getId() == null ){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        if(param.getDownTotalNum()!=null){
-            LambdaUpdateWrapper<AgentNew> wrapper = new LambdaUpdateWrapper<>();
-            wrapper.eq(AgentNew::getId,param.getId());
-            wrapper.set(AgentNew::getDownTotalNum, param.getDownTotalNum());
-            this.update(wrapper);
+        AgentNew agentNew = this.getById(param.getId());
+        if(agentNew == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+
+        LambdaUpdateWrapper<AgentNew> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(AgentNew::getId,param.getId());
+        if(param.getDownAddNum()!=null && param.getDownAddNum() >0){
+            wrapper.set(AgentNew::getDownTotalNum,agentNew.getDownTotalNum() + param.getDownAddNum());
+        }
+        if(param.getHighAddNum()!=null && param.getDownAddNum() >0){
+            wrapper.set(AgentNew::getDownTotalNum,agentNew.getHighTotalNum() + param.getHighAddNum());
         }
-        if(param.getAgentIncrements() != null && param.getAgentIncrements().size() >0){
-           agentIncrementService.addNum(param.getAgentIncrements());
+        if(param.getMajorAddNum()!=null && param.getDownAddNum() >0){
+            wrapper.set(AgentNew::getDownTotalNum,agentNew.getMajorTotalNum() + param.getMajorAddNum());
         }
+        this.update(wrapper);
 
     }
 }

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

@@ -0,0 +1,12 @@
+package com.fdkankan.manage.vo.request;
+
+import com.fdkankan.common.request.RequestBase;
+import lombok.Data;
+
+@Data
+public class AgentAddIncrementParam {
+    private Integer id;
+    private Integer downAddNum;
+    private Integer majorAddNum;
+    private Integer highAddNum;
+}

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

@@ -1,12 +0,0 @@
-package com.fdkankan.manage.vo.response;
-
-import lombok.Data;
-
-@Data
-public class AgentIncrementVo {
-    private Integer id;
-    private Integer incrementTypeId;
-    private String incrementTypeName;
-    private Integer totalNum;
-    private Integer useNum;
-}

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

@@ -1,6 +1,5 @@
 package com.fdkankan.manage.vo.response;
 
-import com.fdkankan.manage.entity.AgentIncrement;
 import com.fdkankan.manage.entity.AgentNew;
 import lombok.Data;
 
@@ -9,5 +8,20 @@ import java.util.List;
 @Data
 public class AgentVo extends AgentNew {
     private String sysUserName;
-    private List<AgentIncrementVo> agentIncrements;
+
+    private Integer downSubNum;
+    private Integer highSubNum;
+    private Integer majorSubNum;
+
+    public Integer getDownSubNum() {
+        return getDownTotalNum() - getDownUseNum();
+    }
+
+    public Integer getHighSubNum() {
+        return getHighTotalNum() - getHighUseNum();
+    }
+
+    public Integer getMajorSubNum() {
+        return getMajorTotalNum() - getMajorUseNum();
+    }
 }

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

@@ -1,5 +0,0 @@
-<?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.IAgentIncrementMapper">
-
-</mapper>