fengji 去掉团练宝乐团Id

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

@@ -213,16 +213,16 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         int orderState = 0;
         //消费大于0元则拉起支付
         if (payAmount.compareTo(BigDecimal.ZERO) > 0) {
-            payMap = payService.getPayMap(
+            payMap = payService.getPayToPlatformMap(
+                    PaymentChannelEnum.ADAPAY,
+                    null,
                     payAmount,
                     BigDecimal.ZERO,
                     orderNo,
                     null,
                     null,
                     tenantEnum.getMsg(),
-                    tenantEnum.getMsg(),
-                    1,//临时写死
-                    tenantEnum.getCode()
+                    tenantEnum.getMsg()
             );
         } else { // 消费大于 0 元 已支付 直接激活
             orderState = 1;

mec-web/src/main/java/com/ym/mec/web/controller/CloudTeacherOrderController.java

@@ -57,6 +57,8 @@ public class CloudTeacherOrderController extends BaseController {
     @PostMapping("/queryInactive")
     @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryInActive')")
     public HttpResponseResult<PageInfo<CloudTeacherStudent>> queryInactive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
+        Integer tenantId = TenantContextHolder.getTenantId();
+        cloudTeacherOrderQueryInfo.setTenantId(tenantId);
         String organIds = organizationService.getEmployeeOrgan("");
         cloudTeacherOrderQueryInfo.setStatus(1);
         cloudTeacherOrderQueryInfo.setOrganIds(organIds); // 1,2,34,