修改台牌支付逻辑

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

@@ -86,6 +86,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
             //如果以上操作都没有 则应该是这一个，因为老代码就是这样写的。
             if (Objects.isNull(function)) {
                 StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.findOrderByOrderNo(payParam.getOrderNo());
+                payParam.setTenantId(studentPaymentOrder.getTenantId());
                 payment = checkOrderAndGetParam(payParam,
                         studentPaymentOrder,
                         StudentPaymentOrder::getStatus,
@@ -121,10 +122,8 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
 
     // 机构充值
     private Map<String, Object> tenantRecharge(PaymentParam payParam) {
-        Map<String, Object> payment;
         TenantOrderRecord tenantOrderRecord = getTenantOrderRecord(payParam.getOrderNo());
-        payParam.setTenantId(tenantOrderRecord.getTenantId());
-        payment = checkOrderGetPayment(payParam, tenantOrderRecord);
+        Map<String, Object> payment = checkOrderGetPayment(payParam, tenantOrderRecord);
         //主动延迟检查订单
         log.info("executePayment delayCheckTenantRecharge >>>>> ");
         delayCheckTenantRecharge(tenantOrderRecord);
@@ -134,7 +133,6 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
     // 云教练支付
     private Map<String, Object> cloudTeacherOrder(PaymentParam payParam) {
         TenantOrderRecord tenantOrderRecord = getTenantOrderRecord(payParam.getOrderNo());
-        payParam.setTenantId(tenantOrderRecord.getTenantId());
         Map<String, Object> payment = checkOrderGetPayment(payParam, tenantOrderRecord);
         // 云教练支付 主动延迟检查订单
         log.info("executePayment delayCheckCloudTeacherOrder >>>>> ");
@@ -145,7 +143,6 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
     //机构开通、续费付款
     private Map<String, Object> openOrRenew(PaymentParam payParam) {
         TenantOrderRecord tenantOrderRecord = getTenantOrderRecord(payParam.getOrderNo());
-        payParam.setTenantId(tenantOrderRecord.getTenantId());
         Map<String, Object> payment = checkOrderGetPayment(payParam, tenantOrderRecord);
         //主动延迟检查订单
         delayCheckTenant();
@@ -161,6 +158,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
     //获取支付数据
     private Map<String, Object> checkOrderGetPayment(PaymentParam payParam, TenantOrderRecord tenantOrderRecord) {
         Map<String, Object> payment;
+        payParam.setTenantId(tenantOrderRecord.getTenantId());
         try {
             payment = checkOrderAndGetParam(payParam,
                     tenantOrderRecord,