Merge remote-tracking branch 'origin/saas' into saas

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

@@ -301,6 +301,10 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
                 TenantOrderRecord tor = (TenantOrderRecord) clazz;
                 merNos = tor.getMerNos();
                 amount = amountTo.apply(tor.getActualAmount());
+            } else if (clazz instanceof TenantPaymentOrder) {
+                TenantPaymentOrder tpo = (TenantPaymentOrder) clazz;
+                merNos = tpo.getMerNos();
+                amount = amountTo.apply(tpo.getActualAmount());
             } else {
                 throw new BizException("订单[{}]找不到", payParam.getOrderNo());
             }