经销商分为三级

src/main/java/com/fdkankan/agent/service/IAgentNewLogService.java

@@ -13,6 +13,8 @@ import com.fdkankan.agent.response.LogDataVo;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -33,4 +35,6 @@ public interface IAgentNewLogService extends IService<AgentNewLog> {
     PageInfo pageUnList(LogListParam param);
 
     void export(HttpServletRequest req, HttpServletResponse resp,String lang);
+
+    AgentNewLog getLastLogByType(Integer agentId, List<Integer> list);
 }

src/main/java/com/fdkankan/agent/service/impl/AgentNewLogServiceImpl.java

@@ -182,6 +182,20 @@ public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, Agen
     }
 
     @Override
+    public AgentNewLog getLastLogByType(Integer agentId, List<Integer> list) {
+        LambdaQueryWrapper<AgentNewLog> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(AgentNewLog::getAgentId,agentId);
+        wrapper.in(AgentNewLog::getType,list);
+        wrapper.orderByDesc(AgentNewLog::getId);
+        wrapper.last("limit 1");
+        List<AgentNewLog> list1 = this.list(wrapper);
+        if(list1.isEmpty()){
+            return null;
+        }
+        return list1.get(0);
+    }
+
+    @Override
     public void export(HttpServletRequest req, HttpServletResponse resp,String lang) {
         logListParam.setPageSize(100000);
         List<LogListVo> list = (List<LogListVo>) this.pageUnList(logListParam).getList();

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

@@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.agent.common.PageInfo;
 import com.fdkankan.agent.common.ResultCode;
 import com.fdkankan.agent.common.util.IncrementUtil;
-import com.fdkankan.agent.entity.IncrementOrderMg;
-import com.fdkankan.agent.entity.IncrementType;
-import com.fdkankan.agent.entity.User;
-import com.fdkankan.agent.entity.UserIncrement;
+import com.fdkankan.agent.entity.*;
 import com.fdkankan.agent.exception.BusinessException;
 import com.fdkankan.agent.mapper.IUserIncrementMapper;
 import com.fdkankan.agent.request.CameraParam;
@@ -32,6 +29,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -53,6 +51,8 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     @Autowired
     IIncrementOrderMgService incrementOrderMgService;
     @Autowired
+    IAgentNewLogService agentNewLogService;
+    @Autowired
     RabbitMqProducer rabbitMqProducer;
     @Autowired
     public static String ucenterScenePayStatusQueue = "scene-pay-status";
@@ -74,9 +74,22 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     public Object pageList(IncrementParam param) {
         Page<UserIncrementVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(), param.getPageSize()), param);
 
+        HashMap<Integer,AgentNewLog> map = new HashMap<>();
+
         for (UserIncrementVo vo :page.getRecords() ) {
             String fmName = IncrementUtil.getStrIncrementName(vo.getValidTimeType(), vo.getIncrementTypeName());
             vo.setIncrementTypeName(fmName);
+
+            AgentNewLog agentNewLog = map.get(vo.getAgentId());
+            if(!map.containsKey(vo.getAgentId()) ){
+                 agentNewLog = agentNewLogService.getLastLogByType(vo.getAgentId(),Arrays.asList(0,1));
+                 map.put(vo.getAgentId(),agentNewLog);
+            }
+            vo.setUpdateTime(null);
+            if(agentNewLog !=null){
+                vo.setUpdateTime(agentNewLog.getCreateTime());
+            }
+
         }
         return PageInfo.PageInfo(page);
     }