From 5e4f1cba1d27b43aeef878ae3b4e77813a2870ff Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Jul 2021 10:47:46 +0800
Subject: [PATCH] fix
---
gc-user/src/main/resources/mapper/user/AccountMapper.xml | 7 +++
gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java | 2 +
gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java | 66 +++++++++++++++++++-------------
3 files changed, 48 insertions(+), 27 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 0930fb6..0f70a10 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,7 +1,9 @@
package com.xzx.gc.user.controller;
+import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import com.xzx.gc.common.constant.CommonEnum;
import com.xzx.gc.common.constant.Constants;
import com.xzx.gc.common.dto.log.OperationAppLog;
@@ -106,33 +108,43 @@
@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("账户不存在！");
+ List<String> ids = StrUtil.split(id, ',');
+// AccountInfo accountInfo = accountMapper.selectByPrimaryKey(id);
+ List<AccountInfo> accountInfos = accountMapper.selectAccountInfoByIds(ids);
+ if (CollUtil.isNotEmpty(accountInfos)) {
+ for (AccountInfo accountInfo : accountInfos) {
+// if(ObjectUtil.isEmpty(accountInfo)){
+// return JsonResult.failMessage("账户不存在！");
+// }
+ if(ObjectUtil.isEmpty(accountInfo.getIsHead())
+ || accountInfo.getIsHead() == 1){
+ return JsonResult.failMessage(accountInfo.getAccountName() + "账户不能重复添加！");
+ }
+ if(ObjectUtil.isEmpty(accountInfo.getDelFlag())
+ || accountInfo.getDelFlag() == 1){
+ return JsonResult.failMessage(accountInfo.getAccountName() + "账户已删除！");
+ }
+ if(ObjectUtil.isEmpty(accountInfo.getIsProhibit())
+ || "1".equals(accountInfo.getIsProhibit())){
+ return JsonResult.failMessage(accountInfo.getAccountName() + "账户已冻结！");
+ }
+ //团员不能当团长
+ String userId = accountInfo.getUserId();
+ UserHeadRelate userHeadRelate = userHeadRelateMapper.selectMemberByUserId(userId);
+ if(ObjectUtil.isNotEmpty(userHeadRelate)){
+ return JsonResult.failMessage(accountInfo.getAccountName() + "账户不能申请成为团长！");
+ }
+ 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("操作成功！");
+ } else {
+ 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("账户已冻结！");
- }
- //团员不能当团长
- String userId = accountInfo.getUserId();
- UserHeadRelate userHeadRelate = userHeadRelateMapper.selectMemberByUserId(userId);
- if(ObjectUtil.isNotEmpty(userHeadRelate)){
- 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 = "团长列表")
@@ -220,7 +232,7 @@
List<List<String>> rows = new ArrayList<>();
List<String> header=new ArrayList<>();
//标题
- header=CollUtil.newArrayList( "团长名称", "手机号", "身份", "团员数量", "交易单数", "累计收益积分", "累计收益(元)", "累计订单重量（kg）","累计数量（家电）");
+ header=CollUtil.newArrayList( "团长名称", "手机号", "身份", "团员数量", "交易单数", "累计积分收益", "累计环保币收益", "累计订单重量（kg）","累计订单数量（家电）");
rows.add(header);
Map<String, Object> stringObjectMap = distribService.distribDataExport(distribDataListDto);
List<DistribDataListVo> distribDataListVos = (List<DistribDataListVo>) stringObjectMap.get("data");
diff --git a/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java b/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
index a6d127e..6c0335f 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
@@ -76,5 +76,7 @@
String selectOrderExportByHeadUserId(@Param("accountId")String id, @Param("record")ExportDistribDataListDto distribDataListDto);
String selectJDSLExportByHeadUserId(@Param("accountId")String id, @Param("record")ExportDistribDataListDto distribDataListDto);
+
+ List<AccountInfo> selectAccountInfoByIds(@Param("list") List<String> list);
}
diff --git a/gc-user/src/main/resources/mapper/user/AccountMapper.xml b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
index 3eff87a..4e5c053 100644
--- a/gc-user/src/main/resources/mapper/user/AccountMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
@@ -547,4 +547,11 @@
)
</select>
+ <select id="selectAccountInfoByIds" resultType="com.xzx.gc.entity.AccountInfo">
+ select * from xzx_account_info
+ where id in
+ <foreach collection="list" index="index" item="id" separator="," open="(" close=")">
+ #{id}
+ </foreach>
+ </select>
</mapper>
--
Gitblit v1.9.1