Merge branch 'dev_20230222_live' into master_saas

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

@@ -45,6 +45,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -437,7 +438,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         } else {
             order.setMemo(rpMap.get("remarks"));
         }
-
+        // 设置订单状态
+        order.setStatus(status);
         if (StringUtils.isBlank(order.getTransNo())) {
             order.setTransNo(rpMap.get("orderNo"));
         }
@@ -445,10 +447,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         order.setPaymentBusinessChannel(rpMap.get("channelType"));
         order.setTenantId(this.get(order.getId()).getTenantId());
         TenantContextHolder.setTenantId(order.getTenantId());
+
         callOrderCallBack(order);
 
-        // 设置订单状态
-        order.setStatus(status);
         if (status.equals(DealStatusEnum.SUCCESS)
                 && StringUtils.isNotBlank(order.getPaymentChannel())
                 && order.getPaymentChannel().equals("ADAPAY")