v1.2.0

README.md

@@ -25,4 +25,29 @@
 5.销售统计
     1.新增列表返回值
 6.新增权益操作日志
+~~~~
+
+
+###**v1.2.0**
+~~~~
+1.新增分销商管理，新增接口见文档
+    http://120.25.146.52:3090/project/281/interface/api/cat_1897
+2.登录返回增加字段
+    /service/agent/fdLogin 接口 agent中添加parentId。有值表示为分销商，为null表示为经销商
+3.设备管理列表添加查询 subAgentId
+    分销商名称查询 subAentId 从  /getSubAgent中获取
+4.设备管理列表添加返回
+    分销商 subAgentName
+5.设备管理，新增接口：经销商分发相机  /giveCamera
+6.设备管理，新增批量分发设备
+    模版： /downTemplate
+    导入： /giveCameraBatch
+7.销售统计，新增上月分销商销售统计
+     /logData 接口修改返回接口。新增俩个Key
+        agentData           上月经销商销售统计
+        subAgentData        上月分销商销售统计
+    当分销商调用是 subAgentData 为null
+8.销售明显 /logList 接口新增查询与返回
+    查询： subAgentId 从  /getSubAgent中获取
+    返回： agentName 授权人
 ~~~~

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

@@ -39,7 +39,11 @@ public class AgentNewController extends BaseController {
     @GetMapping("/checkUserName")
     public ResultData checkUserName(@RequestParam(required = false) String userName){
         Boolean bo = userService.checkUserName(userName);
-        return ResultData.ok(bo);
+        if(bo){
+            return ResultData.ok(true);
+        }else {
+            return ResultData.error(0,ResultCode.USER_NOT_EXIST.msg, false);
+        }
     }
 
     @PostMapping("/add")

src/main/java/com/fdkankan/agent/controller/CameraController.java

@@ -10,8 +10,10 @@ import com.fdkankan.agent.service.IAgentNewCameraService;
 import com.fdkankan.agent.service.IAgentNewService;
 import com.fdkankan.agent.service.ICameraService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -50,5 +52,17 @@ public class CameraController extends BaseController {
         agentNewCameraService.giveCamera(param,getAgent().getId());
         return ResultData.ok();
     }
+
+    @PostMapping("/giveCameraBatch")
+    public ResultData giveCameraBatch(
+            @RequestParam(required = false) Integer subAgentId,
+            @RequestParam(required = false) MultipartFile file){
+        return ResultData.ok();
+    }
+
+    @PostMapping("/downTemplate")
+    public ResultData downTemplate(@RequestBody CameraParam param){
+        return ResultData.ok();
+    }
 }