From ec4cbae94749ecc12b1f21ab24934bbc0fa8d694 Mon Sep 17 00:00:00 2001 From: wujingtao Date: Thu, 28 Oct 2021 16:41:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=A5=BD=E8=AF=84?= =?UTF-8?q?=E5=92=8C=E5=B7=AE=E7=82=B9=E7=9A=84=E7=BE=A4=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hchbox/job/NegativeJob.java | 43 +++++++++---------- .../java/com/hchbox/job/PositiveThankJob.java | 40 ++++++++--------- .../java/com/hchbox/module/dao/TradeJpa.java | 22 +++------- .../com/hchbox/module/entity/TopTrade.java | 1 - .../service/impl/TimerTaskServiceImpl.java | 6 ++- 5 files changed, 51 insertions(+), 61 deletions(-) diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/NegativeJob.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/NegativeJob.java index cdd1a74..6d78188 100644 --- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/NegativeJob.java +++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/NegativeJob.java @@ -15,26 +15,25 @@ import javax.annotation.Resource; * @date 2021/7/19 * 差评关怀 */ -@Slf4j -@ElasticSimpleJob( - jobName = "NegativeJob", cron = "0 0/1 * * * ?", shardingTotalCount = 1, overwrite = true, jobEvent = false - -) -@Component -public class NegativeJob implements SimpleJob { - @Resource - private TimerTaskService timerTaskService; - - private static NegativeJob negativeJob; - - @PostConstruct - public void init() { - negativeJob = this; - } - - @Override - public void execute(ShardingContext shardingContext) { +//@Slf4j +//@ElasticSimpleJob( +// jobName = "NegativeJob", cron = "0 0/1 * * * ?", shardingTotalCount = 1, overwrite = true, jobEvent = false +//) +//@Component +//public class NegativeJob implements SimpleJob { +// @Resource +// private TimerTaskService timerTaskService; +// +// private static NegativeJob negativeJob; +// +// @PostConstruct +// public void init() { +// negativeJob = this; +// } +// +// @Override +// public void execute(ShardingContext shardingContext) { // negativeJob.timerTaskService.sendMessage(AppSettingTypeEnum.MESSAGE_BAD_REVIEW.getType()); - } - -} +// } +// +//} diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/PositiveThankJob.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/PositiveThankJob.java index fa8fd73..e277059 100644 --- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/PositiveThankJob.java +++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/PositiveThankJob.java @@ -18,24 +18,24 @@ import javax.annotation.Resource; *

* cron 0 0/10 8-22 * * ? 8点到22点 ，没10分钟执行一次 */ -@Slf4j -@Component -@ElasticSimpleJob( - jobName = "PositiveThankJob", cron = "0 0/5 * * * ?", shardingTotalCount = 1, overwrite = true, jobEvent = false) -public class PositiveThankJob implements SimpleJob { - @Resource - private TimerTaskService timerTaskService; - - private static PositiveThankJob positiveThankJob; - - @PostConstruct - public void init() { - positiveThankJob = this; - } - - @Override - public void execute(ShardingContext shardingContext) { +//@Slf4j +//@Component +//@ElasticSimpleJob( +// jobName = "PositiveThankJob", cron = "0 0/5 * * * ?", shardingTotalCount = 1, overwrite = true, jobEvent = false) +//public class PositiveThankJob implements SimpleJob { +// @Resource +// private TimerTaskService timerTaskService; +// +// private static PositiveThankJob positiveThankJob; +// +// @PostConstruct +// public void init() { +// positiveThankJob = this; +// } +// +// @Override +// public void execute(ShardingContext shardingContext) { // positiveThankJob.timerTaskService.sendMessage(AppSettingTypeEnum.MESSAGE_PRAISE.getType(), TradeEnum.TRADE_FINISHED.toString()); - } - -} +// } +// +//} 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 97deb57..a764967 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 @@ -19,6 +19,7 @@ import javax.persistence.Query; import javax.transaction.Transactional; import java.math.BigInteger; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -35,25 +36,21 @@ public class TradeJpa { @Transactional(rollbackOn = Exception.class) public List getConfirmReceipt(@RequestBody AppSetting appSetting, String tradeStatus) { - StringBuilder sql = new StringBuilder(); + StringBuilder sql; if (appSetting.getType().equals(AppSettingTypeEnum.MESSAGE_RETURN_REMINDER.getType())) { //退款 sql = getRefundSql(); } else { sql = getSql(); } - //实际付款 限定的范围 - //实付最小金额 Double minPayment = appSetting.getPaymentFloor(); - //实付最大金额 Double maxPayment = appSetting.getPaymentCeiling(); if (minPayment != null && minPayment > 0) { sql.append("and t.payment >= :minPayment "); } - if (maxPayment != null) { + if (maxPayment != null && maxPayment > 0) { sql.append("and t.payment <= :maxPayment "); } - //订单状态 if (StrUtil.isNotEmpty(tradeStatus)) { if (appSetting.getType().equals(AppSettingTypeEnum.MESSAGE_RETURN_REMINDER.getType())) { sql.append("and o.status = :tradeStatus "); @@ -61,8 +58,6 @@ public class TradeJpa { sql.append("and t.status = :tradeStatus "); } } - - //如果是催评，需要订单未进行过评价 if (AppSettingTypeEnum.MESSAGE_REMINDER.getType() == appSetting.getType()) { sql.append("and t.buyer_rate = :buyerRate "); @@ -91,24 +86,21 @@ public class TradeJpa { day = DateUtil.offset(DateUtil.date(), DateField.MINUTE, -limitMinute); } } - if (null != day) { sql.append("and t.created < :offDay "); } - //卖家昵称 String sellerNick = appSetting.getSellerNick(); if (StrUtil.isNotEmpty(sellerNick)) { sql.append("and t.seller_nick = :sellerNick "); } Query query = entityManager.createNativeQuery(sql.toString()); //设置参数 - if (null != minPayment) { + if (null != minPayment && minPayment > 0) { query.setParameter("minPayment", minPayment); } - if (null != maxPayment) { + if (null != maxPayment && maxPayment > 0) { query.setParameter("maxPayment", maxPayment); } - if (null != tradeStatus) { query.setParameter("tradeStatus", tradeStatus); } @@ -123,7 +115,6 @@ public class TradeJpa { if (null != sellerNick) { query.setParameter("sellerNick", sellerNick); } - query.unwrap(NativeQueryImpl.class).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); List list = query.getResultList(); return getTradeInfo(list); @@ -131,14 +122,13 @@ public class TradeJpa { private List getTradeInfo(List list) { List tradeList = new ArrayList<>(); - for (Object obj : list) { Map row = (Map) obj; TopTrade trade = new TopTrade(); trade.setBuyerNick((String) row.get("buyerNick")); BigInteger tid = (BigInteger) row.get("tid"); trade.setTid(tid.longValue()); - trade.setPayment((String) row.get("payTime")); + trade.setPayTime((Date) row.get("payTime")); trade.setTitle((String) row.get("title")); trade.setPayment((String) row.get("payment")); trade.setReceiverName((String) row.get("receiverName")); diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/TopTrade.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/TopTrade.java index ac98914..6a6603c 100644 --- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/TopTrade.java +++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/TopTrade.java @@ -25,5 +25,4 @@ public class TopTrade extends BaseTrade implements Serializable { @ApiModelProperty(value = "id") private Long id; - } 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 e9d26d2..274a756 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 @@ -77,7 +77,9 @@ public class TimerTaskServiceImpl implements TimerTaskService { continue; } List list = tradeJpa.getConfirmReceipt(as, tradeStatus); - + if (CollUtil.isEmpty(list)) { + continue; + } //过滤黑名单 List tradeList = filterBlack(list, sellerNick); //条件过滤 @@ -131,7 +133,7 @@ public class TimerTaskServiceImpl implements TimerTaskService { list.removeIf(trade -> autoTaskMessageInfoJpa.countByTidAndSendType(trade.getTid(), settingType) > 0); } //预支预付款 - if (as.getEnablePrepaidOrder() != null&&as.getEnablePrepaidOrder() && CollUtil.isNotEmpty(list)) { + if (as.getEnablePrepaidOrder() != null && as.getEnablePrepaidOrder() && CollUtil.isNotEmpty(list)) { list.removeIf(trade -> trade.getStepTradeStatus().equals(StepTradeStatusEnum.FRONT_PAID_FINAL_NOPAID.toString())); } //不发送的旗帜 From b7c9cd8241d3bf19d74f93838d1e31d017251c98 Mon Sep 17 00:00:00 2001 From: wujingtao Date: Thu, 28 Oct 2021 17:06:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/trade-service-wwsend/trade-service-wwsend-task/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/pom.xml b/service/trade-service-wwsend/trade-service-wwsend-task/pom.xml index e0b05da..6dc3912 100644 --- a/service/trade-service-wwsend/trade-service-wwsend-task/pom.xml +++ b/service/trade-service-wwsend/trade-service-wwsend-task/pom.xml @@ -80,6 +80,7 @@ org.apache.curator curator-client + 2.12.0