From a768dc3daa04d35fedfbe75c0a59b9b2545b85c4 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 19 九月 2024 16:59:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'

---
 src/main/java/com/mzl/flower/service/customer/CustomerService.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 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 0081055..1933dc4 100644
--- a/src/main/java/com/mzl/flower/service/customer/CustomerService.java
+++ b/src/main/java/com/mzl/flower/service/customer/CustomerService.java
@@ -20,6 +20,7 @@
 import com.mzl.flower.mapper.partner.PartnerMapper;
 import com.mzl.flower.service.menber.MemberGrowthRecordService;
 import lombok.extern.slf4j.Slf4j;
+import com.mzl.flower.service.BaseService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -40,6 +41,9 @@
     private final PartnerMapper partnerMapper;
     @Resource
     private MemberGrowthRecordService memberGrowthRecordService;
+
+    @Resource
+    private BaseService baseService;
 
     public CustomerService(CustomerMapper customerMapper, PartnerMapper partnerMapper) {
         this.customerMapper = customerMapper;
@@ -79,6 +83,8 @@
             }
 
             customer.create(SecurityUtils.getUserId());
+            customer.setIsEnabled(true);
+            customer.setLevelId(Long.valueOf(Constants.DEFAULT_MEMBER_ID));
             customerMapper.insert(customer);
         } else {//重新修改
             customer = customerMapper.selectById(dto.getId());
@@ -214,6 +220,21 @@
         }
         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);
+    }
 
     /**
      * 根据会员等级获取等级下的customer信息

--
Gitblit v1.9.3