|
@@ -3,8 +3,10 @@ package com.usky.dxtop.service.job;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.usky.dxtop.model.Charge;
|
|
import com.usky.dxtop.model.Charge;
|
|
|
|
+import com.usky.dxtop.model.MsgLog;
|
|
import com.usky.dxtop.model.Order;
|
|
import com.usky.dxtop.model.Order;
|
|
import com.usky.dxtop.service.ChargeService;
|
|
import com.usky.dxtop.service.ChargeService;
|
|
|
|
+import com.usky.dxtop.service.MsgLogService;
|
|
import com.usky.dxtop.service.OrderService;
|
|
import com.usky.dxtop.service.OrderService;
|
|
import com.usky.dxtop.service.emun.OrderStatus;
|
|
import com.usky.dxtop.service.emun.OrderStatus;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -30,6 +32,8 @@ public class CardJob {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ChargeService chargeService;
|
|
private ChargeService chargeService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private MsgLogService msgLogService;
|
|
|
|
|
|
@Scheduled(cron = "0 */1 * * * ?")
|
|
@Scheduled(cron = "0 */1 * * * ?")
|
|
public void execute(){
|
|
public void execute(){
|
|
@@ -39,7 +43,10 @@ public class CardJob {
|
|
List<Order> list = orderService.list(queryWrapper);
|
|
List<Order> list = orderService.list(queryWrapper);
|
|
for (Order order:list) {
|
|
for (Order order:list) {
|
|
try {
|
|
try {
|
|
- Charge one = chargeService.one(order.getId());
|
|
|
|
|
|
+ LambdaQueryWrapper<MsgLog> msgLogLambdaQueryWrapper = Wrappers.lambdaQuery();
|
|
|
|
+ msgLogLambdaQueryWrapper.eq(MsgLog::getBusinessId,order.getId());
|
|
|
|
+ List<MsgLog> msgLogs = msgLogService.list(msgLogLambdaQueryWrapper);
|
|
|
|
+ Charge one = chargeService.one(msgLogs.get(0).getId());
|
|
if (null == one){
|
|
if (null == one){
|
|
cartError(order);
|
|
cartError(order);
|
|
}else {
|
|
}else {
|