From 95fb290e11a0e990102810080af4c917b44c9cf2 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sat, 27 Nov 2021 20:03:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.1.6=E3=80=91=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=A7=98=E9=92=A5=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/exception/enums/CustomerExceptionEnum.java   | 12 +++++++++++-
 .../roses/kernel/customer/api/pojo/CustomerInfo.java |  5 +++++
 .../modular/service/impl/CustomerServiceImpl.java    | 11 +++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/exception/enums/CustomerExceptionEnum.java b/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/exception/enums/CustomerExceptionEnum.java
index 863397b51..7f90efc38 100644
--- a/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/exception/enums/CustomerExceptionEnum.java
+++ b/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/exception/enums/CustomerExceptionEnum.java
@@ -81,7 +81,17 @@ public enum CustomerExceptionEnum implements AbstractExceptionEnum {
     /**
      * 用户原密码错误
      */
-    PWD_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + CustomerConstants.CUSTOMER_EXCEPTION_STEP_CODE + "08", "更改密码失败，原密码错误!");
+    PWD_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + CustomerConstants.CUSTOMER_EXCEPTION_STEP_CODE + "08", "更改密码失败，原密码错误!"),
+
+    /**
+     * 尚未开通秘钥
+     */
+    NO_SECRET(RuleConstants.BUSINESS_ERROR_TYPE_CODE + CustomerConstants.CUSTOMER_EXCEPTION_STEP_CODE + "09", "尚未开通秘钥"),
+
+    /**
+     * 秘钥已过期
+     */
+    SECRET_EXPIRED(RuleConstants.BUSINESS_ERROR_TYPE_CODE + CustomerConstants.CUSTOMER_EXCEPTION_STEP_CODE + "10", "秘钥已过期");
 
     /**
      * 错误编码
diff --git a/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/pojo/CustomerInfo.java b/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/pojo/CustomerInfo.java
index 45c7d6d18..9073cb211 100644
--- a/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/pojo/CustomerInfo.java
+++ b/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/pojo/CustomerInfo.java
@@ -53,6 +53,11 @@ public class CustomerInfo {
      */
     private Integer score;
 
+    /**
+     * 用户秘钥
+     */
+    private String secretKey;
+
     /**
      * 是否是会员
      */
diff --git a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java
index ab90bc427..277f6ed27 100644
--- a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java
+++ b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java
@@ -373,6 +373,17 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
             return null;
         }
 
+        // 查看当前用户是否有秘钥
+        Customer customer = this.getById(customerId);
+        if (StrUtil.isEmpty(customer.getSecretKey())) {
+            throw new CustomerException(CustomerExceptionEnum.NO_SECRET);
+        }
+
+        // 判断秘钥是否过期
+        if (customer.getMemberExpireTime().before(new Date())) {
+            throw new CustomerException(CustomerExceptionEnum.SECRET_EXPIRED);
+        }
+
         // 重新生成秘钥
         String randomString = RandomUtil.randomString(32);