irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hucs
2024-08-28 13:08:49 +08:00
parent 9b0880bcc8
commit 8702e282a5
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
play-admin/src/main/java/com/starry/admin/common/task/OverdueOrderHandlerTask.java
View File

@@ -43,12 +43,12 @@ public class OverdueOrderHandlerTask {
} }
/** /**
* 每秒钟检测，判断任务是否到期 * 每10秒钟检测，判断任务是否到期
* *
* @author admin * @author admin
* @since 2024/8/15 13:47 * @since 2024/8/15 13:47
**/ **/
@Scheduled(fixedRate = 1000) @Scheduled(fixedRate = 10000)
public void processMessages() { public void processMessages() {
long now = System.currentTimeMillis() / 1000; long now = System.currentTimeMillis() / 1000;
Set<String> messages = stringRedisTemplate.opsForZSet().rangeByScore(QUEUE_KEY, 0, now); Set<String> messages = stringRedisTemplate.opsForZSet().rangeByScore(QUEUE_KEY, 0, now);
@@ -74,7 +74,12 @@ public class OverdueOrderHandlerTask {
} }
// 如果订单未接单，进行退款处理 // 如果订单未接单，进行退款处理
if ("0".equals(orderInfo.getOrderStatus())) { if ("0".equals(orderInfo.getOrderStatus())) {
playOrderInfoService.updateStateTo4("2", "admin", orderInfo.getId(), "订单长时间未接单", new ArrayList<>()); try {
playOrderInfoService.updateStateTo4("2", "admin", orderInfo.getId(), "订单长时间未接单", new ArrayList<>());
}catch (Exception e){
log.error("订单退款失败", e);
}
} }
} }
} }

21
play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java
View File

@@ -308,10 +308,10 @@ public class WxCustomMpService {
public void sendOrderCancelMessage(PlayOrderInfoEntity orderInfo, String refundReason) { public void sendOrderCancelMessage(PlayOrderInfoEntity orderInfo, String refundReason) {
SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(orderInfo.getTenantId()); SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(orderInfo.getTenantId());
PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.selectById(orderInfo.getAcceptBy());
PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(orderInfo.getPurchaserBy()); PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(orderInfo.getPurchaserBy());
WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getQuxiaodingdantongzhiTemplateId(), clerkUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".july.hucs.top/clerk/#/orderDetail/" + orderInfo.getId()); WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getQuxiaodingdantongzhiTemplateId(), customUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".july.hucs.top/user/#/orderDetail/" + orderInfo.getId());
List<WxMpTemplateData> data = new ArrayList<>(); List<WxMpTemplateData> data = new ArrayList<>();
data.add(new WxMpTemplateData("character_string2", orderInfo.getOrderNo())); data.add(new WxMpTemplateData("character_string2", orderInfo.getOrderNo()));
data.add(new WxMpTemplateData("thing5", StringUtils.isEmpty(refundReason) ? "已取消" : refundReason)); data.add(new WxMpTemplateData("thing5", StringUtils.isEmpty(refundReason) ? "已取消" : refundReason));
@@ -323,13 +323,18 @@ public class WxCustomMpService {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
templateMessage.setToUser(customUserInfo.getOpenid()); if(StringUtils.isNotEmpty(orderInfo.getAcceptBy())){
templateMessage.setUrl("http://" + tenant.getTenantKey() + ".july.hucs.top/user/#/orderDetail/" + orderInfo.getId()); PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.selectById(orderInfo.getAcceptBy());
try {
proxyWxMpService().getTemplateMsgService().sendTemplateMsg(templateMessage); templateMessage.setToUser(clerkUserInfo.getOpenid());
} catch (WxErrorException e) { templateMessage.setUrl("http://" + tenant.getTenantKey() + ".july.hucs.top/clerk/#/orderDetail/" + orderInfo.getId());
log.error(e.getMessage(), e); try {
proxyWxMpService().getTemplateMsgService().sendTemplateMsg(templateMessage);
} catch (WxErrorException e) {
log.error(e.getMessage(), e);
}
} }
} }
} }