From dea21d35ef7e21ad9a42cf47d4a1cc79e52b2605 Mon Sep 17 00:00:00 2001
From: wujingtao <wujingtao_t@126.com>
Date: Mon, 20 Dec 2021 14:52:40 +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=E8=AE=B0=E5=BD=95=E8=A1=A8=E7=9B=B8=E5=85=B3=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hchbox/module/dao/AutoTaskMessageInfoJpa.java  | 2 +-
 .../com/hchbox/module/dao/AutoTaskMessageRepository.java    | 2 +-
 .../src/main/java/com/hchbox/module/dao/TradeJpa.java       | 5 +++--
 .../java/com/hchbox/module/entity/AutoTaskMessageInfo.java  | 1 -
 .../hchbox/module/service/impl/TimerTaskServiceImpl.java    | 6 ++++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/AutoTaskMessageInfoJpa.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/AutoTaskMessageInfoJpa.java
index e079518..4a2b520 100644
--- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/AutoTaskMessageInfoJpa.java
+++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/AutoTaskMessageInfoJpa.java
@@ -31,6 +31,6 @@ public interface AutoTaskMessageInfoJpa extends JpaRepository<AutoTaskMessageInf
      * @param date
      * @return
      */
-    @Query(value = "select count(*) from AutoTaskMessageInfo as m where m.tid=?1 and m.sendType=?2 and DATE_FORMAT(m.create_time,'%Y-%m-%d') = ?3", nativeQuery = true)
+    @Query(value = "select count(*) from auto_task_message_info as m where m.tid=?1 and m.send_type=?2 and DATE_FORMAT(m.create_time,'%Y-%m-%d') = ?3", nativeQuery = true)
     Long countByTidAndTypeAndCreateTime(Long tid, Integer settingType, String date);
 }
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 e9d45e2..94b0d68 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
@@ -25,6 +25,6 @@ public interface AutoTaskMessageRepository extends JpaRepository<AutoTaskMessage
      * @param sellerNick
      * @return
      */
-    @Query("select  m  from AutoTaskMessage m where m.sendType = ?1 and m.sellerNick = ?3 and m.createTime between ?2 and ?3")
+    @Query("select  m  from AutoTaskMessage m where m.sendType = ?1 and m.sellerNick = ?4 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/dao/TradeJpa.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/TradeJpa.java
index 9ca0ab9..7905aa0 100644
--- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/TradeJpa.java
+++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/TradeJpa.java
@@ -137,6 +137,7 @@ public class TradeJpa {
             trade.setReceiverMobile((String) row.get("receiverMobile"));
             trade.setReceiverAddress((String) row.get("receiverAddress"));
             trade.setStepPaidFee((String) row.get("stepPaidFee"));
+            trade.setStepTradeStatus((String) row.get("stepTradeStatus"));
             trade.setSellerNick((String) row.get("sellerNick"));
             BigInteger sellerFlag = (BigInteger) row.get("sellerFlag");
             trade.setSellerFlag(sellerFlag.longValue());
@@ -149,14 +150,14 @@ public class TradeJpa {
     private StringBuilder getSql() {
         StringBuilder sql = new StringBuilder();
         sql.append("select t.pay_time as payTime ,t.title,t.payment,t.buyer_nick as buyerNick,t.receiver_name as receiverName,t.receiver_mobile as receiverMobile,t.receiver_address as receiverAddress ," +
-                " t.tid ,t.step_paid_fee as stepPaidFee, t.seller_nick as sellerNick,t.seller_flag as sellerFlag from  top_trade  as t where 1=1 ");
+                " t.tid ,t.step_paid_fee as stepPaidFee,t.step_trade_status as stepTradeStatus, t.seller_nick as sellerNick,t.seller_flag as sellerFlag from  top_trade  as t where 1=1 ");
         return sql;
     }
 
     private StringBuilder getRefundSql() {
         StringBuilder sql = new StringBuilder();
         sql.append("select t.pay_time as payTime ,t.title,o.payment,t.buyer_nick as buyerNick,t.receiver_name as receiverName,t.receiver_mobile as receiverMobile,t.receiver_address as receiverAddress ," +
-                " t.tid ,t.step_paid_fee as stepPaidFee, t.seller_nick as sellerNick, t.seller_flag as sellerFlag from  top_trade as t left join top_order as o on t.tid=o.tid  where 1=1  ");
+                " t.tid ,t.step_paid_fee as stepPaidFee,t.step_trade_status as stepTradeStatus, t.seller_nick as sellerNick, t.seller_flag as sellerFlag from  top_trade as t left join top_order as o on t.tid=o.tid  where 1=1  ");
         return sql;
     }
 
diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/AutoTaskMessageInfo.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/AutoTaskMessageInfo.java
index 728dae4..ba11a82 100644
--- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/AutoTaskMessageInfo.java
+++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/AutoTaskMessageInfo.java
@@ -2,7 +2,6 @@ package com.hchbox.module.entity;
 
 import cn.hutool.core.date.DatePattern;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.hchbox.model.entity.BaseTaskMessageInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.annotations.CreationTimestamp;
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 7d1ed17..e6a96bf 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
@@ -73,7 +73,9 @@ public class TimerTaskServiceImpl implements TimerTaskService {
             }
             // 获取卖家账号信息
             SellerAccount sellerAccount = sellerAccountRepository.findSellerAccountById(userId);
-
+            if (StrUtil.isEmpty(as.getSendAccountIds())) {
+                continue;
+            }
             // 查询可发送子账号
             List<String> subNickList = Arrays.asList(as.getSendAccountIds().split(StrUtil.COMMA));
 //            List<String> subNickList = sellerAccountRepository.findByParentId(sellerAccount.getId());
@@ -147,7 +149,7 @@ public class TimerTaskServiceImpl implements TimerTaskService {
         }
         //预支预付款
         if (as.getEnablePrepaidOrder() != null && as.getEnablePrepaidOrder() && CollUtil.isNotEmpty(list)) {
-            list.removeIf(trade -> trade.getStepTradeStatus().equals(StepTradeStatusEnum.FRONT_PAID_FINAL_NOPAID.toString()));
+            list.removeIf(trade -> StrUtil.isEmpty(trade.getStepTradeStatus()) && trade.getStepTradeStatus().equals(StepTradeStatusEnum.FRONT_PAID_FINAL_NOPAID.toString()));
         }
         //不发送的旗帜
         if (StrUtil.isNotEmpty(as.getNotSendFlagStr()) && CollUtil.isNotEmpty(list)) {