update

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

@@ -32,7 +32,6 @@ import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 import com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder;
 import com.ym.mec.biz.dal.entity.SysPaymentConfig;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum;
 import com.ym.mec.biz.dal.enums.FeeTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
@@ -43,7 +42,6 @@ import com.ym.mec.biz.service.PayService;
 import com.ym.mec.biz.service.SellOrderService;
 import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
-import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysPaymentConfigService;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.redis.service.RedisCache;
@@ -99,10 +97,6 @@ public class PayServiceImpl implements PayService {
         
         Integer tenantId = studentPaymentOrder.getTenantId();
         
-        if(studentPaymentOrder.getOrganId() == 122){
-        	tenantId = 28;
-        }
-        
         HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(tenantId);
         if(hfMerchantConfig == null){
         	throw new BizException("机构[{}]汇付商户信息找不到", tenantId);

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

@@ -115,13 +115,24 @@ public class StudentManageServiceImpl implements StudentManageService {
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
 
+        List<StudentManageListDto> dataList = null;
+        
+        int jmCount = 0;
+        if(queryInfo.getTenantId() == 28){
+        	queryInfo.setOrganId(null);
+        	jmCount = studentManageDao.countStudentByOrganId(params);
+        	dataList = studentManageDao.findStudentsByOrganId(params);
+        	
+        	queryInfo.setTenantId(1);
+        }
+
         if(StringUtils.isNotEmpty(queryInfo.getOrganId())){
             String[] organIds = queryInfo.getOrganId().split(",");
             params.put("organIds", organIds);
         }
 
-        List<StudentManageListDto> dataList = null;
         int count = studentManageDao.countStudentByOrganId(params);
+        count = count + jmCount;
         if (queryInfo.getIsExport()) {
             if (count > 50000) {
                 throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
@@ -130,7 +141,11 @@ public class StudentManageServiceImpl implements StudentManageService {
         if (count > 0) {
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
-            dataList = studentManageDao.findStudentsByOrganId(params);
+            if(dataList == null){
+            	dataList = studentManageDao.findStudentsByOrganId(params);
+            }else{
+            	dataList.addAll(studentManageDao.findStudentsByOrganId(params));
+            }
             Set<Integer> userIds = dataList.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
             List<Integer> organIds = dataList.stream().map(e -> e.getOrganId()).distinct().collect(Collectors.toList());
             List<Integer> courseTeacherIds = dataList.stream().map(e -> e.getCourseTeacher()).distinct().collect(Collectors.toList());

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

@@ -630,14 +630,33 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         MapUtil.populateMap(params, queryInfo);
 
         List<StudentPaymentOrderDto> dataList = new ArrayList<>();
+        
+        int jmCount = 0;
+        if(queryInfo.getTenantId() == 28){
+        	queryInfo.setOrganId(null);
+        	jmCount = findCount(params);
+        	dataList = studentPaymentOrderDao.queryPageOrder(params);
+        	
+        	queryInfo.setTenantId(1);
+        	if(StringUtils.isBlank(queryInfo.getMerNos())){
+        		queryInfo.setMerNos("H004236");
+        	}
+        }
+        
         int count = this.findCount(params);
+        count = count + jmCount;
 
         BigDecimal totalUserBalance = sysUserCashAccountDao.getTotalUserBalance(params);
         pageInfo.setTotalUserBalance(totalUserBalance);
         if (count > 0) {
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
-            dataList = studentPaymentOrderDao.queryPageOrder(params);
+            
+            if(dataList == null){
+            	dataList = studentPaymentOrderDao.queryPageOrder(params);
+            }else{
+            	dataList.addAll(studentPaymentOrderDao.queryPageOrder(params));
+            }
 
             StudentPaymentOrder orderMoneyAmount = studentPaymentOrderDao.getOrderMoneyAmount(params);
             BigDecimal totalExpectAmount = orderMoneyAmount.getExpectAmount() != null ? orderMoneyAmount.getExpectAmount() : BigDecimal.ZERO;

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

@@ -128,9 +128,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             user.setUserType("STUDENT");
             user.setCreateTime(date);
             user.setUpdateTime(date);
-            if(user.getTenantId() == 28){
-            	user.setTenantId(1);
-            }
             // 注册账户信息
             teacherDao.addSysUser(user);
             userId = user.getId();
@@ -147,9 +144,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         student.setCurrentGradeNum(studentPreRegistration.getCurrentGradeNum());
         student.setSubjectIdList(studentPreRegistration.getSelectionSubjectId().toString());
         student.setCurrentClass(studentPreRegistration.getCurrentClass());
-        if(student.getTenantId() == 28){
-        	student.setTenantId(1);
-        }
         studentDao.insert(student);
         TenantContextHolder.clearTenantId();
         

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

@@ -58,10 +58,6 @@ public class StudentManageController extends BaseController {
     public Object queryStudentList(@RequestBody StudentManageQueryInfo queryInfo){
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         queryInfo.setIsExport(false);
-        if(queryInfo.getTenantId() == 28){
-        	queryInfo.setTenantId(1);
-        	queryInfo.setOrganId(null);
-        }
         return succeed(studentManageService.findStudentsByOrganId(queryInfo));
     }
 

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

@@ -57,14 +57,6 @@ public class StudentPaymentOrderController extends BaseController {
             }
             queryInfo.setUserIds(userIds);
         }
-        if(queryInfo.getTenantId() == 28){
-        	queryInfo.setTenantId(1);
-        	queryInfo.setOrganId(null);
-        	
-        	if(StringUtils.isBlank(queryInfo.getMerNos())){
-        		queryInfo.setMerNos("H004236");
-        	}
-        }
 
         PageInfo<StudentPaymentOrderDto> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);