|
@@ -1,6 +1,7 @@
|
|
package com.ym.mec.student.controller;
|
|
package com.ym.mec.student.controller;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
import com.ym.mec.biz.dal.dao.*;
|
|
import com.ym.mec.biz.dal.dao.*;
|
|
@@ -96,6 +97,8 @@ public class StudentOrderController extends BaseController {
|
|
private OrderPayOpsService orderPayOpsService;
|
|
private OrderPayOpsService orderPayOpsService;
|
|
@Autowired
|
|
@Autowired
|
|
private MusicGroupPaymentCalenderActivityService musicGroupPaymentCalenderActivityService;
|
|
private MusicGroupPaymentCalenderActivityService musicGroupPaymentCalenderActivityService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private TenantConfigService tenantConfigService;
|
|
|
|
|
|
@Value("${spring.profiles.active:dev}")
|
|
@Value("${spring.profiles.active:dev}")
|
|
private String profiles;
|
|
private String profiles;
|
|
@@ -161,6 +164,11 @@ public class StudentOrderController extends BaseController {
|
|
HashMap<String, Object> orderDetail = new HashMap<>();
|
|
HashMap<String, Object> orderDetail = new HashMap<>();
|
|
orderDetail.put("order", orderByOrderNo);
|
|
orderDetail.put("order", orderByOrderNo);
|
|
orderDetail.put("groupType", orderByOrderNo.getGroupType());
|
|
orderDetail.put("groupType", orderByOrderNo.getGroupType());
|
|
|
|
+ TenantConfig tenantConfig = tenantConfigService.getOne(new QueryWrapper<TenantConfig>()
|
|
|
|
+ .eq("tenant_id_", orderByOrderNo.getTenantId()));
|
|
|
|
+ if (Objects.nonNull(tenantConfig)) {
|
|
|
|
+ orderDetail.put("financeChops", tenantConfig.getCorporateFinanceChops());
|
|
|
|
+ }
|
|
if (OrderTypeEnum.APPLY.equals(orderByOrderNo.getType())) {
|
|
if (OrderTypeEnum.APPLY.equals(orderByOrderNo.getType())) {
|
|
StudentRegistration studentRegistration = studentRegistrationDao.getStudentRegister(orderByOrderNo.getMusicGroupId(), orderByOrderNo.getUserId());
|
|
StudentRegistration studentRegistration = studentRegistrationDao.getStudentRegister(orderByOrderNo.getMusicGroupId(), orderByOrderNo.getUserId());
|
|
if (studentRegistration.getPayingStatus().equals(2)) {
|
|
if (studentRegistration.getPayingStatus().equals(2)) {
|