From f7201342d9de923feed550dd2caea7c8d645113b Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Wed, 9 Jun 2021 16:29:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E5=BA=A6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=EF=BC=8C=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                    | 5 ++++-
 .../java/cn/lili/controller/payment/CashierController.java   | 3 ---
 .../java/cn/lili/common/trigger/RocketmqTimerTrigger.java    | 2 +-
 .../trigger/delay/AbstractDelayQueueMachineFactory.java      | 4 +++-
 pom.xml                                                      | 1 +
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index afd4c9c51..4c673cbce 100644
--- a/README.md
+++ b/README.md
@@ -293,7 +293,10 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_
 
 2.禁止将本开源的代码和资源进行任何形式任何名义的出售.
 
-3.限制商用，如果需要商业使用请联系我们。QQ3409056806.
+3.软件受国家计算机软件著作权保护（登记号：2021SR0805085）。
+
+4.限制商用，如果需要商业使用请联系我们。QQ3409056806.
+
 
 ### 交流群
 
diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
index aad6f2d4a..fffdceff1 100644
--- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
@@ -8,7 +8,6 @@ import cn.lili.modules.payment.kit.dto.PayParam;
 import cn.lili.modules.payment.kit.enums.PaymentClientEnum;
 import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
 import cn.lili.modules.payment.kit.params.dto.CashierParam;
-import cn.lili.modules.payment.service.PaymentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -33,8 +32,6 @@ public class CashierController {
 
     @Autowired
     private CashierSupport cashierSupport;
-    @Autowired
-    private PaymentService paymentService;
 
 
     @ApiImplicitParams({
diff --git a/framework/src/main/java/cn/lili/common/trigger/RocketmqTimerTrigger.java b/framework/src/main/java/cn/lili/common/trigger/RocketmqTimerTrigger.java
index 04f83b518..009e0f5f6 100644
--- a/framework/src/main/java/cn/lili/common/trigger/RocketmqTimerTrigger.java
+++ b/framework/src/main/java/cn/lili/common/trigger/RocketmqTimerTrigger.java
@@ -69,7 +69,7 @@ public class RocketmqTimerTrigger implements TimeTrigger {
         String generateKey = TimeTriggerUtil.generateKey(timeTriggerMsg.getTriggerExecutor(), timeTriggerMsg.getTriggerTime(), uniqueKey);
         this.cache.put(generateKey, 1);
         //设置延时任务
-        if (Boolean.TRUE.equals(promotionDelayQueue.addJobId(JSONUtil.toJsonStr(timeTriggerMsg), delayTime))) {
+        if (Boolean.TRUE.equals(promotionDelayQueue.addJob(JSONUtil.toJsonStr(timeTriggerMsg), delayTime))) {
             log.info("add Redis key {}", generateKey);
             log.info("定时执行在【" + DateUtil.toString(timeTriggerMsg.getTriggerTime(), "yyyy-MM-dd HH:mm:ss") + "】，消费【" + timeTriggerMsg.getParam().toString() + "】");
         } else {
diff --git a/framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java b/framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java
index 31248b4bd..60da4a6d1 100644
--- a/framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java
+++ b/framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java
@@ -32,10 +32,12 @@ public abstract class AbstractDelayQueueMachineFactory {
      * @param time  延时时间(单位 :秒)
      * @return 是否插入成功
      */
-    public boolean addJobId(String jobId, Integer time) {
+    public boolean addJob(String jobId, Integer time) {
+        //获取时间
         Calendar instance = Calendar.getInstance();
         instance.add(Calendar.SECOND, time);
         long delaySeconds = instance.getTimeInMillis() / 1000;
+        //增加延时任务 参数依次为：队列名称、执行时间、任务id
         boolean result = cache.zAdd(setDelayQueueName(), delaySeconds, jobId);
         log.info("增加延时任务, 缓存key {}, 等待时间 {}", setDelayQueueName(), time);
         return result;
diff --git a/pom.xml b/pom.xml
index 038c1a819..44ab8a885 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
         <module>seller-api</module>
         <module>common-api</module>
         <module>consumer</module>
+        <module>admin</module>
     </modules>