Merge branch 'dev_20230222_live' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -45,8 +45,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -448,7 +446,19 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         order.setPaymentBusinessChannel(rpMap.get("channelType"));
         order.setTenantId(this.get(order.getId()).getTenantId());
 
-        StudentPaymentOrder finalOrder = order;
+        TenantContextHolder.setTenantId(order.getTenantId());
+
+        callOrderCallBack(order);
+
+        if (status.equals(DealStatusEnum.SUCCESS)
+                && StringUtils.isNotBlank(order.getPaymentChannel())
+                && order.getPaymentChannel().equals("ADAPAY")
+                && !rpMap.containsKey("simulation")) {
+            confirmOrder(order);
+        }
+        TenantContextHolder.clearTenantId();
+
+        /*StudentPaymentOrder finalOrder = order;
         Executors.newCachedThreadPool().submit(() -> {
 
             try {
@@ -467,7 +477,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                 logger.error("updateOrder 订单回调流程, order={}", JSON.toJSONString(finalOrder), e);
             }
 
-        });
+        });*/
 
     }