From 33a30da7b2795fc60ebab8e89760087f5dfdd3a0 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 九月 2024 16:13:37 +0800
Subject: [PATCH] add:三端用户禁用后下线
---
src/main/java/com/mzl/flower/service/customer/CustomerService.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/customer/CustomerService.java b/src/main/java/com/mzl/flower/service/customer/CustomerService.java
index 4fec567..187c75b 100644
--- a/src/main/java/com/mzl/flower/service/customer/CustomerService.java
+++ b/src/main/java/com/mzl/flower/service/customer/CustomerService.java
@@ -16,11 +16,13 @@
import com.mzl.flower.entity.partner.Partner;
import com.mzl.flower.mapper.customer.CustomerMapper;
import com.mzl.flower.mapper.partner.PartnerMapper;
+import com.mzl.flower.service.BaseService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
import java.util.List;
@Service
@@ -31,6 +33,9 @@
private final CustomerMapper customerMapper;
private final PartnerMapper partnerMapper;
+
+ @Resource
+ private BaseService baseService;
public CustomerService(CustomerMapper customerMapper, PartnerMapper partnerMapper) {
this.customerMapper = customerMapper;
@@ -65,6 +70,7 @@
}
customer.create(SecurityUtils.getUserId());
+ customer.setIsEnabled(true);
customerMapper.insert(customer);
} else {//重新修改
customer = customerMapper.selectById(dto.getId());
@@ -167,9 +173,13 @@
if (StringUtils.isNotBlank(c.getPartnerId()) || StringUtils.isNotBlank(c.getPartnerUserId())) {
throw new ValidationException("商户已绑定合伙人，请联系客服人员进行解绑后再进行绑定");
}
-// Partner partner = partnerMapper.selectOne(new QueryWrapper<Partner>()
-// .eq("user_id", dto.getPartnerUserId()));
- Partner partner = partnerMapper.getByIdOrUserId(dto.getPartnerUserId()); //适配id和userId
+ Partner partner;
+ try {
+ long id = Long.parseLong(dto.getPartnerUserId());
+ partner = partnerMapper.selectById(id);
+ } catch (Exception e) {
+ partner =partnerMapper.selectOne(new QueryWrapper<Partner>().eq("user_id", dto.getPartnerUserId()));
+ }
if (partner == null) {
throw new ValidationException("合伙人不存在");
}
@@ -182,7 +192,13 @@
public String getPartnerName(String partnerUserId) {
if (StringUtils.isNotBlank(partnerUserId)) {
- Partner partner = partnerMapper.getByIdOrUserId(partnerUserId);
+ Partner partner;
+ try {
+ long id = Long.parseLong(partnerUserId);
+ partner = partnerMapper.selectById(id);
+ } catch (Exception e) {
+ partner =partnerMapper.selectOne(new QueryWrapper<Partner>().eq("user_id", partnerUserId));
+ }
if (partner == null) {
throw new ValidationException("合伙人不存在");
}
@@ -190,4 +206,19 @@
}
return null;
}
+ public void isEnable(Long id) {
+ Customer customer = customerMapper.selectById(id);
+ if (customer == null) {
+ throw new ValidationException("商户信息不存在");
+ }
+ if (customer.getIsEnabled()) {
+ customer.setIsEnabled(false);
+ //强制下线
+ baseService.removeToken(customer.getUserId());
+ } else {
+ customer.setIsEnabled(true);
+ }
+ customer.update(SecurityUtils.getUserId());
+ customerMapper.updateById(customer);
+ }
}
--
Gitblit v1.9.3