diff --git a/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderWechatPayQueryTask.java b/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderWechatPayQueryTask.java new file mode 100644 index 0000000..0773508 --- /dev/null +++ b/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderWechatPayQueryTask.java @@ -0,0 +1,34 @@ +package com.zbkj.admin.task.order; + +import com.zbkj.common.utils.CrmebDateUtil; +import com.zbkj.service.service.OrderTaskService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 新订单自动同步ruoyi + * @author wyq + */ +@Component("OrderWechatPayQueryTask") +public class OrderWechatPayQueryTask { + @Autowired + private OrderTaskService orderTaskService; + + + private static final Logger logger = LoggerFactory.getLogger(OrderWechatPayQueryTask.class); + public void autoSync() + + { + + logger.info("---OrderWechatPayQueryTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime()); + try { + orderTaskService.wechatPayQuery(); + + } catch (Exception e) { + e.printStackTrace(); + logger.error("OrderWechatPayQueryTask.task" + " | msg : " + e.getMessage()); + } + } +} diff --git a/crmeb-common/src/main/java/com/zbkj/common/acpect/ControllerAspect.java b/crmeb-common/src/main/java/com/zbkj/common/acpect/ControllerAspect.java index 79c37b0..0b0b151 100644 --- a/crmeb-common/src/main/java/com/zbkj/common/acpect/ControllerAspect.java +++ b/crmeb-common/src/main/java/com/zbkj/common/acpect/ControllerAspect.java @@ -1,5 +1,6 @@ package com.zbkj.common.acpect; +import com.alibaba.fastjson.JSON; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -43,9 +44,9 @@ public class ControllerAspect { long end = System.nanoTime(); - logger.info("Controller method:{},prams:{},cost time:{} ns,cost:{} ms", + logger.info("Controller method:{},prams:{},cost time:{} ns,cost:{} ms,result:{}", - pjp.getSignature().toString(), Arrays.toString(pjp.getArgs()), (end - begin), (end - begin) / 1000000); + pjp.getSignature().toString(), Arrays.toString(pjp.getArgs()), (end - begin), (end - begin) / 1000000, JSON.toJSONString(obj)); return obj; } diff --git a/crmeb-service/src/main/java/com/zbkj/service/service/OrderTaskService.java b/crmeb-service/src/main/java/com/zbkj/service/service/OrderTaskService.java index 10189be..177a499 100644 --- a/crmeb-service/src/main/java/com/zbkj/service/service/OrderTaskService.java +++ b/crmeb-service/src/main/java/com/zbkj/service/service/OrderTaskService.java @@ -44,4 +44,6 @@ package com.zbkj.service.service; void autoTakeDelivery(); void autoSync(); + + void wechatPayQuery(); } diff --git a/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java b/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java index ba989ae..3ca6d8e 100644 --- a/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java +++ b/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java @@ -3,6 +3,7 @@ package com.zbkj.service.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; @@ -40,6 +41,7 @@ import org.springframework.transaction.support.TransactionTemplate; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -97,6 +99,9 @@ public class OrderTaskServiceImpl implements OrderTaskService { @Autowired private PayComponentOrderService componentOrderService; + @Autowired + private WeChatPayService weChatPayService; + @Autowired private WechatVideoDeliveryService wechatVideoDeliveryService; @@ -536,6 +541,25 @@ public class OrderTaskServiceImpl implements OrderTaskService { // } // } } + + @Override + public void wechatPayQuery() { + List storeOrders = storeOrderDao.selectList(new LambdaQueryWrapper().eq(StoreOrder::getPaid, 0) + .gt(StoreOrder::getCreateTime, DateUtil.offsetHour(new Date(), -2))); + //查询12小时以内未支付的订单 + if (CollUtil.isEmpty(storeOrders)){ + return; + } + for (StoreOrder storeOrder : storeOrders) { + try { + weChatPayService.queryPayResult(storeOrder.getOrderId()); + }catch (Exception e){ + logger.error("订单微信支付查询失败:订单号:{},异常信息={}", storeOrder.getOrderId(), e); + } + } + + } + /** * 提取数字字母汉字 * @param str