From d4488a987cccd3ddd51a202a9f8aa71d3cdcbced Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Apr 2021 17:12:16 +0800
Subject: [PATCH] 20210423

---
 src/main/java/com/xcong/excoin/modules/agent/controller/AgentController.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/agent/controller/AgentController.java b/src/main/java/com/xcong/excoin/modules/agent/controller/AgentController.java
index 62d1c14..2bcb61c 100644
--- a/src/main/java/com/xcong/excoin/modules/agent/controller/AgentController.java
+++ b/src/main/java/com/xcong/excoin/modules/agent/controller/AgentController.java
@@ -1,7 +1,11 @@
 package com.xcong.excoin.modules.agent.controller;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xcong.excoin.common.annotation.ControllerEndpoint;
+import com.xcong.excoin.common.annotation.SubmitRepeat;
 import com.xcong.excoin.common.controller.BaseController;
 import com.xcong.excoin.common.entity.FebsResponse;
 import com.xcong.excoin.common.entity.QueryRequest;
@@ -17,6 +21,7 @@
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -37,15 +42,28 @@
     public FebsResponse getList(AgentUser agentUser, QueryRequest queryRequest) {
         User user = getCurrentUser();
         agentUser.setRefererId(user.getInviteId());
+        String startTime = agentUser.getStartTime();
+        if(StrUtil.isNotEmpty(startTime)){
+            Date date = DateUtil.parse(startTime);
+            agentUser.setStartDate(date);
+        }
+        String endTime = agentUser.getEndTime();
+        if(StrUtil.isNotEmpty(endTime)){
+            Date date = DateUtil.parse(endTime);
+            agentUser.setEndDate(date);
+        }
+
         Map<String, Object> map = getDataTable(agentService.findAgentList(agentUser, queryRequest));
         return new FebsResponse().success().data(map);
     }
 
+//    @SubmitRepeat
     @PostMapping("add")
     @RequiresPermissions("agent:add")
     @ControllerEndpoint(operation = "新增代理商", exceptionMessage = "新增代理商失败")
     public FebsResponse add(@Valid AgentUser agentUser) {
         User user = getCurrentUser();
+        log.info("{}添加代理商{}", user.getInviteId(), agentUser.getInviteId());
         agentService.addAgent(agentUser, user);
         return new FebsResponse().success();
     }
@@ -66,4 +84,13 @@
         agentService.resetPwd(id);
         return new FebsResponse().success();
     }
+
+    @PostMapping("edit")
+    @RequiresPermissions("agent:edit")
+    @ControllerEndpoint(operation = "修改代理商", exceptionMessage = "修改代理商失败")
+    public FebsResponse edit(@Valid AgentUser agentUser) {
+        User user = getCurrentUser();
+        agentService.editAgent(agentUser, user);
+        return new FebsResponse().success();
+    }
 }

--
Gitblit v1.9.1