From 3b7279057f04e0dd955e97768d6b10f4f9a1f366 Mon Sep 17 00:00:00 2001 From: wujingtao Date: Mon, 22 Nov 2021 10:07:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=B6=88=E6=81=AF=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hchbox/job/ConfirmReceiptJob.java | 2 +- .../java/com/hchbox/module/dao/TradeJpa.java | 7 +++++-- .../hchbox/module/entity/AutoTaskMessage.java | 9 +-------- .../module/entity/AutoTaskMessageInfo.java | 8 -------- .../service/impl/TimerTaskServiceImpl.java | 19 +++++++++++++------ 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ConfirmReceiptJob.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ConfirmReceiptJob.java index 9d495c3..ebef5aa 100644 --- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ConfirmReceiptJob.java +++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ConfirmReceiptJob.java @@ -20,7 +20,7 @@ import javax.annotation.Resource; */ @Slf4j @ElasticSimpleJob( - jobName = "ConfirmReceiptJob", cron = "0 0/30 * * * ?", shardingTotalCount = 1, overwrite = true, jobEvent = false) + jobName = "ConfirmReceiptJob", cron = "0 0/1 * * * ?", shardingTotalCount = 1, overwrite = true, jobEvent = false) @Component public class ConfirmReceiptJob implements SimpleJob { 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 c37f8cd..9ca0ab9 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 @@ -138,6 +138,9 @@ public class TradeJpa { trade.setReceiverAddress((String) row.get("receiverAddress")); trade.setStepPaidFee((String) row.get("stepPaidFee")); trade.setSellerNick((String) row.get("sellerNick")); + BigInteger sellerFlag = (BigInteger) row.get("sellerFlag"); + trade.setSellerFlag(sellerFlag.longValue()); + tradeList.add(trade); } return tradeList; @@ -146,14 +149,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 from top_trade as t where 1=1 "); + " 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 "); 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 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.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/AutoTaskMessage.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/AutoTaskMessage.java index af635dd..3c496f2 100644 --- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/AutoTaskMessage.java +++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/AutoTaskMessage.java @@ -21,7 +21,7 @@ import java.util.Date; @Entity @Table(name = "auto_task_message") @EntityListeners(AuditingEntityListener.class) -public class AutoTaskMessage implements Serializable { +public class AutoTaskMessage implements Serializable { private static final long serialVersionUID = 4550554800647798909L; @@ -31,10 +31,6 @@ public class AutoTaskMessage implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(name = "send_message") - @ApiModelProperty(value = "发送内容") - private String sendMessage; - @Column(name = "user_id") @ApiModelProperty("用户id") private Long userId; @@ -106,7 +102,4 @@ public class AutoTaskMessage implements Serializable { @ApiModelProperty("统计类型") private Integer statType; - @Column(name = "sender_quantity") - @ApiModelProperty("发送数量") - private Integer senderQuantity; } 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 392764d..728dae4 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 @@ -34,10 +34,6 @@ public class AutoTaskMessageInfo implements Serializable { @ApiModelProperty("任务id") private Long taskId; - @Column(name = "task_name") - @ApiModelProperty("任务id") - private String taskName; - @ApiModelProperty("状态值") private Integer status; @@ -86,8 +82,4 @@ public class AutoTaskMessageInfo implements Serializable { @ApiModelProperty("发送类型") private Integer sendType; - - @ApiModelProperty("用户id") - private Long userId; - } 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 274a756..e15788a 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 @@ -64,20 +64,23 @@ public class TimerTaskServiceImpl implements TimerTaskService { continue; } } - String sellerNick = as.getSellerNick(); + Long userId = as.getUserId(); //卖家nick为空,跳过 - if (StrUtil.isEmpty(sellerNick)) { + if (userId == null || userId == DefaultNumberConstants.ZERO_NUMBER) { continue; } // 获取卖家账号信息 - SellerAccount sellerAccount = sellerAccountRepository.findFirstByNickname(sellerNick); + SellerAccount sellerAccount = sellerAccountRepository.findSellerAccountById(userId); // 查询可发送子账号 List subNickList = sellerAccountRepository.findByParentId(sellerAccount.getId()); if (CollectionUtils.isEmpty(subNickList)) { continue; } + String sellerNick = sellerAccount.getNickname(); + as.setSellerNick(sellerNick); List list = tradeJpa.getConfirmReceipt(as, tradeStatus); if (CollUtil.isEmpty(list)) { + log.info("======================卖家:{},在 {} 未查询到可发送的 {} 订单==============", sellerNick, DateUtil.now(), settingType); continue; } //过滤黑名单 @@ -101,8 +104,12 @@ public class TimerTaskServiceImpl implements TimerTaskService { @Transactional(rollbackFor = Exception.class) public void deduct(List tradeList, SendTemplate template, SellerAccount sellerAccount, AppSetting as, List subNickList) { for (TopTrade info : tradeList) { - - String templateStr = RemindTemplates.initShopTitle(template.getContent(), sellerAccount.getShopTitle()); + String templateStr; + if (ObjectUtil.isEmpty(template)||StrUtil.isBlank(template.getContent())) { + templateStr = RemindTemplates.initShopTitle(as.getMemoContent(), sellerAccount.getShopTitle()); + } else { + templateStr = RemindTemplates.initShopTitle(template.getContent(), sellerAccount.getShopTitle()); + } AutoTaskMessage autoTaskMessage = createAutoTaskMessage(as, templateStr); if (ObjectUtil.isEmpty(autoTaskMessage)) { log.info("============== create trade task error the uid as {},time {} ==============", info.getTid(), DateUtil.date()); @@ -116,6 +123,7 @@ public class TimerTaskServiceImpl implements TimerTaskService { autoWaitForMessage.setTaskName(autoTaskMessage.getTaskName()); autoWaitForMessage.setSender(info.getSellerNick()); autoWaitForMessage.setBuyer(info.getBuyerNick()); + autoWaitForMessage.setSendMessage(templateStr); autoWaitForMessageRepository.save(autoWaitForMessage); } } @@ -175,7 +183,6 @@ public class TimerTaskServiceImpl implements TimerTaskService { message.setSendType(setting.getType()); message.setSellerNick(setting.getSellerNick()); message.setStatus(DefaultNumberConstants.ZERO_NUMBER); - message.setSendType(DefaultNumberConstants.ZERO_NUMBER); message.setTaskName(AppSettingTypeEnum.valueOf(type)); return autoTaskMessageRepository.save(message); }