From 92d840dca526881cf296a75d9af643618141a5b4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Jul 2021 16:51:28 +0800
Subject: [PATCH] 202107014
---
gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 7 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java
index fa68dcb..2c1bff9 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java
@@ -1,20 +1,19 @@
package com.xzx.gc.user.controller;
import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.xzx.gc.common.Result;
import com.xzx.gc.common.constant.CommonEnum;
import com.xzx.gc.common.constant.Constants;
import com.xzx.gc.common.dto.log.OperationAppLog;
import com.xzx.gc.common.request.BaseController;
-import com.xzx.gc.entity.JhyInfo;
+import com.xzx.gc.entity.AccountInfo;
import com.xzx.gc.entity.RedPaperRule;
import com.xzx.gc.model.JsonResult;
-import com.xzx.gc.user.dto.ExamineJwyDto;
-import com.xzx.gc.user.dto.UpdateSettingDto;
-import com.xzx.gc.user.dto.ViewSettingDto;
+import com.xzx.gc.user.dto.*;
+import com.xzx.gc.user.mapper.AccountMapper;
import com.xzx.gc.user.mapper.RedPaperRuleMapper;
import com.xzx.gc.user.service.DistribService;
+import com.xzx.gc.user.vo.DistribInfoListVo;
+import com.xzx.gc.user.vo.DistribListVo;
import com.xzx.gc.user.vo.ViewSettingVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -27,6 +26,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
@RestController
@Api(tags = {"分銷系統管理"})
@@ -37,6 +37,9 @@
@Resource
private RedPaperRuleMapper redPaperRuleMapper;
+
+ @Autowired
+ private AccountMapper accountMapper;
/**
* 查看分銷系統设置详情
@@ -52,7 +55,7 @@
/**
* 更新分銷系統设置
*/
- @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/jhy/updateSetting.json")
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/distrib/updateSetting.json")
@ApiOperation(value="分銷系統管理--更新分銷系統设置", notes="test: 仅0有正确返回")
public JsonResult updateSetting(@RequestBody UpdateSettingDto model, HttpServletRequest request) {
@@ -75,6 +78,54 @@
return JsonResult.success("操作成功！");
}
+ @ApiOperation(value = "符合条件待入选团长列表")
+ @ApiResponses(
+ @ApiResponse(code = 200, message = "success", response = DistribListVo.class)
+ )
+ @PostMapping(value = Constants.ADMIN_VIEW_PREFIX + "/distrib/distribList.json")
+ public JsonResult<Map<String, Object>> distribList(@RequestBody DistribListDto distribListDto) {
+ return JsonResult.success(distribService.distribList(distribListDto));
+ }
+
+ /**
+ * 新增团长
+ */
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/distrib/adddistrib.json")
+ @ApiOperation(value="分銷系統管理--新增团长", notes="test: 仅0有正确返回")
+ public JsonResult adddistrib(@RequestBody AdddistribDto model, HttpServletRequest request) {
+ String id = model.getId();
+ AccountInfo accountInfo = accountMapper.selectByPrimaryKey(id);
+ if(ObjectUtil.isEmpty(accountInfo)){
+ return JsonResult.failMessage("账户不存在！");
+ }
+ if(ObjectUtil.isEmpty(accountInfo.getIsHead())
+ || accountInfo.getIsHead() == 1){
+ return JsonResult.failMessage("账户不能重复添加！");
+ }
+ if(ObjectUtil.isEmpty(accountInfo.getDelFlag())
+ || accountInfo.getDelFlag() == 1){
+ return JsonResult.failMessage("账户已删除！");
+ }
+ if(ObjectUtil.isEmpty(accountInfo.getIsProhibit())
+ || accountInfo.getIsProhibit() == "1"){
+ return JsonResult.failMessage("账户已冻结！");
+ }
+ distribService.adddistrib(model);
+ OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
+ .methodName(Constants.USER_MODUL_NAME).operateAction("分銷系統管理--新增团长-"+id).build();
+ mqUtil.sendApp(build);
+ return JsonResult.success("操作成功！");
+ }
+
+ @ApiOperation(value = "团长列表")
+ @ApiResponses(
+ @ApiResponse(code = 200, message = "success", response = DistribInfoListVo.class)
+ )
+ @PostMapping(value = Constants.ADMIN_VIEW_PREFIX + "/distrib/distribInfoList.json")
+ public JsonResult<Map<String, Object>> distribInfoList(@RequestBody DistribInfoListDto distribInfoListDto) {
+ return JsonResult.success(distribService.distribInfoList(distribInfoListDto));
+ }
+
}
--
Gitblit v1.9.1