From 8a54915d3c39d9d8d7e90c0971d1e19d0eb76622 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 12 六月 2020 14:37:04 +0800
Subject: [PATCH] 券统计
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudGroupServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudGroupServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudGroupServiceImpl.java
index 5f6ec09..c8adfa2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudGroupServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudGroupServiceImpl.java
@@ -12,6 +12,7 @@
import com.yeshi.fanli.entity.bus.user.cloud.UserCloudGroup;
import com.yeshi.fanli.exception.user.cloud.UserCloudGroupException;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudGroupService;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
@@ -42,13 +43,18 @@
@RequestSerializableByKeyService(key = "#uid")
public void addGroup(Long uid, String groupId, String groupName, int maxNum){
List<UserCloudGroup> list = userCloudGroupMapper.listByUidAndType(uid, UserCloudGroup.TYPE_GROUP);
- if (list != null && list.size() > maxNum)
+ if (list != null && list.size() >= maxNum)
return;
boolean exist = false;
for (UserCloudGroup userCloudGroup: list) {
if (groupId.equals(userCloudGroup.getGroupId())) {
exist = true;
+ // 缇ゅ悕涓虹┖
+ if (StringUtil.isNullOrEmpty(groupName)) {
+ return;
+ }
+
// 缇ゅ悕瀛楀彉鍖�
if (!groupName.equals(userCloudGroup.getGroupName())) {
UserCloudGroup update = new UserCloudGroup();
@@ -62,6 +68,11 @@
if (exist)
return;
+
+ // 缇ゅ悕涓虹┖
+ if (StringUtil.isNullOrEmpty(groupName)) {
+ groupName = "鏈兢鏈懡鍚嶅悕绉�";
+ }
UserCloudGroup cloudGroup = new UserCloudGroup();
cloudGroup.setUid(uid);
@@ -103,6 +114,17 @@
userCloudGroupMapper.updateByPrimaryKeySelective(update);
}
+ @Override
+ public void deleteGroup(long uid, long id) throws UserCloudGroupException{
+ UserCloudGroup cloudGroup = userCloudGroupMapper.selectByPrimaryKey(id);
+ if (cloudGroup == null || cloudGroup.getUid() != uid)
+ throw new UserCloudGroupException(1, "璇ヨ褰曞凡涓嶅瓨鍦�");
+
+ if (cloudGroup.getUid() != uid) {
+ throw new UserCloudGroupException(1, "璇ョ兢宸蹭笉瀛樺湪");
+ }
+ userCloudGroupMapper.deleteByPrimaryKey(id);
+ }
@Override
public void deleteGroupByUid(Long uid){
--
Gitblit v1.8.0