From a74fe60c71b5404a646697e66e4587e5ad8478ab Mon Sep 17 00:00:00 2001
From: wujingtao <wujingtao_t@126.com>
Date: Tue, 7 Dec 2021 14:42:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=9D=E5=AD=98=E8=AE=B0=E5=BD=95=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hchbox/module/controller/WwRemindController.java   | 4 ++++
 .../com/hchbox/module/dao/AutoTaskMessageRepository.java   | 7 ++++---
 .../hchbox/module/service/impl/TimerTaskServiceImpl.java   | 7 +++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/controller/WwRemindController.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/controller/WwRemindController.java
index 390460d..529f1d4 100644
--- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/controller/WwRemindController.java
+++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/controller/WwRemindController.java
@@ -3,6 +3,7 @@ package com.hchbox.module.controller;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.hchbox.constant.AuthConstants;
 import com.hchbox.constant.DefaultNumberConstants;
 import com.hchbox.dto.BathSendMessageDTO;
@@ -56,6 +57,9 @@ public class WwRemindController {
     @ApiOperation("接受消息")
     public CommonResult<Object> wwDelayRemindController(HttpServletRequest request) {
         String token = request.getParameter("TAO_MI_TOKEN");
+        if (StrUtil.isBlank(token)) {
+            return new CommonResult<>().error("查詢消息時店鋪token不能為空");
+        }
         SellerAccount sellerAccount = sellerAccountService.findSellerAccountByAccessToken(token);
         String sellerNick;
         if (ObjectUtil.isEmpty(sellerAccount)) {
diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/AutoTaskMessageRepository.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/AutoTaskMessageRepository.java
index 3cfd0eb..e9d45e2 100644
--- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/AutoTaskMessageRepository.java
+++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/AutoTaskMessageRepository.java
@@ -17,13 +17,14 @@ public interface AutoTaskMessageRepository extends JpaRepository<AutoTaskMessage
 
 
     /**
-     * 类型与 开始时间查询
+     * 类型与卖家和 开始时间查询
      *
      * @param type
      * @param startTime
      * @param endTime
+     * @param sellerNick
      * @return
      */
-    @Query("select  m  from AutoTaskMessage m where m.sendType = ?1 and m.createTime between ?2 and ?3")
-    AutoTaskMessage findAutoTaskMessageTypeBetweenTime(Integer type, Date startTime, Date endTime);
+    @Query("select  m  from AutoTaskMessage m where m.sendType = ?1 and m.sellerNick = ?3 and m.createTime between ?2 and ?3")
+    AutoTaskMessage findAutoTaskMessageTypeBetweenTime(Integer type, Date startTime, Date endTime, String sellerNick);
 }
diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/TimerTaskServiceImpl.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/TimerTaskServiceImpl.java
index 3ddc856..7d1ed17 100644
--- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/TimerTaskServiceImpl.java
+++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/TimerTaskServiceImpl.java
@@ -20,6 +20,7 @@ import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
 import java.time.LocalTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -72,8 +73,10 @@ public class TimerTaskServiceImpl implements TimerTaskService {
             }
             // 获取卖家账号信息
             SellerAccount sellerAccount = sellerAccountRepository.findSellerAccountById(userId);
+
             // 查询可发送子账号
-            List<String> subNickList = sellerAccountRepository.findByParentId(sellerAccount.getId());
+            List<String> subNickList = Arrays.asList(as.getSendAccountIds().split(StrUtil.COMMA));
+//            List<String> subNickList = sellerAccountRepository.findByParentId(sellerAccount.getId());
             if (CollectionUtils.isEmpty(subNickList)) {
                 continue;
             }
@@ -170,7 +173,7 @@ public class TimerTaskServiceImpl implements TimerTaskService {
 
     private AutoTaskMessage createAutoTaskMessage(AppSetting setting, String template) {
         DateTime date = DateUtil.date();
-        AutoTaskMessage message = autoTaskMessageRepository.findAutoTaskMessageTypeBetweenTime(setting.getType(), DateUtil.beginOfDay(date), DateUtil.endOfDay(date));
+        AutoTaskMessage message = autoTaskMessageRepository.findAutoTaskMessageTypeBetweenTime(setting.getType(), DateUtil.beginOfDay(date), DateUtil.endOfDay(date), setting.getSellerNick());
         if (message != null) {
             return message;
         }