Merge branch 'dev_20230222_live' into master_saas

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

@@ -437,7 +437,7 @@ 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"));
         }
@@ -447,6 +447,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         TenantContextHolder.setTenantId(order.getTenantId());
         callOrderCallBack(order);
 
+        // 设置订单状态
+        order.setStatus(status);
         if (status.equals(DealStatusEnum.SUCCESS)
                 && StringUtils.isNotBlank(order.getPaymentChannel())
                 && order.getPaymentChannel().equals("ADAPAY")