经销商分为三级

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

@@ -108,4 +108,9 @@ public class UserIncrement implements Serializable {
     @TableField("month_qy")
     private Integer monthQy;
 
+    /**
+     * 更新时间
+     */
+    @TableField("auth_time")
+    private String authTime;
 }

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

@@ -36,5 +36,4 @@ public interface IAgentNewLogService extends IService<AgentNewLog> {
 
     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

@@ -181,19 +181,6 @@ public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, Agen
         return PageInfo.PageInfo(voPage);
     }
 
-    @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) {

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

@@ -74,22 +74,12 @@ 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);
+            if(vo.getAuthTime() != null){
+                vo.setUpdateTime(vo.getAuthTime());
             }
-            vo.setUpdateTime(null);
-            if(agentNewLog !=null){
-                vo.setUpdateTime(agentNewLog.getCreateTime());
-            }
-
         }
         return PageInfo.PageInfo(page);
     }
@@ -195,11 +185,13 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         param.setIncrementTypeId(incrementType.getId());
         IncrementOrderMg orderMg = incrementOrderMgService.addOrder(user, param, agentNewVo);
 
+        String date = DateUtil.date2String(new Date(), DateUtil.DEFAULT_DATE_FORMAT);
         userIncrement.setIsExpired(0);
         DateTime dateTime = this.getDateTime(incrementType, userIncrement.getId(), param.getCount() * param.getTotalTime());
         userIncrement.setIncrementEndTime(DateUtil.date2String(dateTime.toDate(),"yyyy-MM-dd HH:mm:ss"));
         userIncrement.setUpdateTime(null);
         userIncrement.setOrderSn(userIncrement.getOrderSn() +","+orderMg.getOrderSn());
+        userIncrement.setAuthTime(date);
         this.updateById(userIncrement);
 
         LambdaUpdateWrapper<User> wrapper = new LambdaUpdateWrapper<>();